On Mon, Aug 23, 2021 at 8:23 AM Zoltan Boszormenyi via lists.openembedded.org <[email protected]> wrote: > > From: Zoltán Böszörményi <[email protected]> > > Some Yocto users do use package repositories and sometimes the PR > value is forgotten. Use full versions for inter-package dependencies > for the kernel subpackages.
Can you expand this commit message ? What is the observable problem with the full versions not being in the rdpends ? I've run many different package feeds with different kernels and modules, and haven't run into anything on this front, in my experience the extended version in the package depends/provides causes issues with some package managers .. so we'd need the testing for this documented/provided so we could ensure that there are no hidden issues. Bruce > > Signed-off-by: Zoltán Böszörményi <[email protected]> > --- > meta/classes/kernel.bbclass | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass > index 6dc5387a9b..9ec7daa17a 100644 > --- a/meta/classes/kernel.bbclass > +++ b/meta/classes/kernel.bbclass > @@ -91,17 +91,18 @@ 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' % (kname, > typelower)) > + d.appendVar('RDEPENDS:%s-image' % kname, ' %s-image-%s (= %s)' % > (kname, typelower, fullver)) > splitmods = d.getVar("KERNEL_SPLIT_MODULES") > if splitmods != '1': > - d.appendVar('RDEPENDS:%s-image' % kname, ' %s-modules' % kname) > - d.appendVar('RDEPENDS:%s-image-%s' % (kname, typelower), ' > %s-modules-${KERNEL_VERSION_PKG_NAME}' % kname) > + 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.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) > > @@ -628,12 +629,12 @@ FILES:${KERNEL_PACKAGE_NAME}-image = "" > FILES:${KERNEL_PACKAGE_NAME}-dev = "/boot/System.map* /boot/Module.symvers* > /boot/config* ${KERNEL_SRC_PATH} > ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build" > FILES:${KERNEL_PACKAGE_NAME}-vmlinux = "/boot/vmlinux-${KERNEL_VERSION_NAME}" > FILES:${KERNEL_PACKAGE_NAME}-modules = "" > -RDEPENDS:${KERNEL_PACKAGE_NAME} = "${KERNEL_PACKAGE_NAME}-base" > +RDEPENDS:${KERNEL_PACKAGE_NAME} = "${KERNEL_PACKAGE_NAME}-base (= > ${EXTENDPKGV})" > # Allow machines to override this dependency if kernel image files are > # not wanted in images as standard > -RDEPENDS:${KERNEL_PACKAGE_NAME}-base ?= "${KERNEL_PACKAGE_NAME}-image" > +RDEPENDS:${KERNEL_PACKAGE_NAME}-base ?= "${KERNEL_PACKAGE_NAME}-image (= > ${EXTENDPKGV})" > PKG:${KERNEL_PACKAGE_NAME}-image = > "${KERNEL_PACKAGE_NAME}-image-${@legitimize_package_name(d.getVar('KERNEL_VERSION'))}" > -RDEPENDS:${KERNEL_PACKAGE_NAME}-image += > "${@oe.utils.conditional('KERNEL_IMAGETYPE', 'vmlinux', > '${KERNEL_PACKAGE_NAME}-vmlinux', '', d)}" > +RDEPENDS:${KERNEL_PACKAGE_NAME}-image += > "${@oe.utils.conditional('KERNEL_IMAGETYPE', 'vmlinux', > '${KERNEL_PACKAGE_NAME}-vmlinux (= ${EXTENDPKGV})', '', d)}" > PKG:${KERNEL_PACKAGE_NAME}-base = > "${KERNEL_PACKAGE_NAME}-${@legitimize_package_name(d.getVar('KERNEL_VERSION'))}" > RPROVIDES:${KERNEL_PACKAGE_NAME}-base += > "${KERNEL_PACKAGE_NAME}-${KERNEL_VERSION}" > ALLOW_EMPTY:${KERNEL_PACKAGE_NAME} = "1" > -- > 2.31.1 > > > > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155154): https://lists.openembedded.org/g/openembedded-core/message/155154 Mute This Topic: https://lists.openembedded.org/mt/85083971/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
