Skip to contentSkip to conversation

arago-image.inc: Set IMAGE_FEATURES in each image recipe

PATCH Superseded Andrew Davis 2 participants 6 messages Jan 5

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 arago-image.inc: Set IMAGE_FEATURES in each image recipe

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.

---
 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
meta-arago-distro/recipes-core/images/arago-image.inc +0 -2
index 37b20850..33dca89b 100644
@@ -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"
 
meta-arago-distro/recipes-core/images/arago-tiny-image.inc deleted +0 -5
deleted file mode 100644
index 6c726c4d..00000000
@@ -1,5 +0,0 @@
-
-require arago-image.inc
-
-IMAGE_FEATURES:remove = "splash"
-
meta-arago-distro/recipes-core/images/tisdk-base-image.bb +2 -0
index f5d5f29b..f6a33f13 100644
@@ -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 ?= ""
meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bb +3 -1
index ce3b008e..12ea697a 100644
@@ -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"
 
meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bb +3 -1
index 5fe0463d..f39e2e35 100644
@@ -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 ?= ""
 
meta-arago-distro/recipes-core/images/tisdk-default-image.bb +2 -0
index bc067857..077fe05f 100644
@@ -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
meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb +2 -0
index 5d1c26d8..1eb864a6 100644
@@ -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 ?= ""
 
meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb +1 -3
index 0bb6b798..8e7712a8 100644
@@ -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} \
meta-arago-distro/recipes-core/images/tisdk-tiny-initramfs.bb +0 -2
index 157248e1..f367fa30 100644
@@ -12,8 +12,6 @@ LICENSE = "MIT"
 
 inherit core-image
 
-IMAGE_FEATURES:remove = "package-management"
-
 INITRAMFS_FSTYPES = "cpio cpio.xz"
 
 INITRAMFS_MAXSIZE = "200000"
Signature · 1 line
2.39.2
#1 lore raw

PATCH 2/5 arago-image.inc: Do not set inode size on ext2.gz

This should have been set on "ext2" not "ext2.gz". It is also the default now for "ext2" in oe-core anyway. Drop this line.

---
 meta-arago-distro/recipes-core/images/arago-image.inc | 3 ---
 1 file changed, 3 deletions(-)
meta-arago-distro/recipes-core/images/arago-image.inc +0 -3
index 33dca89b..f4f74310 100644
@@ -4,9 +4,6 @@ LICENSE = "MIT"
 
 COMPATIBLE_MACHINE = "ti-soc"
 
-# 4KB per 1 inode should be enough
-EXTRA_IMAGECMD:ext2.gz += "-i 4096"
-
 IMAGE_INSTALL = " \
 	packagegroup-core-boot \
 	${CORE_IMAGE_EXTRA_INSTALL} \
Signature · 1 line
2.39.2
#2 lore raw

PATCH 3/5 remove-net-rules: Do not remove udev net rules

In reply to Andrew Davis

This isn't the issue it used to be, remove this bbclass.

---
 meta-arago-distro/classes/remove-net-rules.bbclass | 14 --------------
 .../recipes-core/images/arago-image.inc            |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 meta-arago-distro/classes/remove-net-rules.bbclass
meta-arago-distro/classes/remove-net-rules.bbclass deleted +0 -14
deleted file mode 100644
index 2764f7bb..00000000
@@ -1,14 +0,0 @@
-# Add a ROOTFS_POSTPROCESS_COMMAND that will strip the write_net_rules
-# executable from the file system.  This will prevent the
-# 70-persistent-net.rules from being created.  Not having this file
-# will allow moving SD cards between EVMs and similar boards such as
-# beaglebone and the EVM.
-
-ROOTFS_POSTPROCESS_COMMAND += "rootfs_rm_net_rules;"
-
-rootfs_rm_net_rules () {
-    if [ -e ${IMAGE_ROOTFS}/lib/udev/write_net_rules ]
-    then
-        rm ${IMAGE_ROOTFS}/lib/udev/write_net_rules
-    fi
-}
meta-arago-distro/recipes-core/images/arago-image.inc +1 -1
index f4f74310..c6e79118 100644
@@ -24,4 +24,4 @@ BAD_RECOMMENDATIONS += " \
 "
 BAD_RECOMMENDATIONS += "${@oe.utils.conditional("INIT_MANAGER", "sysvinit", "", "busybox-syslog", d)}"
 
-inherit core-image remove-net-rules
+inherit core-image
Signature · 1 line
2.39.2
#3 lore raw

PATCH 4/5 branding: Remove processor-sdk branding file

In reply to Andrew Davis

This brand is no longer used as part of the base meta-arago, remove this.

---
 .../distro/include/branding-processor-sdk.inc | 29 -------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 meta-arago-distro/conf/distro/include/branding-processor-sdk.inc
meta-arago-distro/conf/distro/include/branding-processor-sdk.inc deleted +0 -29
deleted file mode 100644
index 3ee23dc3..00000000
@@ -1,29 +0,0 @@
-ARAGO_TISDK_IMAGE = "processor-sdk-linux-image"
-
-# To create newlines in the message \n is used and the slash must be escaped
-# to function properly
-
-SRCIPK_GIT_COMMIT_MESSAGE = "\
-Create local branch\\n\
-\\n\
-The below commit is used for this local branch and is the one used by\\n\
-this sdk:\\n\
-${SRCREV}."
-
-SRCIPK_SHALLOW_GIT_COMMIT_MESSAGE = "${SRCIPK_GIT_COMMIT_MESSAGE}\\n\\n\
-To reduce the size of the SDK installer only a portion of the git commit\\n\
-history has been preserved. Also links to remote branches and tags do\\n\
-not exist in this copy of the repository.\\n\
-To fix this please run the unshallow-repositories.sh\\n\
-script located in the sdk\'s bin directory\\n\
-\\n\
-The script may take several minutes but you will then have a full copy of\\n\
-the git repository including its entire git history.\\n"
-
-SRCIPK_CUSTOM_GIT_BRANCH:pn-linux-ti-staging = "processor-sdk-local"
-SRCIPK_CUSTOM_GIT_MESSAGE:pn-linux-ti-staging = "${SRCIPK_SHALLOW_GIT_COMMIT_MESSAGE}"
-SRCIPK_SHALLOW_CLONE:pn-linux-ti-staging = "true"
-SRCIPK_SHALLOW_DEPTH:pn-linux-ti-staging = "400"
-
-SRCIPK_CUSTOM_GIT_BRANCH:pn-u-boot-ti-staging = "processor-sdk-local"
-SRCIPK_CUSTOM_GIT_MESSAGE:pn-u-boot-ti-staging = "${SRCIPK_GIT_COMMIT_MESSAGE}"
Signature · 1 line
2.39.2
#4 lore raw

PATCH 5/5 arago-image.inc: Set IMAGE_BASENAME based on package name

In reply to Andrew Davis

All the image base names are just the package name, so use PN here. This is also common to all images that include arago-image.inc so drop it out of all the individual image recipes.

---
 meta-arago-distro/recipes-core/images/arago-image.inc          | 2 +-
 meta-arago-distro/recipes-core/images/tisdk-base-image.bb      | 2 --
 .../recipes-core/images/tisdk-bootstrap-base-image.bb          | 2 --
 meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bb | 2 --
 meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb     | 3 ---
 meta-arago-distro/recipes-core/images/tisdk-default-image.bb   | 2 --
 meta-arago-distro/recipes-core/images/tisdk-jailhouse-image.bb | 2 --
 .../recipes-core/images/tisdk-jailhouse-inmate.bb              | 2 --
 meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb | 2 --
 meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb      | 2 --
 meta-arago-distro/recipes-core/images/tisdk-tiny-initramfs.bb  | 2 --
 11 files changed, 1 insertion(+), 22 deletions(-)
meta-arago-distro/recipes-core/images/arago-image.inc +1 -1
index c6e79118..f085fa23 100644
@@ -9,7 +9,7 @@ IMAGE_INSTALL = " \
 	${CORE_IMAGE_EXTRA_INSTALL} \
 "
 
-export IMAGE_BASENAME = "arago-image${ARAGO_IMAGE_SUFFIX}"
+export IMAGE_BASENAME = "${PN}${ARAGO_IMAGE_SUFFIX}"
 
 IMAGE_LINGUAS = ""
 
meta-arago-distro/recipes-core/images/tisdk-base-image.bb +0 -2
index f6a33f13..25738059 100644
@@ -17,5 +17,3 @@ IMAGE_INSTALL += "\
     ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', 'ti-test', '', d)} \
     ${ARAGO_BASE_IMAGE_EXTRA_INSTALL} \
 "
-
-export IMAGE_BASENAME = "tisdk-base-image${ARAGO_IMAGE_SUFFIX}"
meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bb +0 -2
index 12ea697a..ed964415 100644
@@ -20,5 +20,3 @@ IMAGE_INSTALL += " \
 	packagegroup-arago-bootstrap \
 	${ARAGO_BOOTSTRAP_IMAGE_EXTRA_INSTALL} \
 "
-
-export IMAGE_BASENAME = "tisdk-bootstrap-base-image${ARAGO_IMAGE_SUFFIX}"
meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bb +0 -2
index f39e2e35..d0aef0de 100644
@@ -20,5 +20,3 @@ IMAGE_INSTALL += " \
 	bootstrap-initrd \
 	${ARAGO_BOOTSTRAP_IMAGE_EXTRA_INSTALL} \
 "
-
-export IMAGE_BASENAME = "tisdk-bootstrap-image${ARAGO_IMAGE_SUFFIX}"
meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb +0 -3
index ed2eb5ae..0711ec10 100644
@@ -18,6 +18,3 @@ DEPLOY_IMAGES_NAME:append:am65xx-evm = " sysfw-am65x_sr2-gp-evm.itb"
 DEPLOY_IMAGES_NAME:append:am65xx-hs-evm = " sysfw-am65x_sr2-hs-evm.itb"
 DEPLOY_IMAGES_NAME:append:ti33x = " extlinux.conf"
 DEPLOY_IMAGES_NAME:append:ti43x = " extlinux.conf"
-
-ARAGO_TISDK_IMAGE ?= "tisdk-core-bundle"
-export IMAGE_BASENAME = "${ARAGO_TISDK_IMAGE}${ARAGO_IMAGE_SUFFIX}"
meta-arago-distro/recipes-core/images/tisdk-default-image.bb +0 -2
index 077fe05f..27c5671c 100644
@@ -30,8 +30,6 @@ IMAGE_INSTALL += "\
     packagegroup-arago-tisdk-sysrepo \
 "
 
-export IMAGE_BASENAME = "tisdk-default-image${ARAGO_IMAGE_SUFFIX}"
-
 DEVTOOLS = " \
     linux-libc-headers-dev \
     build-essential \
meta-arago-distro/recipes-core/images/tisdk-jailhouse-image.bb +0 -2
index 1f96781a..b7bfc825 100644
@@ -10,5 +10,3 @@ require recipes-core/images/tisdk-default-image.bb
 COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
 
 IMAGE_INSTALL += " jailhouse"
-
-export IMAGE_BASENAME = "tisdk-jailhouse-image${ARAGO_IMAGE_SUFFIX}"
meta-arago-distro/recipes-core/images/tisdk-jailhouse-inmate.bb +0 -2
index 1a051161..bcde33d6 100644
@@ -12,5 +12,3 @@ COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
 IMAGE_FSTYPES += "cpio"
 
 PACKAGE_INSTALL += "jailhouse-inmate"
-
-export IMAGE_BASENAME = "tisdk-jailhouse-inmate${ARAGO_IMAGE_SUFFIX}"
meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb +0 -2
index 1eb864a6..477986e4 100644
@@ -22,5 +22,3 @@ IMAGE_INSTALL += "\
     docker \
     ${ARAGO_THIN_IMAGE_EXTRA_INSTALL} \
 "
-
-export IMAGE_BASENAME = "tisdk-thinlinux-image${ARAGO_IMAGE_SUFFIX}"
meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb +0 -2
index 8e7712a8..40c58e99 100644
@@ -17,5 +17,3 @@ IMAGE_INSTALL += " \
 "
 
 DEPENDS += " tisdk-tiny-initramfs"
-
-export IMAGE_BASENAME = "tisdk-tiny-image${ARAGO_IMAGE_SUFFIX}"
meta-arago-distro/recipes-core/images/tisdk-tiny-initramfs.bb +0 -2
index f367fa30..fd444be8 100644
@@ -21,8 +21,6 @@ IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
 
 PACKAGE_INSTALL = "packagegroup-arago-initramfs"
 
-export IMAGE_BASENAME = "tisdk-tiny-initramfs${ARAGO_IMAGE_SUFFIX}"
-
 # To further reduce the size of the rootfs, remove the /boot directory from
 # the final image this is usually done by adding RDEPENDS_kernel-base = ""
 # in the configuration file. In our case we can't use this method. Instead we
Signature · 1 line
2.39.2
#5 lore raw
In reply to Andrew Davis

meta-arago / na / 20260105200456.2472163-1-afd

PRC Results: PASS

=========================================================
check-yocto-patches: PASS
=========================================================
Patches
----------------------------------------
WARN - [meta-arago][master][PATCH 4/5] branding: Remove processor-sdk branding file
WARN: Commit message does not include file/recipe name: branding: Remove processor-sdk branding file. (COMMIT-MESSAGE-2)
patch

For details on the above errors/warnings visit: https://lists.yoctoproject.org/g/meta-ti/wiki/40887

=========================================================
apply-yocto-patch: PASS
=========================================================
master
=====================
Summary:
- Patch Series: [meta-arago][master][PATCH 1/5] arago-image.inc: Set IMAGE_FEATURES in each image recipe
- Submitter: From: Andrew Davis <[email protected]>
- Date: Date: Mon, 5 Jan 2026 14:04:52 -0600
- Num Patches: 5
- Mailing List (public inbox) Commit SHA: cda6ebddd8a15a790a26f12fc722437430aaeb47

Applied to:
- Repository: lcpd-prc-meta-arago
- Base Branch: master-wip
- Commit Author: Ryan Eatmon <[email protected]>
- Commit Subject: libdrm: Remove upstreamed patch
- Commit SHA: 8c190b1e4f6a53ea641ba9d6150ef873f561c706

Patches
----------------------------------------
All patches applied

=========================================================
check-yocto-repo: PASS
=========================================================
master
=====================
PASS

=========================================================
yocto-check-layers: PASS
=========================================================
master - PASS
=====================
All checks passed