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>
---
v5: * reduce duplication in util_linux_binpackages() using
a for loop
v3: update commit message
---
meta/recipes-core/util-linux/util-linux.inc | 25 +++++----------------
1 file changed, 6 insertions(+), 19 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc
b/meta/recipes-core/util-linux/util-linux.inc
index cd1450f2c7..2577d0b1ae 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -33,34 +33,27 @@ 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)
-
- for dir in [ '${base_sbindir}', '${base_bindir}' ]:
+ bindirs = [ '${base_sbindir}', '${base_bindir}', '${sbindir}', '${bindir}'
]
+ for dir in bindirs:
do_split_packages(d, root=dir,
file_regex=r'(.*)', output_pattern='${PN}-%s',
description='${PN} %s',
hook=pkg_hook, extra_depends='', prepend=True)
- for dir in [ '${sbindir}', '${bindir}' ]:
- do_split_packages(d, root=dir,
- file_regex=r'(.*)', output_pattern='${PN}-%s',
- description='${PN} %s',
- hook=pkg_hook_with_recommends, extra_depends='',
prepend=True)
-
# There are some symlinks for some binaries which we have ignored
# above. Add them to the package owning the binary they are
# pointing to
extras = {}
dvar = d.getVar('PKGD')
- for root in [ '${base_sbindir}', '${base_bindir}', '${sbindir}',
'${bindir}' ]:
+ for root in bindirs:
root = d.expand(root)
for walkroot, dirs, files in os.walk(dvar + root):
for f in files:
@@ -126,12 +119,6 @@ FILES_util-linux-pylibmount =
"${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so
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
