diff options
author | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2019-07-01 17:19:26 +0200 |
---|---|---|
committer | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2019-07-01 17:19:26 +0200 |
commit | ffcce71ae3c2bf515234d7508e67745913a51d5f (patch) | |
tree | d8423ada6ad77d720ee60f9034b8434af784bfd5 /lt-qcom-debian-images/builders-fai.sh | |
parent | 4759a4305aebbcc6eb2c8712e712e37173f07576 (diff) |
lt-qcom-debian-images: extract ROOTFS label from FAI
So far, the LABEL used for the ROOTFS is hard coded into two different
locations:
1. in the FAI config since it's needed for /etc/fstab file
2. in the yaml job since it's needed for the boot image
And they both must match. Since FAI is cloned when building the image
and then the boot image, let's simply remove the variable from YAML
and use the variable from FAI.
Change-Id: I67dc7eb48d3206f9dd795ad89abb72d243707f27
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Diffstat (limited to 'lt-qcom-debian-images/builders-fai.sh')
-rw-r--r-- | lt-qcom-debian-images/builders-fai.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lt-qcom-debian-images/builders-fai.sh b/lt-qcom-debian-images/builders-fai.sh index a0f506adb0..53c456bf3c 100644 --- a/lt-qcom-debian-images/builders-fai.sh +++ b/lt-qcom-debian-images/builders-fai.sh @@ -158,6 +158,9 @@ git commit --allow-empty -m "Import build ${BUILD_NUMBER}" git push origin debian/${PLATFORM_NAME} cd .. +# get ROOTFS from FAI config +ROOTFS_PARTLABEL=$(grep --color=never -Po "^ROOTFS_PARTLABEL=\K.*" class/${FAI_BOARD_CLASS}.var) + # Create boot image cat out/vmlinuz-* out/$(basename ${DTBS}) > Image.gz+dtb mkbootimg \ |