mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 03:32:12 +02:00
util-linux: one package per binary (pt 4: bindir)
Similar to the previous patch.
Existing packages (and current dependency by main package):
* ionice <- RRECOMMENDS
* lsblk <- RDEPENDS
* lscpu
* mcookie
* prlimit <- RRECOMMENDS
* unshare
* uuidgen
New packages:
* too many to list
To avoid breaking existing users, all the new packages
are added to the main package as RRECOMMENDS_${PN}, so
they are pulled into existing images etc.
The existing RDEPENDS_${PN} will need some further
clean-up in the future, as it appears a bit random which
packages the main package depends on vs. recommends.
Nevertheless, all existing packages have been added to
RRECOMMENDS this time, even if they weren't in RDEPENDS /
RRECOMMENDS before.
Unfortunately, we need to add explicit ALTERNATIVE_LINK_NAME[]
for a few cases, as previously they were implied using
defaults by being specified in ALTERNATIVE_${PN}. We can't
easily automate that using do_split_packages(), so we
simply add them explicitly.
[YOCTO #13058]
(From OE-Core rev: 7b66185c447453640f26e2563e85b6422a3e6118)
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
André Draszik
committed by
Richard Purdie
Richard Purdie
parent
9ecdf90675
commit
d11cbdf149
@@ -28,12 +28,7 @@ MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
|
||||
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz \
|
||||
"
|
||||
|
||||
PACKAGES =+ "util-linux-swaponoff \
|
||||
util-linux-uuidgen util-linux-lscpu \
|
||||
util-linux-mcookie \
|
||||
util-linux-lsblk \
|
||||
util-linux-prlimit \
|
||||
util-linux-ionice util-linux-unshare"
|
||||
PACKAGES =+ "util-linux-swaponoff"
|
||||
PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}"
|
||||
|
||||
python util_linux_binpackages () {
|
||||
@@ -54,7 +49,7 @@ python util_linux_binpackages () {
|
||||
description='${PN} %s',
|
||||
hook=pkg_hook, extra_depends='', prepend=True)
|
||||
|
||||
for dir in [ '${sbindir}' ]:
|
||||
for dir in [ '${sbindir}', '${bindir}' ]:
|
||||
do_split_packages(d, root=dir,
|
||||
file_regex=r'(.*)', output_pattern='${PN}-%s',
|
||||
description='${PN} %s',
|
||||
@@ -65,7 +60,7 @@ python util_linux_binpackages () {
|
||||
# pointing to
|
||||
extras = {}
|
||||
dvar = d.getVar('PKGD')
|
||||
for root in [ '${base_sbindir}', '${base_bindir}', '${sbindir}' ]:
|
||||
for root in [ '${base_sbindir}', '${base_bindir}', '${sbindir}', '${bindir}' ]:
|
||||
root = d.expand(root)
|
||||
for walkroot, dirs, files in os.walk(dvar + root):
|
||||
for f in files:
|
||||
@@ -127,21 +122,12 @@ FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*"
|
||||
|
||||
FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la"
|
||||
|
||||
FILES_util-linux-mcookie = "${bindir}/mcookie"
|
||||
FILES_util-linux-uuidgen = "${bindir}/uuidgen"
|
||||
FILES_util-linux-prlimit = "${bindir}/prlimit"
|
||||
FILES_util-linux-ionice = "${bindir}/ionice.${BPN}"
|
||||
FILES_util-linux-runuser = "${sysconfdir}/pam.d/runuser*"
|
||||
FILES_util-linux-su = "${sysconfdir}/pam.d/su-l"
|
||||
CONFFILES_util-linux-su = "${sysconfdir}/pam.d/su-l"
|
||||
|
||||
FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \
|
||||
${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \
|
||||
${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*"
|
||||
FILES_util-linux-lsblk = "${bindir}/lsblk"
|
||||
FILES_util-linux-lscpu = "${bindir}/lscpu"
|
||||
|
||||
FILES_util-linux-unshare = "${bindir}/unshare.${BPN}"
|
||||
|
||||
# Util-linux' blkid replaces the e2fsprogs one
|
||||
RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid"
|
||||
@@ -150,7 +136,6 @@ 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} = "util-linux-prlimit util-linux-ionice"
|
||||
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"
|
||||
|
||||
@@ -234,12 +219,6 @@ do_install_append_class-native () {
|
||||
|
||||
ALTERNATIVE_PRIORITY = "80"
|
||||
|
||||
ALTERNATIVE_${PN} = " \
|
||||
hexdump last lastb logger mesg renice wall \
|
||||
setsid chrt flock utmpdump eject taskset fallocate \
|
||||
nsenter cal rev \
|
||||
"
|
||||
|
||||
ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
|
||||
ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
|
||||
ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more"
|
||||
@@ -247,9 +226,23 @@ ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap"
|
||||
ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev"
|
||||
ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
|
||||
ALTERNATIVE_LINK_NAME[cal] = "${bindir}/cal"
|
||||
ALTERNATIVE_LINK_NAME[chrt] = "${bindir}/chrt"
|
||||
ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
|
||||
ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate"
|
||||
ALTERNATIVE_LINK_NAME[flock] = "${bindir}/flock"
|
||||
ALTERNATIVE_LINK_NAME[hexdump] = "${bindir}/hexdump"
|
||||
ALTERNATIVE_${PN}-last = "last lastb"
|
||||
ALTERNATIVE_LINK_NAME[last] = "${bindir}/last"
|
||||
ALTERNATIVE_LINK_NAME[lastb] = "${bindir}/lastb"
|
||||
ALTERNATIVE_LINK_NAME[logger] = "${bindir}/logger"
|
||||
ALTERNATIVE_LINK_NAME[mesg] = "${bindir}/mesg"
|
||||
ALTERNATIVE_LINK_NAME[nsenter] = "${bindir}/nsenter"
|
||||
ALTERNATIVE_LINK_NAME[renice] = "${bindir}/renice"
|
||||
ALTERNATIVE_LINK_NAME[rev] = "${bindir}/rev"
|
||||
ALTERNATIVE_LINK_NAME[setsid] = "${bindir}/setsid"
|
||||
ALTERNATIVE_LINK_NAME[taskset] = "${bindir}/taskset"
|
||||
ALTERNATIVE_LINK_NAME[utmpdump] = "${bindir}/utmpdump"
|
||||
ALTERNATIVE_LINK_NAME[wall] = "${bindir}/wall"
|
||||
ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze"
|
||||
ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin"
|
||||
|
||||
@@ -308,10 +301,8 @@ ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin"
|
||||
|
||||
ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint"
|
||||
|
||||
ALTERNATIVE_util-linux-unshare = "unshare"
|
||||
ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare"
|
||||
|
||||
ALTERNATIVE_util-linux-ionice = "ionice"
|
||||
ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice"
|
||||
|
||||
ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
|
||||
|
||||
Reference in New Issue
Block a user