fstab: mount boot and data partition

RPI image was changed to wic format as well as a new data partition was added to the image in the following commits, 26079f1 0d70eaf fstab was not updated to mount the partitions added to the wks file. This commit adds these partitions to fstab. WIC_CREATE_EXTRA_ARGS = "--no-fstab-update" is also added to the local.conf for rpi. This stops wic script to generated fstab file from wks file. This is required to support swupdate swu image to use the hardcoded fstab file instead. Also the --uuid is removed from wks, as uuid is not used to identify boot dev. Instead labels are used to identify devices.
Pelagicore · Aug 8, 2019 · 29c8926 · 29c8926
1 parent c5d9825
commit 29c8926
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/conf/variant/rpi-qtauto/local.conf.sample b/conf/variant/rpi-qtauto/local.conf.sample
@@ -2,6 +2,8 @@ require conf/variant/common/local.conf
 
 WKS_FILE = "raspberrypi.wks"
 
+WIC_CREATE_EXTRA_ARGS = "--no-fstab-update"
+
 IMAGE_FSTYPES_append = " wic wic.bmap wic.bz2"
 
 MACHINE = "raspberrypi3"

diff --git a/conf/variant/rpi/local.conf.sample b/conf/variant/rpi/local.conf.sample
@@ -2,6 +2,8 @@ require conf/variant/common/local.conf
 
 WKS_FILE = "raspberrypi.wks"
 
+WIC_CREATE_EXTRA_ARGS = "--no-fstab-update"
+
 IMAGE_FSTYPES_append = " wic wic.bmap wic.bz2"
 
 MACHINE = "raspberrypi3"

diff --git a/meta-rpi-extras/recipes-core/base-files/base-files/raspberrypi3/fstab b/meta-rpi-extras/recipes-core/base-files/base-files/raspberrypi3/fstab
@@ -1 +1,3 @@
 /dev/root / auto defaults 1 1
+LABEL=boot /boot auto defaults,sync 0 0
+LABEL=data /data ext4 defaults 0 0
diff --git a/scripts/lib/wic/canned-wks/raspberrypi.wks b/scripts/lib/wic/canned-wks/raspberrypi.wks
@@ -3,6 +3,6 @@
 # Raspberry Pi. Boot files are located in the first vfat partition.
 
 part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --size 20
-part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label platform1 --align 4096 --uuid b488d900-9cc0-11e9-8833-cf4cb425a04d
-part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label platform2 --align 4096 --uuid a2d8ad56-9c9e-11e9-afd8-07ffb5f9d79e
-part /data --ondisk mmcblk0 --size 1024 --fstype=ext4 --label data --align 4096 --uuid 79664834-9c9e-11e9-9603-a744b9801557
+part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label platform1 --align 4096
+part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label platform2 --align 4096
+part /data --ondisk mmcblk0 --size 1024 --fstype=ext4 --label data --align 4096