summaryrefslogtreecommitdiffstats
path: root/recipes-platform/images
diff options
context:
space:
mode:
authorNaoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>2023-05-19 06:07:28 +0900
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-05-29 13:35:09 +0000
commit9f82d40210944ffb2fae5e8435f5269807a6b384 (patch)
tree98126dd4eaf32e41d7b91a61cbc0bfec2bd8132d /recipes-platform/images
parent0d92a75ac38965766389a9e5f172c70d7680792d (diff)
A fstab replacement method change to build container guest
In https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/28690 review, I got a request for method change request. Existing method use bbappend for base files. New method use ROOTFS_POSTPROCESS_COMMAND. Bug-AGL: SPEC-4803 Change-Id: Ie058ef55f7dfeae5d651b46d5ff731d1a2bebc19 Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
Diffstat (limited to 'recipes-platform/images')
-rw-r--r--recipes-platform/images/agl-demo-container-guest-integration.inc18
-rw-r--r--recipes-platform/images/agl-ivi-demo-platform-flutter.bb1
-rw-r--r--recipes-platform/images/agl-ivi-demo-platform-html5.bb2
-rw-r--r--recipes-platform/images/agl-ivi-demo-platform.bb1
4 files changed, 22 insertions, 0 deletions
diff --git a/recipes-platform/images/agl-demo-container-guest-integration.inc b/recipes-platform/images/agl-demo-container-guest-integration.inc
new file mode 100644
index 000000000..f835761fd
--- /dev/null
+++ b/recipes-platform/images/agl-demo-container-guest-integration.inc
@@ -0,0 +1,18 @@
+IMAGE_CONTAINER_GUEST_APPEND = " base-files-guest-fstab"
+IMAGE_INSTALL:append = " \
+ ${@bb.utils.contains('AGL_FEATURES', 'agl-container-guest-demo', '${IMAGE_CONTAINER_GUEST_APPEND}', '', d)} \
+"
+
+fixupfstab_for_container_guest_images() {
+ rm -f ${IMAGE_ROOTFS}/${sysconfdir}/fstab
+ ln -s fstab-guest ${IMAGE_ROOTFS}/${sysconfdir}/fstab
+}
+
+rmboot_for_container_guest_images() {
+ rm -rf ${IMAGE_ROOTFS}/boot
+}
+
+ROOTFS_POSTPROCESS_COMMAND += " \
+ ${@bb.utils.contains('AGL_FEATURES', 'agl-container-guest-demo', 'fixupfstab_for_container_guest_images;', '', d)} \
+ ${@bb.utils.contains('AGL_FEATURES', 'agl-container-guest-demo', 'rmboot_for_container_guest_images;', '', d)} \
+"
diff --git a/recipes-platform/images/agl-ivi-demo-platform-flutter.bb b/recipes-platform/images/agl-ivi-demo-platform-flutter.bb
index 336ad3bb6..f385c1e08 100644
--- a/recipes-platform/images/agl-ivi-demo-platform-flutter.bb
+++ b/recipes-platform/images/agl-ivi-demo-platform-flutter.bb
@@ -3,6 +3,7 @@ require agl-image-ivi.bb
DESCRIPTION = "AGL Flutter based Demo Platform image"
require agl-demo-features.inc
+require agl-demo-container-guest-integration.inc
# add packages for demo platform (include demo apps) here
IMAGE_INSTALL:append = " \
diff --git a/recipes-platform/images/agl-ivi-demo-platform-html5.bb b/recipes-platform/images/agl-ivi-demo-platform-html5.bb
index 805e239a5..dc82ce4e5 100644
--- a/recipes-platform/images/agl-ivi-demo-platform-html5.bb
+++ b/recipes-platform/images/agl-ivi-demo-platform-html5.bb
@@ -3,6 +3,8 @@ require agl-image-ivi.bb
SUMMARY = "DEMO platform of AGL HTML5 profile"
DESCRIPTION = "Contains the web runtime and sample web apps"
+require agl-demo-container-guest-integration.inc
+
# add packages for demo platform (include demo apps) here
IMAGE_INSTALL:append = " \
packagegroup-agl-demo-platform-html5 \
diff --git a/recipes-platform/images/agl-ivi-demo-platform.bb b/recipes-platform/images/agl-ivi-demo-platform.bb
index e82a474e7..f5fcad912 100644
--- a/recipes-platform/images/agl-ivi-demo-platform.bb
+++ b/recipes-platform/images/agl-ivi-demo-platform.bb
@@ -4,6 +4,7 @@ DESCRIPTION = "AGL Demo Platform image currently contains a simple HMI and \
demos."
require agl-demo-features.inc
+require agl-demo-container-guest-integration.inc
# add packages for demo platform (include demo apps) here
IMAGE_INSTALL:append = " \