|
|
@@ -96,7 +96,7 @@ if [ ! -d "${SITE_DIR}" ]; then
|
|
|
[ "$?" -eq "0" ] || abort "Failed to fetch SITE repository."
|
|
|
fi
|
|
|
|
|
|
-pushd ${CODE_DIR}
|
|
|
+pushd ${CODE_DIR} > /dev/null
|
|
|
|
|
|
### CHECKOUT GLUON
|
|
|
progress "Checking out GLUON '$BASE' ..."
|
|
|
@@ -109,7 +109,7 @@ GLUON_COMMIT=$(git rev-list --max-count=1 HEAD)
|
|
|
|
|
|
### CHECKOUT SITE REPO
|
|
|
progress "Checking out SITE REPO ..."
|
|
|
-pushd ${SITE_DIR}
|
|
|
+pushd ${SITE_DIR} > /dev/null
|
|
|
# TODO: check if site got modified locally and bail out if necessary
|
|
|
if [ -z "${SITE_ID}" ]; then
|
|
|
# no specific site given - get the most current one
|
|
|
@@ -123,7 +123,7 @@ else
|
|
|
[ "$?" -eq "0" ] || abort "Failed to checkout requested site commit '${SITE_ID}', mimimi."
|
|
|
fi
|
|
|
SITE_COMMIT=$(git rev-list --max-count=1 HEAD)
|
|
|
-popd #${SITE_DIR}
|
|
|
+popd > /dev/null #${SITE_DIR}
|
|
|
|
|
|
### APPLY PATCHES TO GLUON
|
|
|
progress "Applying Patches ..."
|
|
|
@@ -198,36 +198,36 @@ for target in ${TARGETS} ; do
|
|
|
[ "$?" -eq "0" ] || abort "Failed to assemble images for target-platform ${target}."
|
|
|
|
|
|
# compile the modules
|
|
|
- process "Compiling modules."
|
|
|
+ progress "Compiling modules."
|
|
|
eval "${gluon_build_env_vars} faketime \"${BUILD_TS}\" make -j ${MAKEJOBS} modules${MAKE_PARAM}"
|
|
|
[ "$?" -eq "0" ] || abort "Failed to build modules for target-platform ${target}."
|
|
|
done
|
|
|
|
|
|
-popd #${CODE_DIR}
|
|
|
+popd > /dev/null #${CODE_DIR}
|
|
|
|
|
|
# compress all binaries into 7z archive
|
|
|
progress "Assembling images.7z ..."
|
|
|
-pushd ${IMAGE_DIR}
|
|
|
+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/*
|
|
|
[ "$?" -eq "0" ] || abort "Failed to assemble images (did you install p7zip-full?)."
|
|
|
-popd #${IMAGE_DIR}
|
|
|
+popd > /dev/null #${IMAGE_DIR}
|
|
|
|
|
|
# compress modules into 7z archive
|
|
|
progress "Assembling modules.7z ..."
|
|
|
-pushd ${MODULE_DIR}
|
|
|
+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}
|
|
|
[ "$?" -eq "0" ] || abort "Failed to assemble modules."
|
|
|
-popd #${MODULE_DIR}
|
|
|
+popd > /dev/null #${MODULE_DIR}
|
|
|
|
|
|
# generate and copy manifests
|
|
|
progress "Generating and copying manifest ..."
|
|
|
-pushd ${CODE_DIR}
|
|
|
-faketime "${BUILD_TS}" GLUON_PRIORITY=${PRIORITY} GLUON_BRANCH=${BRANCH} make manifest
|
|
|
+pushd ${CODE_DIR} > /dev/null
|
|
|
+GLUON_PRIORITY=${PRIORITY} GLUON_BRANCH=${BRANCH} faketime "${BUILD_TS}" make manifest
|
|
|
[ "$?" -eq "0" ] || abort "Failed to generate the manifest, try running 'make manifest' in '$CODE_DIR' directory manually."
|
|
|
cp "${CODE_DIR}/output/images/sysupgrade/${BRANCH}.manifest" "${OUTPUT_DIR}/${BRANCH}/"
|
|
|
-popd #${CODE_DIR}
|
|
|
+popd > /dev/null #${CODE_DIR}
|
|
|
|
|
|
# Saving a copy of the build info file as reference
|
|
|
progress "Building a greater and brighter firmware finished successfully. Saving build information at: ${VERSIONS_INFO_DIR}/${VERSION}"
|
