On Tue, Aug 31, 2021 at 3:30 PM Richard Purdie <[email protected]> wrote: > > EXTENDPKGV can contain AUTOINC so use an expanded form in the variables > allowing > for later expansion during packaging to avoid race issues over the variable > and > the build failures that can result. > > Signed-off-by: Richard Purdie <[email protected]>
For what it's worth: Tested-by: Andrey Zhizhikin <[email protected]> # kernel v5.14, imx8mp-lpddr4-evk > --- > meta/classes/kernel.bbclass | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass > index ab60e060c6e..d13c38fb026 100644 > --- a/meta/classes/kernel.bbclass > +++ b/meta/classes/kernel.bbclass > @@ -92,18 +92,17 @@ python __anonymous () { > kname = d.getVar('KERNEL_PACKAGE_NAME') or "kernel" > imagedest = d.getVar('KERNEL_IMAGEDEST') > > - fullver = d.getVar('EXTENDPKGV') > for type in types.split(): > if bb.data.inherits_class('nopackages', d): > continue > typelower = type.lower() > d.appendVar('PACKAGES', ' %s-image-%s' % (kname, typelower)) > d.setVar('FILES:' + kname + '-image-' + typelower, '/' + imagedest + > '/' + type + '-${KERNEL_VERSION_NAME}' + ' /' + imagedest + '/' + type) > - d.appendVar('RDEPENDS:%s-image' % kname, ' %s-image-%s (= %s)' % > (kname, typelower, fullver)) > + d.appendVar('RDEPENDS:%s-image' % kname, ' %s-image-%s (= > ${EXTENDPKGV})' % (kname, typelower)) > splitmods = d.getVar("KERNEL_SPLIT_MODULES") > if splitmods != '1': > - d.appendVar('RDEPENDS:%s-image' % kname, ' %s-modules (= %s)' % > (kname, fullver)) > - d.appendVar('RDEPENDS:%s-image-%s' % (kname, typelower), ' > %s-modules-${KERNEL_VERSION_PKG_NAME} (= %s)' % (kname, fullver)) > + d.appendVar('RDEPENDS:%s-image' % kname, ' %s-modules (= > ${EXTENDPKGV})' % kname) > + d.appendVar('RDEPENDS:%s-image-%s' % (kname, typelower), ' > %s-modules-${KERNEL_VERSION_PKG_NAME} (= ${EXTENDPKGV})' % kname) > d.setVar('PKG:%s-modules' % kname, > '%s-modules-${KERNEL_VERSION_PKG_NAME}' % kname) > d.appendVar('RPROVIDES:%s-modules' % kname, > '%s-modules-${KERNEL_VERSION_PKG_NAME}' % kname) > > -- > 2.32.0 > > > > -- Regards, Andrey.
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155533): https://lists.openembedded.org/g/openembedded-core/message/155533 Mute This Topic: https://lists.openembedded.org/mt/85275780/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
