|
@@ -69,8 +69,7 @@ fi
|
|
|
[ -n "${VERBOSE}" ] || VERBOSE=0
|
|
|
|
|
|
if [ "${BRANCH}" == "experimental" -a -z "${VERSION}" ] ; then
|
|
|
- default_release_pattern=$( awk -F" := " '/^DEFAULT_GLUON_RELEASE/ { gsub("shell ", "", $2); print $2; }' ${SITE_DIR}/site.mk )
|
|
|
- VERSION=$(eval echo ${default_release_pattern})
|
|
|
+ VERSION=$(make default-release)
|
|
|
info "EXPERIMENTAL FIRMWARE: using version tag '$VERSION'"
|
|
|
fi
|
|
|
|
|
@@ -211,7 +210,7 @@ popd > /dev/null #${CODE_DIR}
|
|
|
progress "Assembling images.7z ..."
|
|
|
pushd ${IMAGE_DIR} > /dev/null
|
|
|
[ -e "${OUTPUT_DIR}/${BRANCH}/images.7z" ] && rm "${OUTPUT_DIR}/${BRANCH}/images.7z"
|
|
|
-7z a -xr!*.manifest "${OUTPUT_DIR}/${BRANCH}/images.7z" ./sysupgrade/* ./factory/*
|
|
|
+7z a -mmt=on -xr!*.manifest "${OUTPUT_DIR}/${BRANCH}/images.7z" ./sysupgrade/* ./factory/*
|
|
|
[ "$?" -eq "0" ] || abort "Failed to assemble images (did you install p7zip-full?)."
|
|
|
popd > /dev/null #${IMAGE_DIR}
|
|
|
|
|
@@ -219,7 +218,7 @@ popd > /dev/null #${IMAGE_DIR}
|
|
|
progress "Assembling modules.7z ..."
|
|
|
pushd ${MODULE_DIR} > /dev/null
|
|
|
[ -e "${OUTPUT_DIR}/${BRANCH}/modules.7z" ] && rm "${OUTPUT_DIR}/${BRANCH}/modules.7z"
|
|
|
-7z a "${OUTPUT_DIR}/${BRANCH}/modules.7z" ./gluon-ffho-${VERSION}
|
|
|
+7z a -mmt=on "${OUTPUT_DIR}/${BRANCH}/modules.7z" ./gluon-ffho-${VERSION} > /dev/null
|
|
|
[ "$?" -eq "0" ] || abort "Failed to assemble modules."
|
|
|
popd > /dev/null #${MODULE_DIR}
|
|
|
|