From: André Draszik <andre.dras...@jci.com>
The util-linux meta-package now simply RRECOMMENDS all
subpackages created. There is no distinction between what
it previously recommended or depended on for existing
packages.
This is to streamline the dependencies and to make things
less surprising.
It also stops the -dev package from depending on non-existing
packages like util-linux-losetup-dev etc.
[YOCTO #13058]
Signed-off-by: André Draszik <andre.dras...@jci.com>
---
v3: update commit message
---
meta/recipes-core/util-linux/util-linux.inc | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc
b/meta/recipes-core/util-linux/util-linux.inc
index 7e3887dc92..000db880a1 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -33,16 +33,14 @@ PACKAGES += "${@bb.utils.contains('PACKAGECONFIG',
'pylibmount', 'util-linux-pyl
python util_linux_binpackages () {
def pkg_hook(f, pkg, file_regex, output_pattern, modulename):
+ pn = d.getVar('PN')
+ d.appendVar('RRECOMMENDS_%s' % pn, ' %s' % pkg)
+
if d.getVar('ALTERNATIVE_' + pkg):
return
if d.getVarFlag('ALTERNATIVE_LINK_NAME', modulename):
d.setVar('ALTERNATIVE_' + pkg, modulename)
- def pkg_hook_with_recommends(f, pkg, file_regex, output_pattern,
modulename):
- pn = d.getVar('PN')
- d.appendVar('RRECOMMENDS_%s' % pn, ' %s' % pkg)
- pkg_hook(f, pkg, file_regex, output_pattern, modulename)
-
do_split_packages(d, root='${base_sbindir}',
file_regex=r'(.*)', output_pattern='${PN}-%s',
description='${PN} %s',
@@ -54,11 +52,11 @@ python util_linux_binpackages () {
do_split_packages(d, root='${sbindir}',
file_regex=r'(.*)', output_pattern='${PN}-%s',
description='${PN} %s',
- hook=pkg_hook_with_recommends, extra_depends='',
prepend=True)
+ hook=pkg_hook, extra_depends='', prepend=True)
do_split_packages(d, root='${bindir}',
file_regex=r'(.*)', output_pattern='${PN}-%s',
description='${PN} %s',
- hook=pkg_hook_with_recommends, extra_depends='',
prepend=True)
+ hook=pkg_hook, extra_depends='', prepend=True)
}
# we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS
@@ -111,12 +109,6 @@ FILES_${PN}-setarch = "${bindir}/linux32 ${bindir}/linux64
${bindir}/uname26"
RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid"
RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
-RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup
util-linux-sulogin util-linux-lsblk"
-RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam',
'util-linux-runuser util-linux-su', '', d)}"
-
-RRECOMMENDS_${PN} += "${PN}-blockdev ${PN}-cfdisk ${PN}-ctrlaltdel ${PN}-fdisk
${PN}-mkswap ${PN}-nologin ${PN}-pivot-root ${PN}-switch-root"
-RRECOMMENDS_${PN} += "${PN}-dmesg ${PN}-kill ${PN}-more ${PN}-mount
${PN}-mountpoint"
-
RRECOMMENDS_${PN}_class-native = ""
RRECOMMENDS_${PN}_class-nativesdk = ""
RDEPENDS_${PN}_class-native = ""
--
2.20.1
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
