From 1fe0a0dfe085d686293da092f023e488306c8c8a Mon Sep 17 00:00:00 2001 From: Francisco Gil Date: Fri, 26 May 2023 12:46:52 +0200 Subject: [PATCH] readonly: add default configuration for overlayfs_etc When EXTRA_IMAGE_FEATURES += "overlayfs-etc" is added these configurations are needed to compile. They are provided with the default configuration to work with our software. The user can modify them in their local.conf if needed. https://onedigi.atlassian.net/browse/DEL-8552 Signed-off-by: Francisco Gil --- meta-digi-arm/conf/machine/ccimx6qpsbc.conf | 5 +++++ meta-digi-arm/conf/machine/ccimx6sbc.conf | 5 +++++ meta-digi-arm/conf/machine/ccimx8mm-dvk.conf | 5 +++++ meta-digi-arm/conf/machine/ccimx8mn-dvk.conf | 5 +++++ meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf | 5 +++++ meta-digi-arm/conf/machine/ccimx93-dvk.conf | 5 +++++ meta-digi-arm/conf/machine/ccmp13-dvk.conf | 5 +++++ meta-digi-arm/conf/machine/ccmp15-dvk.conf | 5 +++++ 8 files changed, 40 insertions(+) diff --git a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf index c468d2cd9..6e47aa6a3 100644 --- a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf @@ -55,3 +55,8 @@ BOOTABLE_ARTIFACTS = " \ u-boot-ccimx6qpsbc1GB.imx \ u-boot-ccimx6qpsbc2GB.imx \ " + +# Default overlayfs_etc mount point and type +OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data" +OVERLAYFS_ETC_DEVICE ?= "/dev/mmcblk0p7" +OVERLAYFS_ETC_FSTYPE ?= "ext4" \ No newline at end of file diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf index 4cea9442c..b4cde1a4b 100644 --- a/meta-digi-arm/conf/machine/ccimx6sbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf @@ -60,3 +60,8 @@ BOOTABLE_ARTIFACTS = " \ u-boot-ccimx6qsbc512MB.imx \ u-boot-ccimx6qsbc.imx \ " + +# Default overlayfs_etc mount point and type +OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data" +OVERLAYFS_ETC_DEVICE ?= "/dev/mmcblk0p7" +OVERLAYFS_ETC_FSTYPE ?= "ext4" \ No newline at end of file diff --git a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf index cbe10eec6..05af26d26 100644 --- a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf @@ -54,3 +54,8 @@ IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ # Boot artifacts to be copied from the deploy dir to the installer ZIP BOOTABLE_ARTIFACTS = "imx-boot-ccimx8mm-dvk.bin" + +# Default overlayfs_etc mount point and type +OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data" +OVERLAYFS_ETC_DEVICE ?= "/dev/mmcblk0p7" +OVERLAYFS_ETC_FSTYPE ?= "ext4" \ No newline at end of file diff --git a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf index c3c620819..d6b0fbf53 100644 --- a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf @@ -56,3 +56,8 @@ IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ # Boot artifacts to be copied from the deploy dir to the installer ZIP BOOTABLE_ARTIFACTS = "imx-boot-ccimx8mn-dvk.bin" + +# Default overlayfs_etc mount point and type +OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data" +OVERLAYFS_ETC_DEVICE ?= "/dev/mmcblk0p7" +OVERLAYFS_ETC_FSTYPE ?= "ext4" \ No newline at end of file diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf index f853b3178..abe7bb3df 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf @@ -58,3 +58,8 @@ BOOTABLE_ARTIFACTS = " \ imx-boot-ccimx8x-sbc-pro-C0-2GB_32bit.bin \ imx-boot-ccimx8x-sbc-pro-C0-512MB_16bit.bin \ " + +# Default overlayfs_etc mount point and type +OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data" +OVERLAYFS_ETC_DEVICE ?= "/dev/mmcblk0p7" +OVERLAYFS_ETC_FSTYPE ?= "ext4" \ No newline at end of file diff --git a/meta-digi-arm/conf/machine/ccimx93-dvk.conf b/meta-digi-arm/conf/machine/ccimx93-dvk.conf index 88c8f3641..cd9bee422 100644 --- a/meta-digi-arm/conf/machine/ccimx93-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx93-dvk.conf @@ -55,3 +55,8 @@ IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ # Boot artifacts to be copied from the deploy dir to the installer ZIP BOOTABLE_ARTIFACTS = "imx-boot-ccimx93-dvk.bin" + +# Default overlayfs_etc mount point and type +OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data" +OVERLAYFS_ETC_DEVICE ?= "/dev/mmcblk0p7" +OVERLAYFS_ETC_FSTYPE ?= "ext4" \ No newline at end of file diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf index 57d726549..c64f2706c 100644 --- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf @@ -163,3 +163,8 @@ BOOTABLE_ARTIFACTS = " \ # TRUSTFENCE basic support # Alternatively, uncommment to enable the console with the specified GPIO # TRUSTFENCE_CONSOLE_GPIO_ENABLE_NAME ?= "GPIOA5" + +# Default overlayfs_etc mount point and type +OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data" +OVERLAYFS_ETC_DEVICE ?= "ubi0:data" +OVERLAYFS_ETC_FSTYPE ?= "ubifs" diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf index 1adbffbcb..f87e95cf0 100644 --- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf @@ -167,3 +167,8 @@ BOOTABLE_ARTIFACTS = " \ # TRUSTFENCE basic support # Alternatively, uncommment to enable the console with the specified GPIO # TRUSTFENCE_CONSOLE_GPIO_ENABLE_NAME ?= "GPIOB6" + +# Default overlayfs_etc mount point and type +OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data" +OVERLAYFS_ETC_DEVICE ?= "ubi0:data" +OVERLAYFS_ETC_FSTYPE ?= "ubifs"