lt-qcom-debian-images-*: encode rootfs size in ROOTFS param

Instead of using a single variable for rootfs size, add the size in the ROOTFS
parameter, so that we can customize the size for each image separately.

Change-Id: Ied955bf86c308abc0e9a6e6adce6acc9ee8c45c4
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>

4 files changed, 20 insertions, 28 deletions

diff --git a/lt-qcom-debian-images-arm64.yaml b/lt-qcom-debian-images-arm64.yaml
index cf5c568bf4..264b86d140 100644
--- a/lt-qcom-debian-images-arm64.yaml
+++ b/lt-qcom-debian-images-arm64.yaml
@@ -31,14 +31,11 @@
             name: OS_FLAVOUR
             default: 'jessie'
         - string:
-            name: EXT4FS_IMG_SZ
-            default: '1800M'
-        - string:
             name: PLATFORM_NAME
             default: 'qcom-snapdragon-arm64'
         - string:
             name: ROOTFS
-            default: 'developer,arm64 alip,arm64'
+            default: 'developer,arm64,1800M alip,arm64,1800M'
         - string:
             name: DTBS
             default: 'msm8916-mtp.dtb apq8016-sbc.dtb'
@@ -194,8 +191,9 @@
 
             for rootfs in ${ROOTFS}; do
 
-              rootfs_arch=${rootfs#*,}
-              rootfs=${rootfs%,*}
+              rootfs_arch=$(echo $rootfs | cut -f2 -d,)
+              rootfs_sz=$(echo $rootfs | cut -f3 -d,)
+              rootfs=$(echo $rootfs | cut -f1 -d,)
 
               cat ${VENDOR}-lt-qcom.default > ${VENDOR}-lt-qcom
 
@@ -248,7 +246,7 @@
               sudo cp -a qcom_firmware/linux-ubuntu-board-support-package-*/proprietary-ubuntu/* rootfs/lib/firmware
               sudo rm -f rootfs/lib/firmware/wlan/macaddr0 rootfs/lib/firmware.tar
 
-              sudo mkfs.ext4 -L rootfs out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img.raw ${EXT4FS_IMG_SZ}
+              sudo mkfs.ext4 -L rootfs out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img.raw ${rootfs_sz}
               mkdir rootfs2
               sudo mount -o loop out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img.raw rootfs2
               sudo cp -a rootfs/* rootfs2
diff --git a/lt-qcom-debian-images-tracking-arm64.yaml b/lt-qcom-debian-images-tracking-arm64.yaml
index 6d50c0ddea..e683d2c7cb 100644
--- a/lt-qcom-debian-images-tracking-arm64.yaml
+++ b/lt-qcom-debian-images-tracking-arm64.yaml
@@ -31,14 +31,11 @@
             name: OS_FLAVOUR
             default: 'jessie'
         - string:
-            name: EXT4FS_IMG_SZ
-            default: '1800M'
-        - string:
             name: PLATFORM_NAME
             default: 'qcom-snapdragon-arm64'
         - string:
             name: ROOTFS
-            default: 'developer,arm64 alip,arm64'
+            default: 'developer,arm64,1800M alip,arm64,1800M'
         - string:
             name: DTBS
             default: 'msm8916-mtp.dtb apq8016-sbc.dtb'
@@ -193,8 +190,9 @@
 
             for rootfs in ${ROOTFS}; do
 
-              rootfs_arch=${rootfs#*,}
-              rootfs=${rootfs%,*}
+              rootfs_arch=$(echo $rootfs | cut -f2 -d,)
+              rootfs_sz=$(echo $rootfs | cut -f3 -d,)
+              rootfs=$(echo $rootfs | cut -f1 -d,)
 
               cat ${VENDOR}-lt-qcom.default > ${VENDOR}-lt-qcom
 
@@ -247,7 +245,7 @@
               sudo cp -a qcom_firmware/linux-ubuntu-board-support-package-*/proprietary-ubuntu/* rootfs/lib/firmware
               sudo rm -f rootfs/lib/firmware/wlan/macaddr0 rootfs/lib/firmware.tar
 
-              sudo mkfs.ext4 -L rootfs out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img.raw ${EXT4FS_IMG_SZ}
+              sudo mkfs.ext4 -L rootfs out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img.raw ${rootfs_sz}
               mkdir rootfs2
               sudo mount -o loop out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img.raw rootfs2
               sudo cp -a rootfs/* rootfs2
diff --git a/lt-qcom-debian-images-tracking.yaml b/lt-qcom-debian-images-tracking.yaml
index 1f998489f6..a3ae57b147 100644
--- a/lt-qcom-debian-images-tracking.yaml
+++ b/lt-qcom-debian-images-tracking.yaml
@@ -31,14 +31,11 @@
             name: OS_FLAVOUR
             default: 'jessie'
         - string:
-            name: EXT4FS_IMG_SZ
-            default: '1800M'
-        - string:
             name: PLATFORM_NAME
             default: 'qcom-snapdragon'
         - string:
             name: ROOTFS
-            default: 'developer,armhf alip,armhf'
+            default: 'developer,armhf,1800M alip,armhf,1800M'
         - string:
             name: DTBS
             default: 'qcom-apq8064-ifc6410.dtb qcom-apq8064-cm-qs600.dtb qcom-apq8064-eI_ERAGON600.dtb'
@@ -178,8 +175,9 @@
 
             for rootfs in ${ROOTFS}; do
 
-              rootfs_arch=${rootfs#*,}
-              rootfs=${rootfs%,*}
+              rootfs_arch=$(echo $rootfs | cut -f2 -d,)
+              rootfs_sz=$(echo $rootfs | cut -f3 -d,)
+              rootfs=$(echo $rootfs | cut -f1 -d,)
 
               cat ${VENDOR}-lt-qcom.default > ${VENDOR}-lt-qcom
 
@@ -220,7 +218,7 @@
             LABEL=qcom-firmware /lib/firmware ext4 defaults 0 0
             EOF
 
-              sudo mkfs.ext4 -L rootfs out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img.raw ${EXT4FS_IMG_SZ}
+              sudo mkfs.ext4 -L rootfs out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img.raw ${rootfs_sz}
               mkdir rootfs2
               sudo mount -o loop out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img.raw rootfs2
               sudo cp -a rootfs/* rootfs2
diff --git a/lt-qcom-debian-images.yaml b/lt-qcom-debian-images.yaml
index 8ff9d07bb1..5a2332ba0c 100644
--- a/lt-qcom-debian-images.yaml
+++ b/lt-qcom-debian-images.yaml
@@ -31,14 +31,11 @@
             name: OS_FLAVOUR
             default: 'jessie'
         - string:
-            name: EXT4FS_IMG_SZ
-            default: '1800M'
-        - string:
             name: PLATFORM_NAME
             default: 'qcom-snapdragon'
         - string:
             name: ROOTFS
-            default: 'developer,armhf alip,armhf'
+            default: 'developer,armhf,1800M alip,armhf,1800M'
         - string:
             name: DTBS
             default: 'qcom-apq8064-ifc6410.dtb qcom-apq8064-cm-qs600.dtb qcom-apq8064-eI_ERAGON600.dtb qcom-apq8064-arrow-db600c.dtb'
@@ -178,8 +175,9 @@
 
             for rootfs in ${ROOTFS}; do
 
-              rootfs_arch=${rootfs#*,}
-              rootfs=${rootfs%,*}
+              rootfs_arch=$(echo $rootfs | cut -f2 -d,)
+              rootfs_sz=$(echo $rootfs | cut -f3 -d,)
+              rootfs=$(echo $rootfs | cut -f1 -d,)
 
               cat ${VENDOR}-lt-qcom.default > ${VENDOR}-lt-qcom
 
@@ -220,7 +218,7 @@
             LABEL=qcom-firmware /lib/firmware ext4 defaults 0 0
             EOF
 
-              sudo mkfs.ext4 -L rootfs out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img.raw ${EXT4FS_IMG_SZ}
+              sudo mkfs.ext4 -L rootfs out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img.raw ${rootfs_sz}
               mkdir rootfs2
               sudo mount -o loop out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img.raw rootfs2
               sudo cp -a rootfs/* rootfs2