|
|
@@ -280,9 +280,14 @@ if [ "${PUBLISH}" -eq "1" ]; then
|
|
|
|
|
|
# copy manifest and the build info file
|
|
|
progress "Copying manifest and build info file ..."
|
|
|
+ pushd ${OUTPUT_DIR} > /dev/null
|
|
|
+ git fetch
|
|
|
+ git checkout -q signing
|
|
|
+ git merge --ff-only origin/master
|
|
|
mkdir -p "${OUTPUT_DIR}/${VERSION}/sysupgrade"
|
|
|
cp -f "${MANIFEST_DIR}/${BRANCH}.manifest" "${OUTPUT_DIR}/${VERSION}/sysupgrade/"
|
|
|
cp -f "${build_info_path}" "${OUTPUT_DIR}/${VERSION}/${BUILD_INFO_FILENAME}"
|
|
|
+ popd > /dev/null #${OUTPUT_DIR}
|
|
|
|
|
|
# Update symlinks
|
|
|
progress "Update symlink for ${BRANCH}"
|
