瀏覽代碼

Gluon creates a complete manifest by itself, no need for any voodo here

Michael Schwarz 9 年之前
父節點
當前提交
c40ffda8e5
共有 1 個文件被更改,包括 1 次插入10 次删除
  1. 1 10
      build.sh

+ 1 - 10
build.sh

@@ -188,16 +188,7 @@ progress "Assembling images.7z ..."
 # generate, franken-merge, and copy manifests
 progress "Generating and copying manifest ..."
 pushd $CODE_DIR
-for target in ${TARGETS} ; do
-    GLUON_TARGET="${target}" GLUON_BRANCH=$BRANCH make manifest || abort "Failed to generate the manifest, try running 'make manifest' in '$CODE_DIR' directory manually."
-    mv ./images/sysupgrade/${BRANCH}.manifest ./images/sysupgrade/${target}.${BRANCH}.manifest
-done
-frankenmerge_manifest_file="./images/sysupgrade/${BRANCH}.manifest"
-echo "BRANCH=${BRANCH}" > ${frankenmerge_manifest_file}
-echo "DATE=${BUILD_TS}$(date +%:z)" >> ${frankenmerge_manifest_file}
-echo "PRIORITY=${PRIORITY}" >> ${frankenmerge_manifest_file}
-echo "" >> ${frankenmerge_manifest_file}
-grep -hE "*.bin$" ./images/sysupgrade/*.${BRANCH}.manifest | sort >> ${frankenmerge_manifest_file}
+GLUON_TARGET="ar71xx-generic" GLUON_BRANCH=$BRANCH make manifest || abort "Failed to generate the manifest, try running 'make manifest' in '$CODE_DIR' directory manually."
 popd
 cp "${CODE_DIR}/images/sysupgrade/${BRANCH}.manifest" "${OUTPUT_DIR}/${BRANCH}/"