From dad232c138aa2be0f2f7a1e0b93d322462a183a0 Mon Sep 17 00:00:00 2001 From: Nicolas Dechesne Date: Thu, 26 May 2016 22:26:48 +0200 Subject: 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 --- lt-qcom-debian-images.yaml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'lt-qcom-debian-images.yaml') 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 @@ -30,15 +30,12 @@ - string: 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 -- cgit v1.2.3