aboutsummaryrefslogtreecommitdiff
path: root/android-lcr
diff options
context:
space:
mode:
authorVictor Chong <victor.chong@linaro.org>2019-08-29 07:29:02 +0100
committerVictor Chong <victor.chong@linaro.org>2019-08-29 07:29:02 +0100
commitbb11d2798b0ef88aff08d6fe3cac5e953402eb62 (patch)
tree502e56acc82ac498187b21ee82b1606b4c3415c8 /android-lcr
parent642de0b4ca358f3a7d5d3ec64a08adc001a20ee7 (diff)
android: lcr: publish more firmware images
Following e94781e9 ("android: lcr: publish ptable images"), also publish missing ptable image for hikey960 and nvme images for both hikey620 and hikey960. These are all files required for firmware updates. Change-Id: Ic4781d5139f7deff3c6f1bf2b0246d2b3e90b193 Signed-off-by: Victor Chong <victor.chong@linaro.org>
Diffstat (limited to 'android-lcr')
-rw-r--r--android-lcr/hikey/build-info/template.txt2
-rwxr-xr-xandroid-lcr/hikey/builders-v2.sh5
2 files changed, 5 insertions, 2 deletions
diff --git a/android-lcr/hikey/build-info/template.txt b/android-lcr/hikey/build-info/template.txt
index 5c3854e5..f20b2991 100644
--- a/android-lcr/hikey/build-info/template.txt
+++ b/android-lcr/hikey/build-info/template.txt
@@ -1,6 +1,6 @@
Format-Version: 0.5
-Files-Pattern: *.png, installed-files.txt, changelog.txt, cache.img, cache.img.xz, boot.img, ramdisk.img, boot_fat.img, boot_fat.uefi.img, boot_fat.uefi.img.xz, boot.img.xz, boot_fat.img.xz, userdata.img, userdata-4gb.img.xz, userdata.img.xz, *.xml, kernel_config, MANIFEST, MD5SUMS, *.zip, *.sh, fip.bin.xz, l-loader.bin.xz, prm_ptable.img.xz, ptable-aosp-4g.img.xz, ptable-aosp-8g.img.xz,
+Files-Pattern: *.png, installed-files.txt, changelog.txt, cache.img, cache.img.xz, boot.img, ramdisk.img, boot_fat.img, boot_fat.uefi.img, boot_fat.uefi.img.xz, boot.img.xz, boot_fat.img.xz, userdata.img, userdata-4gb.img.xz, userdata.img.xz, *.xml, kernel_config, MANIFEST, MD5SUMS, *.zip, *.sh, fip.bin.xz, l-loader.bin.xz, prm_ptable.img.xz, ptable-aosp-4g.img.xz, ptable-aosp-8g.img.xz, ptable-aosp-32g.img.xz, nvme.img.xz, hisi-nvme.img.xz
License-Type: protected
Auth-Groups: lmg-member-only, team-qa-services, team-android-engineering
diff --git a/android-lcr/hikey/builders-v2.sh b/android-lcr/hikey/builders-v2.sh
index a3dbf672..cc1c4f33 100755
--- a/android-lcr/hikey/builders-v2.sh
+++ b/android-lcr/hikey/builders-v2.sh
@@ -32,10 +32,13 @@ cp -v /home/buildslave/srv/${BUILD_DIR}/build/out/dist/fip.bin \
/home/buildslave/srv/${BUILD_DIR}/build/device/linaro/hikey/installer/${TARGET_PRODUCT}/prm_ptable.img \
/home/buildslave/srv/${BUILD_DIR}/build/device/linaro/hikey/installer/${TARGET_PRODUCT}/ptable-aosp-4g.img \
/home/buildslave/srv/${BUILD_DIR}/build/device/linaro/hikey/installer/${TARGET_PRODUCT}/ptable-aosp-8g.img \
+ /home/buildslave/srv/${BUILD_DIR}/build/device/linaro/hikey/installer/${TARGET_PRODUCT}/ptable-aosp-32g.img \
+ /home/buildslave/srv/${BUILD_DIR}/build/device/linaro/hikey/installer/${TARGET_PRODUCT}/nvme.img \
+ /home/buildslave/srv/${BUILD_DIR}/build/device/linaro/hikey/installer/${TARGET_PRODUCT}/hisi-nvme.img \
/home/buildslave/srv/${BUILD_DIR}/build/out/dist/l-loader.bin build/out/ || true
cd build/out
-for image in "boot.img" "boot_fat.uefi.img" "system.img" "userdata.img" "userdata-4gb.img" "cache.img" "fip.bin" "l-loader.bin" "prm_ptable.img" "ptable-aosp-4g.img" "ptable-aosp-8g.img" "vendor.img"; do
+for image in "boot.img" "boot_fat.uefi.img" "system.img" "userdata.img" "userdata-4gb.img" "cache.img" "fip.bin" "l-loader.bin" "prm_ptable.img" "ptable-aosp-4g.img" "ptable-aosp-8g.img" "ptable-aosp-32g.img" "nvme.img" "hisi-nvme.img" "vendor.img"; do
## there are the cases that fip.bin, l-loader.bin and ptables not generated
## so we add the check before run xz command
if [ -f ${image} ]; then