The "common" IMAGE_FEATURES found in arago-image.inc are not all that common after all and end up being removed or replace in most images. Move the image feature assignment out into the image recipes.
The only thing arago-tiny-image.inc did was include arago-image.inc and modify the IMAGE_FEATURES, so this can be removed and arago-image.inc can be included directly. Signed-off-by: Andrew Davis <[email protected]> --- meta-arago-distro/recipes-core/images/arago-image.inc | 2 -- meta-arago-distro/recipes-core/images/arago-tiny-image.inc | 5 ----- meta-arago-distro/recipes-core/images/tisdk-base-image.bb | 2 ++ .../recipes-core/images/tisdk-bootstrap-base-image.bb | 4 +++- .../recipes-core/images/tisdk-bootstrap-image.bb | 4 +++- meta-arago-distro/recipes-core/images/tisdk-default-image.bb | 2 ++ .../recipes-core/images/tisdk-thinlinux-image.bb | 2 ++ meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb | 4 +--- .../recipes-core/images/tisdk-tiny-initramfs.bb | 2 -- 9 files changed, 13 insertions(+), 14 deletions(-) delete mode 100644 meta-arago-distro/recipes-core/images/arago-tiny-image.inc diff --git a/meta-arago-distro/recipes-core/images/arago-image.inc b/meta-arago-distro/recipes-core/images/arago-image.inc index 37b20850..33dca89b 100644 --- a/meta-arago-distro/recipes-core/images/arago-image.inc +++ b/meta-arago-distro/recipes-core/images/arago-image.inc @@ -4,8 +4,6 @@ LICENSE = "MIT" COMPATIBLE_MACHINE = "ti-soc" -IMAGE_FEATURES += "package-management splash" - # 4KB per 1 inode should be enough EXTRA_IMAGECMD:ext2.gz += "-i 4096" diff --git a/meta-arago-distro/recipes-core/images/arago-tiny-image.inc b/meta-arago-distro/recipes-core/images/arago-tiny-image.inc deleted file mode 100644 index 6c726c4d..00000000 --- a/meta-arago-distro/recipes-core/images/arago-tiny-image.inc +++ /dev/null @@ -1,5 +0,0 @@ - -require arago-image.inc - -IMAGE_FEATURES:remove = "splash" - diff --git a/meta-arago-distro/recipes-core/images/tisdk-base-image.bb b/meta-arago-distro/recipes-core/images/tisdk-base-image.bb index f5d5f29b..f6a33f13 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-base-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-base-image.bb @@ -5,6 +5,8 @@ DESCRIPTION = "Arago SDK base image suitable for initramfs containing\ require arago-image.inc +IMAGE_FEATURES += "package-management splash" + IMAGE_FSTYPES += "cpio.xz" ARAGO_BASE_IMAGE_EXTRA_INSTALL ?= "" diff --git a/meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bb b/meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bb index ce3b008e..12ea697a 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bb @@ -8,7 +8,9 @@ DESCRIPTION = "Image meant for basic system verification of linux kernel.\ maybe used for basic platform bringup (bootstrap) activities.\ " -require arago-tiny-image.inc +require arago-image.inc + +IMAGE_FEATURES += "package-management" IMAGE_FSTYPES += "cpio cpio.xz" diff --git a/meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bb b/meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bb index 5fe0463d..f39e2e35 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bb @@ -8,7 +8,9 @@ DESCRIPTION = "This image is a complete package containing a rootfs\ content.\ " -require arago-tiny-image.inc +require arago-image.inc + +IMAGE_FEATURES += "package-management" ARAGO_BOOTSTRAP_IMAGE_EXTRA_INSTALL ?= "" diff --git a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb index bc067857..077fe05f 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb @@ -5,6 +5,8 @@ DESCRIPTION = "Complete Arago TI SDK filesystem image containing complete\ require arago-image.inc +IMAGE_FEATURES += "package-management splash" + ARAGO_DEFAULT_IMAGE_EXTRA_INSTALL ?= "" # we're assuming some display manager is being installed with opengl diff --git a/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb b/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb index 5d1c26d8..1eb864a6 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb @@ -5,6 +5,8 @@ DESCRIPTION = "Minimal bootable image with container to start the next\ require arago-image.inc +IMAGE_FEATURES += "package-management splash" + # Allow users to tack on additional packages as interesting. ARAGO_THIN_IMAGE_EXTRA_INSTALL ?= "" diff --git a/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb b/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb index 0bb6b798..8e7712a8 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb @@ -10,9 +10,7 @@ DESCRIPTION = "Image meant for basic boot of linux kernel. Intended as\ ARAGO_TINY_IMAGE_EXTRA_INSTALL ?= "" -require arago-tiny-image.inc - -IMAGE_FEATURES:remove = "package-management" +require arago-image.inc IMAGE_INSTALL += " \ ${ARAGO_TINY_IMAGE_EXTRA_INSTALL} \ diff --git a/meta-arago-distro/recipes-core/images/tisdk-tiny-initramfs.bb b/meta-arago-distro/recipes-core/images/tisdk-tiny-initramfs.bb index 157248e1..f367fa30 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-tiny-initramfs.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-tiny-initramfs.bb @@ -12,8 +12,6 @@ LICENSE = "MIT" inherit core-image -IMAGE_FEATURES:remove = "package-management" - INITRAMFS_FSTYPES = "cpio cpio.xz" INITRAMFS_MAXSIZE = "200000" -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#16916): https://lists.yoctoproject.org/g/meta-arago/message/16916 Mute This Topic: https://lists.yoctoproject.org/mt/117093595/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
