| Message ID | 20260217161041.786432-1-reatmon@ti.com |
|---|---|
| State | Rejected |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,master,v2] ti-core-initramfs: Change assignment of IMAGE_BOOT_FILES | expand |
meta-ti / na / 20260217161041.786432-1-reatmon PRC Results: PASS ========================================================= check-yocto-patches: PASS ========================================================= Patches ---------------------------------------- All patches passed ========================================================= apply-yocto-patch: PASS ========================================================= master ===================== Summary: - Patch Series: [meta-ti][master][PATCH v2] ti-core-initramfs: Change assignment of IMAGE_BOOT_FILES - Submitter: From: Ryan Eatmon <reatmon@ti.com> - Date: Date: Tue, 17 Feb 2026 10:10:41 -0600 - Num Patches: 1 - Mailing List (public inbox) Commit SHA: 191366355266f3f009dc43227083621baadb592c Applied to: - Repository: lcpd-prc-meta-ti - Base Branch: master-next - Commit Author: LCPD Automation Script <lcpdbld@list.ti.com> - Commit Subject: CI/CD Auto-Merger: cicd.master-ltsprep.202602130934 - Commit SHA: 1c2398c320609f8f473a30f15de592549c461fbb Patches ---------------------------------------- All patches applied ========================================================= check-yocto-repo: PASS ========================================================= master ===================== PASS ========================================================= yocto-check-layers: PASS ========================================================= master - PASS ===================== All checks passed
On 2/17/26 10:10 AM, Ryan Eatmon via lists.yoctoproject.org wrote: > The += setting was overriding the weak ?= assignment of IMAGE_BOOT_FILES > in k3.inc. This resulted in nothing going into the boot partition of the Could the weak assignment in k3.inc be changed to a +=? Seems like that would have the same effect and prevent any future issues like this. Andrew > wic image. Change to :append to force this to occur after all other > settings of IMAGE_BOOT_FILES in the conf files have processed. > > Signed-off-by: Ryan Eatmon <reatmon@ti.com> > --- > v2: Fix spelling error in commit message. > > meta-ti-bsp/conf/machine/include/ti-core-initramfs.inc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta-ti-bsp/conf/machine/include/ti-core-initramfs.inc b/meta-ti-bsp/conf/machine/include/ti-core-initramfs.inc > index 9d3cc612..475234a1 100644 > --- a/meta-ti-bsp/conf/machine/include/ti-core-initramfs.inc > +++ b/meta-ti-bsp/conf/machine/include/ti-core-initramfs.inc > @@ -20,4 +20,4 @@ do_image_wic[depends] += "${@ '${TI_CORE_INITRAMFS_IMAGE}:do_image_complete' if > > TI_WKS_INITRAMFS ?= "${@ ',initrd=${TI_CORE_INITRAMFS_IMAGE_FILE}' if d.getVar('TI_CORE_INITRAMFS_ENABLED') == "1" else ''}" > > -IMAGE_BOOT_FILES += "${@ '${TI_CORE_INITRAMFS_IMAGE_FILE}' if d.getVar('TI_CORE_INITRAMFS_ENABLED') == "1" else ''}" > +IMAGE_BOOT_FILES:append = " ${@ '${TI_CORE_INITRAMFS_IMAGE_FILE}' if d.getVar('TI_CORE_INITRAMFS_ENABLED') == "1" else ''}" > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#19524): https://lists.yoctoproject.org/g/meta-ti/message/19524 > Mute This Topic: https://lists.yoctoproject.org/mt/117859038/3619733 > Group Owner: meta-ti+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [afd@ti.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On 2/17/2026 11:23 AM, Andrew Davis wrote: > On 2/17/26 10:10 AM, Ryan Eatmon via lists.yoctoproject.org wrote: >> The += setting was overriding the weak ?= assignment of IMAGE_BOOT_FILES >> in k3.inc. This resulted in nothing going into the boot partition of the > > Could the weak assignment in k3.inc be changed to a +=? Seems like that > would have the same effect and prevent any future issues like this. I would say no. That is the default list. If a platform needs something else then it can simply set IMAGE_BOOT_FILES to something else. But if it was a +=, then the platform would need to use :remove to remove things it does not want. > Andrew > >> wic image. Change to :append to force this to occur after all other >> settings of IMAGE_BOOT_FILES in the conf files have processed. >> >> Signed-off-by: Ryan Eatmon <reatmon@ti.com> >> --- >> v2: Fix spelling error in commit message. >> >> meta-ti-bsp/conf/machine/include/ti-core-initramfs.inc | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/meta-ti-bsp/conf/machine/include/ti-core-initramfs.inc >> b/meta-ti-bsp/conf/machine/include/ti-core-initramfs.inc >> index 9d3cc612..475234a1 100644 >> --- a/meta-ti-bsp/conf/machine/include/ti-core-initramfs.inc >> +++ b/meta-ti-bsp/conf/machine/include/ti-core-initramfs.inc >> @@ -20,4 +20,4 @@ do_image_wic[depends] += "${@ >> '${TI_CORE_INITRAMFS_IMAGE}:do_image_complete' if >> TI_WKS_INITRAMFS ?= "${@ ',initrd=${TI_CORE_INITRAMFS_IMAGE_FILE}' >> if d.getVar('TI_CORE_INITRAMFS_ENABLED') == "1" else ''}" >> -IMAGE_BOOT_FILES += "${@ '${TI_CORE_INITRAMFS_IMAGE_FILE}' if >> d.getVar('TI_CORE_INITRAMFS_ENABLED') == "1" else ''}" >> +IMAGE_BOOT_FILES:append = " ${@ '${TI_CORE_INITRAMFS_IMAGE_FILE}' if >> d.getVar('TI_CORE_INITRAMFS_ENABLED') == "1" else ''}" >> >> >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#19524): >> https://lists.yoctoproject.org/g/meta-ti/message/19524 >> Mute This Topic: https://lists.yoctoproject.org/mt/117859038/3619733 >> Group Owner: meta-ti+owner@lists.yoctoproject.org >> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [afd@ti.com] >> -=-=-=-=-=-=-=-=-=-=-=- >> >
On 2/17/26 11:53 AM, Ryan Eatmon wrote: > > > On 2/17/2026 11:23 AM, Andrew Davis wrote: >> On 2/17/26 10:10 AM, Ryan Eatmon via lists.yoctoproject.org wrote: >>> The += setting was overriding the weak ?= assignment of IMAGE_BOOT_FILES >>> in k3.inc. This resulted in nothing going into the boot partition of the >> >> Could the weak assignment in k3.inc be changed to a +=? Seems like that >> would have the same effect and prevent any future issues like this. > > I would say no. That is the default list. If a platform needs something else then it can simply set IMAGE_BOOT_FILES to something else. But if it was a +=, then the platform would need to use :remove to remove things it does not want. > Given this patch, isn't the need for :remove now also true for `ti-core-initramfs.cpio.xz`? IMAGE_BOOT_FILES seems to be a purely additive list, I can't image some K3 platform wanting to remove say `tiboot3.bin`.. Andrew > >> Andrew >> >>> wic image. Change to :append to force this to occur after all other >>> settings of IMAGE_BOOT_FILES in the conf files have processed. >>> >>> Signed-off-by: Ryan Eatmon <reatmon@ti.com> >>> --- >>> v2: Fix spelling error in commit message. >>> >>> meta-ti-bsp/conf/machine/include/ti-core-initramfs.inc | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/meta-ti-bsp/conf/machine/include/ti-core-initramfs.inc b/meta-ti-bsp/conf/machine/include/ti-core-initramfs.inc >>> index 9d3cc612..475234a1 100644 >>> --- a/meta-ti-bsp/conf/machine/include/ti-core-initramfs.inc >>> +++ b/meta-ti-bsp/conf/machine/include/ti-core-initramfs.inc >>> @@ -20,4 +20,4 @@ do_image_wic[depends] += "${@ '${TI_CORE_INITRAMFS_IMAGE}:do_image_complete' if >>> TI_WKS_INITRAMFS ?= "${@ ',initrd=${TI_CORE_INITRAMFS_IMAGE_FILE}' if d.getVar('TI_CORE_INITRAMFS_ENABLED') == "1" else ''}" >>> -IMAGE_BOOT_FILES += "${@ '${TI_CORE_INITRAMFS_IMAGE_FILE}' if d.getVar('TI_CORE_INITRAMFS_ENABLED') == "1" else ''}" >>> +IMAGE_BOOT_FILES:append = " ${@ '${TI_CORE_INITRAMFS_IMAGE_FILE}' if d.getVar('TI_CORE_INITRAMFS_ENABLED') == "1" else ''}" >>> >>> >>> >>> -=-=-=-=-=-=-=-=-=-=-=- >>> Links: You receive all messages sent to this group. >>> View/Reply Online (#19524): https://lists.yoctoproject.org/g/meta-ti/message/19524 >>> Mute This Topic: https://lists.yoctoproject.org/mt/117859038/3619733 >>> Group Owner: meta-ti+owner@lists.yoctoproject.org >>> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [afd@ti.com] >>> -=-=-=-=-=-=-=-=-=-=-=- >>> >> >
diff --git a/meta-ti-bsp/conf/machine/include/ti-core-initramfs.inc b/meta-ti-bsp/conf/machine/include/ti-core-initramfs.inc index 9d3cc612..475234a1 100644 --- a/meta-ti-bsp/conf/machine/include/ti-core-initramfs.inc +++ b/meta-ti-bsp/conf/machine/include/ti-core-initramfs.inc @@ -20,4 +20,4 @@ do_image_wic[depends] += "${@ '${TI_CORE_INITRAMFS_IMAGE}:do_image_complete' if TI_WKS_INITRAMFS ?= "${@ ',initrd=${TI_CORE_INITRAMFS_IMAGE_FILE}' if d.getVar('TI_CORE_INITRAMFS_ENABLED') == "1" else ''}" -IMAGE_BOOT_FILES += "${@ '${TI_CORE_INITRAMFS_IMAGE_FILE}' if d.getVar('TI_CORE_INITRAMFS_ENABLED') == "1" else ''}" +IMAGE_BOOT_FILES:append = " ${@ '${TI_CORE_INITRAMFS_IMAGE_FILE}' if d.getVar('TI_CORE_INITRAMFS_ENABLED') == "1" else ''}"
The += setting was overriding the weak ?= assignment of IMAGE_BOOT_FILES in k3.inc. This resulted in nothing going into the boot partition of the wic image. Change to :append to force this to occur after all other settings of IMAGE_BOOT_FILES in the conf files have processed. Signed-off-by: Ryan Eatmon <reatmon@ti.com> --- v2: Fix spelling error in commit message. meta-ti-bsp/conf/machine/include/ti-core-initramfs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)