Просмотр исходного кода

They changed the Image-Dir within Gluon-Master
From ${CODE_DIR}/images/ to ${CODE_DIR}/output/images

Karsten Böddeker 8 лет назад
Родитель
Сommit
7b5fe56f86
1 измененных файлов с 6 добавлено и 3 удалено
  1. 6 3
      build.sh

+ 6 - 3
build.sh

@@ -229,7 +229,11 @@ cd ..
 # compress all binaries into 7z archive
 progress "Assembling images.7z ..."
 [ -e "${OUTPUT_DIR}/${BRANCH}/images.7z" ] && rm "${OUTPUT_DIR}/${BRANCH}/images.7z"
-7z a -xr!*.manifest "${OUTPUT_DIR}/${BRANCH}/images.7z" ${CODE_DIR}/images/sysupgrade/* ${CODE_DIR}/images/factory/* || abort "Failed to assemble images (did you install p7zip-full?)."
+if [ ${BRANCH} == "experimental" ]; then
+        7z a -xr!*.manifest "${OUTPUT_DIR}/${BRANCH}/images.7z" ${CODE_DIR}/output/images/sysupgrade/* ${CODE_DIR}/output/images/factory/* || abort "Failed to assemble images (did you install p7zip-full?)."
+else
+        7z a -xr!*.manifest "${OUTPUT_DIR}/${BRANCH}/images.7z" ${CODE_DIR}/images/sysupgrade/* ${CODE_DIR}/images/factory/* || abort "Failed to assemble images (did you install p7zip-full?)."
+fi
 
 # generate, franken-merge, and copy manifests
 progress "Generating and copying manifest ..."
@@ -244,5 +248,4 @@ cp -p "${build_info_path}" "${VERSIONS_INFO_DIR}/${VERSION}"
 
 # The end. Finally.
 success "We're done, go and enjoy your new firmware in ${OUTPUT_DIR}/${BRANCH}!"
-popd > /dev/null
-
+popd > /dev/null