On Thu, 2025-02-06 at 15:22 +0100, Mueller, Daniel via lists.openembedded.org wrote: > From: Sebastian Zenker <[email protected]> > > When specifying the dependencies of do_bundle_initramfs the current > multiconfig might not be the default. This fixes the dependencies between > the multiconfigs if the current differs to default. > > Signed-off-by: Mueller, Daniel <[email protected]> > --- > meta/classes-recipe/kernel.bbclass | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/meta/classes-recipe/kernel.bbclass > b/meta/classes-recipe/kernel.bbclass > index 617727a989..9276ddb62a 100644 > --- a/meta/classes-recipe/kernel.bbclass > +++ b/meta/classes-recipe/kernel.bbclass > @@ -146,7 +146,10 @@ set -e > # standalone for use by wic and other tools. > if image: > if d.getVar('INITRAMFS_MULTICONFIG'): > - d.appendVarFlag('do_bundle_initramfs', 'mcdepends', ' > mc::${INITRAMFS_MULTICONFIG}:${INITRAMFS_IMAGE}:do_image_complete') > + mc = d.getVar('BB_CURRENT_MC') > + if mc == 'default': > + mc = '' > + d.appendVarFlag('do_bundle_initramfs', 'mcdepends', ' mc:' + mc > + ':${INITRAMFS_MULTICONFIG}:${INITRAMFS_IMAGE}:do_image_complete') > else: > d.appendVarFlag('do_bundle_initramfs', 'depends', ' > ${INITRAMFS_IMAGE}:do_image_complete') > if image and bb.utils.to_boolean(d.getVar('INITRAMFS_IMAGE_BUNDLE')):
The "default" value in multiconfig was recently removed entirely so this patch is not needed for master. This does raise questions of how it was tested. Cheers, Richard
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#211554): https://lists.openembedded.org/g/openembedded-core/message/211554 Mute This Topic: https://lists.openembedded.org/mt/111036674/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
