diff options
| author |   Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp> | 2023-05-19 06:07:28 +0900 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-06-02 09:06:53 +0000 |
| commit | a5aefbd3bf9e6cee58ee467e164375b7abe44e63 (patch) | |
| tree | 1fd57ff53338b80f660a3795d0eeaf40d41d20f0 /recipes-platform | |
| parent | 14eab1c3b1b2ff6d585460938fd9579adf687875 (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: I8d92473f50cd5c596b43c94049972bb9ad57c438
Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
Diffstat (limited to 'recipes-platform')
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 00000000..f835761f --- /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 336ad3bb..f385c1e0 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 805e239a..dc82ce4e 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 e82a474e..f5fcad91 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 = " \ |