wks: set rootfs partitions sizes to 1G

Signed-off-by: Hugo Villeneuve <hugo@hugovil.com>

diff --git a/conf/distro/hvmpd.conf b/conf/distro/hvmpd.conf
index 9cee3eb..17d7753 100644 (file)
--- a/conf/distro/hvmpd.conf
+++ b/conf/distro/hvmpd.conf
@@ -8,7 +8,7 @@ DISTRO_NAME = "HV MPD distribution"
 DISTROOVERRIDES =. "doog:"
 
 # This can be overrided by machine-specific extra configuration:
-IMAGE_ROOTFS_SIZE = "1048576"
+IMAGE_ROOTFS_SIZE_M = "1024M"
 
 # Use include instead of require as these are optional
 # depending on the particular machine:
@@ -31,6 +31,10 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " pulseaudio"
 # between the two images.
 WIC_CREATE_EXTRA_ARGS:append = " --no-fstab-update"
 
+WICVARS:append = " \
+    IMAGE_ROOTFS_SIZE_M \
+"
+
 ALSA_DEVICE_ID ?= "0"
 SOUND_CARD ?= "default"
 

diff --git a/wic/hvmpd-raspberrypi.wks.in b/wic/hvmpd-raspberrypi.wks.in
index ac7f621..561b5ab 100644 (file)
--- a/wic/hvmpd-raspberrypi.wks.in
+++ b/wic/hvmpd-raspberrypi.wks.in
@@ -2,6 +2,6 @@
 # long-description: Creates a partitioned SD card image for use with
 # Raspberry Pi. Boot files are located in the first vfat partition.
 
-part /boot   --source bootimg-partition --fstype=vfat --label boot  --align 4096 --active --fixed-size 128M
-part /       --source rootfs            --fstype=ext4 --label rootA --align 4096
-part rootfsB                            --fstype=ext4 --label rootB
+part /boot   --source bootimg-partition --fstype=vfat --label boot  --fixed-size 128M --active          --align 4096
+part /       --source rootfs            --fstype=ext4 --label rootA --fixed-size ${IMAGE_ROOTFS_SIZE_M} --align 4096
+part rootfsB                            --fstype=ext4 --label rootB --fixed-size ${IMAGE_ROOTFS_SIZE_M} --align 4096

diff --git a/wic/hvmpd-wandboard.wks.in b/wic/hvmpd-wandboard.wks.in
index b4d7533..f2e67ca 100644 (file)
--- a/wic/hvmpd-wandboard.wks.in
+++ b/wic/hvmpd-wandboard.wks.in
@@ -14,7 +14,7 @@
 #
 part SPL     --source rawcopy --sourceparams="file=SPL" --no-table --align 1
 part u-boot  --source rawcopy --sourceparams="file=${UBOOT_BINARY}" --no-table --align 69
-part /       --source rootfs  --fstype=ext4 --label rootfsA --align 4096
-part rootfsB                  --fstype=ext4 --label rootfsB
+part /       --source rootfs  --fstype=ext4 --label rootfsA --fixed-size ${IMAGE_ROOTFS_SIZE_M} --align 4096
+part rootfsB                  --fstype=ext4 --label rootfsB --fixed-size ${IMAGE_ROOTFS_SIZE_M} --align 4096
 
 bootloader --ptable msdos