diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2022-06-17 17:04:33 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2022-06-18 00:27:18 +0800 |
| commit | 5aa9cbd9aa3df189f725372f247802130b900127 (patch) | |
| tree | d92190ef06838bb1ea95b2b09fa4a7567b34f7b4 | |
| parent | 207275c05fa8f8c8c4ff9b174d2e50888a43f9c8 (diff) | |
| download | android-build-configs-5aa9cbd9aa3df189f725372f247802130b900127.tar.gz | |
lkft: hikey960: publish prm_ptable.img for deployment
which would be used by the lava job definition generation
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Change-Id: Ie95561301a31b8bf056c37836a14ff6ebcf368f1
| -rwxr-xr-x | hooks/build-hikey960-super-ptable.sh | 23 | ||||
| -rw-r--r-- | lkft-aosp-android11-hikey960 | 3 | ||||
| -rw-r--r-- | lkft-aosp-android12-hikey960 | 3 | ||||
| -rw-r--r-- | lkft-aosp-master-hikey960 | 3 |
4 files changed, 29 insertions, 3 deletions
diff --git a/hooks/build-hikey960-super-ptable.sh b/hooks/build-hikey960-super-ptable.sh new file mode 100755 index 00000000..35f86b89 --- /dev/null +++ b/hooks/build-hikey960-super-ptable.sh @@ -0,0 +1,23 @@ +#!/bin/bash -ex + +####################################################### +# better to be speified in the build config file +function main(){ + local dir_out_target="out/target/product/hikey960" + local f_ptable_vendor=$(ls vendor/linaro/hikey960/*/bootloader/prm_ptable.img|tail -n1) + local f_ptable_device="device/linaro/hikey/installer/hikey960/prm_ptable.img" + if [ -f "${f_ptable_vendor}" ]; then + # for master build + cp -vf "${f_ptable_vendor}" "${dir_out_target}" + elif [ -f "${f_ptable_device}" ]; then + # for android11, android12 with the super partition support + # android10 would come here as well, + # but this script should not be run for android10 + cp -vf "${f_ptable_device}" "${dir_out_target}" + else + echo "The prm_ptable.img file was not found!" + return 1 + fi +} + +main "$@" diff --git a/lkft-aosp-android11-hikey960 b/lkft-aosp-android11-hikey960 index 7c28c7d6..c5ab41a5 100644 --- a/lkft-aosp-android11-hikey960 +++ b/lkft-aosp-android11-hikey960 @@ -6,4 +6,5 @@ LOCAL_MANIFEST_BRANCH=linaro-lkft-android11 PATCHSETS="lkft-aosp-android11-hikey960" TARGET_PRODUCT=hikey960 MAKE_TARGETS="droid" -PUBLISH_FILES="boot.img ramdisk-debug.img ramdisk.img system.img userdata.img vendor.img super.img product.img system_ext.img" +HOOK_POST_ANDROID_BUILD="build-hikey960-super-ptable.sh" +PUBLISH_FILES="boot.img ramdisk-debug.img ramdisk.img system.img userdata.img vendor.img super.img product.img system_ext.img prm_ptable.img" diff --git a/lkft-aosp-android12-hikey960 b/lkft-aosp-android12-hikey960 index 4b5f77fe..768e0278 100644 --- a/lkft-aosp-android12-hikey960 +++ b/lkft-aosp-android12-hikey960 @@ -4,4 +4,5 @@ LOCAL_MANIFEST=https://android-git.linaro.org/git/platform/manifest.git LOCAL_MANIFEST_BRANCH=linaro-lkft-android12 TARGET_PRODUCT=hikey960 PATCHSETS="lkft-aosp-android12-hikey960" -PUBLISH_FILES="boot.img product.img ramdisk-debug.img ramdisk.img super.img system.img system_ext.img userdata.img vendor.img" +HOOK_POST_ANDROID_BUILD="build-hikey960-super-ptable.sh" +PUBLISH_FILES="boot.img product.img ramdisk-debug.img ramdisk.img super.img system.img system_ext.img userdata.img vendor.img prm_ptable.img" diff --git a/lkft-aosp-master-hikey960 b/lkft-aosp-master-hikey960 index 8f8da836..03fe79f7 100644 --- a/lkft-aosp-master-hikey960 +++ b/lkft-aosp-master-hikey960 @@ -7,4 +7,5 @@ PATCHSETS="hikey960-master-workarounds" TARGET_PRODUCT=hikey960 MAKE_TARGETS="droidcore" HOOK_PRE_ANDROID_BUILD="build-hikey960-fetch-vendor-pacakge.sh" -PUBLISH_FILES="boot.img ramdisk-debug.img ramdisk.img system.img system_ext.img vendor.img userdata.img super.img product.img" +HOOK_POST_ANDROID_BUILD="build-hikey960-super-ptable.sh" +PUBLISH_FILES="boot.img ramdisk-debug.img ramdisk.img system.img system_ext.img vendor.img userdata.img super.img product.img prm_ptable.img" |