* [PATCH 00/12] RFC: util-linux: one package per binary
@ 2019-01-14 12:56 André Draszik
2019-01-14 12:56 ` [PATCH 01/12] util-linux: simplify version upgrades (MAJOR_VERSION) André Draszik
` (16 more replies)
0 siblings, 17 replies; 103+ messages in thread
From: André Draszik @ 2019-01-14 12:56 UTC (permalink / raw)
To: openembedded-core
This series of patches changes util-linux to splitting into
one package per binary automatically, using do_split_packages()
* the first 5 patches are a general clean-up
* patch 2 could be classed as avoiding a potential crash
* patch 5 is important, as it fixes up some existing packaging
problems
* the subsequent patches are the actual implementation
The slight 1st problem was that update alternatives was running
right after copying from D to PKGD, and at that point in time
PACKAGES and ALTERNATVE_xxx were expected to be fully populated.
So I changed this slightly, so that util-linux can generate
PACKAGES now right after perform_packagecopy(), but before
update-alternatives processing.
The small 2nd problem was that FILES_${PN} must reference the
renamed file name (after update-alternatives has run). Given
this is quite hard to do automatically when populating packages
using do_split_packages(), I updated update-alternatives to
update the file name in FILES_${PN} if the non-renamed file
was specified in there.
This would also allow updating all recipes to drop knowledge
about that renaming where this is done at the moment.
Finally, I am splitting up the packages, one commit per directory.
Things to note and questions:
* it is unclear to me why util-linux RDEPENDS vs. RRECOMMENDS some
of the manually splitted packages before this series, and some
of those pre-existing packages weren't in RRECOMMENDS or RDEPENDS
at all.
For that reason, the RDEPENDS on packages from base_sbindir and
base_bindir that existed before this series, weren't updated,
only new packages from those two directories have been added
to RRECOMMENDS of the meta-package.
I would suggest to drop all RDEPENDS and simply have util-linux
RRECOMMENDS *all* the packages, but I don't know the origial
reasoning for that distinction.
* /etc/default/mountall is the only file remaining in the util-linux
package. I am not sure what to do with it as I coulnd't find any
user anyway.
Can it be dropped altogether, should it be moved into the util-linux-mount
package instead?
Note that the util-linux-mount and util-linux-umount existed before
this series, but /etc/default/mountall was still packaged into
util-linux.
* The pre-existing util-linux-swaponoff is a meta-package now, that
simply RDEPENDS on -swapon and -swapoff, simply for backwards
compatibility reasons, but is it really necessary, given people
can now add -swapon and -swapoff if they want to.
No harm in keeping it either, though.
* the -dev package RRECOMMENDS some (but not all) of the split -dev
packages (which don't necessarily exist), e.g. util-linux-losetup-dev
Should it RPROVIDE those itself instead? Should those be made
ALLOW_EMPTY? Should the RRECOMMENDS be tweaked?
What is the preferred approach here?
^ permalink raw reply [flat|nested] 103+ messages in thread* [PATCH 01/12] util-linux: simplify version upgrades (MAJOR_VERSION) 2019-01-14 12:56 [PATCH 00/12] RFC: util-linux: one package per binary André Draszik @ 2019-01-14 12:56 ` André Draszik 2019-01-14 12:56 ` [PATCH 02/12] util-linux: remove erroneous patch (qsort_r) André Draszik ` (15 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-14 12:56 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> There doesn't appear to be a need to manually and explicitly specificy the major version (for the download URL), it can be deduced easily from PV. Do so. Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 3 ++- meta/recipes-core/util-linux/util-linux_2.32.1.bb | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index b5f77f7b6b..a1702da5b4 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -24,7 +24,8 @@ DEPENDS = "zlib ncurses virtual/crypt" DEPENDS_append_class-native = " lzo-native" DEPENDS_append_class-nativesdk = " lzo-native" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ +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-agetty util-linux-blkdiscard util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ diff --git a/meta/recipes-core/util-linux/util-linux_2.32.1.bb b/meta/recipes-core/util-linux/util-linux_2.32.1.bb index c909836cbb..b0492afff3 100644 --- a/meta/recipes-core/util-linux/util-linux_2.32.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.32.1.bb @@ -1,4 +1,3 @@ -MAJOR_VERSION = "2.32" require util-linux.inc # To support older hosts, we need to patch and/or revert -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH 02/12] util-linux: remove erroneous patch (qsort_r) 2019-01-14 12:56 [PATCH 00/12] RFC: util-linux: one package per binary André Draszik 2019-01-14 12:56 ` [PATCH 01/12] util-linux: simplify version upgrades (MAJOR_VERSION) André Draszik @ 2019-01-14 12:56 ` André Draszik 2019-01-14 12:56 ` [PATCH 03/12] util-linux: remove minix remnants André Draszik ` (14 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-14 12:56 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> The patch in question is patching the code to use qsort() instead of qsort_r(), without adopting the compare function. This is a major issue, because the compare function as written is evaluating / accessing a third argument, which is not passed with this OE patch, causing access to random memory. Given this patch was added so as to support (old) linux (host) distros which might not provide qsort_r(), according to the git history, and given these days util-linux detects availability of qsort_r() during configure phase, and given musl builds (which doesn't provide qsort_r() either) work without problem, the right solution is to simply drop this invalid patch. Do so. Signed-off-by: André Draszik <andre.draszik@jci.com> --- .../util-linux/util-linux-native-qsort.patch | 33 ------------------- .../util-linux/util-linux_2.32.1.bb | 6 ---- 2 files changed, 39 deletions(-) delete mode 100644 meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch b/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch deleted file mode 100644 index 68bf22de8c..0000000000 --- a/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f220d809be1baa654503bf6ff52f3630b0d7015c Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Wed, 26 Mar 2014 01:30:29 +0000 -Subject: [PATCH] sun.c: use qsort() to instead of qsort_r() - -qsort_r() was added to glibc in version 2.8, so there is no qsort_r() on -the host like CentOS 5.x. - -Upstream-Status: Inappropriate [Other] - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - libfdisk/src/sun.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -Index: util-linux-2.24.2/libfdisk/src/sun.c -=================================================================== ---- util-linux-2.24.2.orig/libfdisk/src/sun.c -+++ util-linux-2.24.2/libfdisk/src/sun.c -@@ -431,10 +431,9 @@ static int sun_verify_disklabel(struct f - } - verify_sun_starts = starts; - -- qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]), -- (int (*)(const void *,const void *,void *)) verify_sun_cmp, -- verify_sun_starts); -- -+ qsort(array,ARRAY_SIZE(array),sizeof(array[0]), -+ (int (*)(const void *,const void *)) verify_sun_cmp); -+ - if (array[0] == -1) { - fdisk_info(cxt, _("No partitions defined.")); - return 0; diff --git a/meta/recipes-core/util-linux/util-linux_2.32.1.bb b/meta/recipes-core/util-linux/util-linux_2.32.1.bb index b0492afff3..0f860c221b 100644 --- a/meta/recipes-core/util-linux/util-linux_2.32.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.32.1.bb @@ -1,14 +1,8 @@ require util-linux.inc -# To support older hosts, we need to patch and/or revert -# some upstream changes. Only do this for native packages. -OLDHOST = "" -OLDHOST_class-native = "file://util-linux-native-qsort.patch" - SRC_URI += "file://configure-sbindir.patch \ file://runuser.pamd \ file://runuser-l.pamd \ - ${OLDHOST} \ file://ptest.patch \ file://run-ptest \ file://display_testname_for_subtest.patch \ -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH 03/12] util-linux: remove minix remnants 2019-01-14 12:56 [PATCH 00/12] RFC: util-linux: one package per binary André Draszik 2019-01-14 12:56 ` [PATCH 01/12] util-linux: simplify version upgrades (MAJOR_VERSION) André Draszik 2019-01-14 12:56 ` [PATCH 02/12] util-linux: remove erroneous patch (qsort_r) André Draszik @ 2019-01-14 12:56 ` André Draszik 2019-01-14 12:56 ` [PATCH 04/12] util-linux: be more explicit about what files go into packages André Draszik ` (13 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-14 12:56 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> While commit fc66762d7c11 ("util-linux: Disable minix support.") (or e88cee8cc31d in poky) removed most of the bits, there are still references to minix remaining. Remove them. Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index a1702da5b4..8c8cbde8c2 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -159,7 +159,7 @@ do_install () { mkdir -p ${D}${base_bindir} sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" - sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root nologin" + sbinprogs_a="pivot_root hwclock mkswap losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root nologin" binprogs_a="dmesg getopt kill more umount mount login su mountpoint" if [ "${base_sbindir}" != "${sbindir}" ]; then -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH 04/12] util-linux: be more explicit about what files go into packages 2019-01-14 12:56 [PATCH 00/12] RFC: util-linux: one package per binary André Draszik ` (2 preceding siblings ...) 2019-01-14 12:56 ` [PATCH 03/12] util-linux: remove minix remnants André Draszik @ 2019-01-14 12:56 ` André Draszik 2019-01-14 12:56 ` [PATCH 05/12] util-linux: fix the su and runuser packages André Draszik ` (12 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-14 12:56 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Just using a wildcard leaves the reader wondering what is meant here. By being explicit we can describe exactly what is intended, i.e. the file name as resulting from the ALTERNATIVE and ALTERNATIVE_LINK_NAME mechanism. Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 8c8cbde8c2..79ab302e6a 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -88,7 +88,7 @@ FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidd = "${sbindir}/uuidd" -FILES_util-linux-rfkill = "${sbindir}/rfkill*" +FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" FILES_util-linux-partx = "${sbindir}/partx" FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" FILES_util-linux-findfs = "${sbindir}/findfs" @@ -105,20 +105,20 @@ FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so FILES_util-linux-lsblk = "${bindir}/lsblk" FILES_util-linux-lscpu = "${bindir}/lscpu" -FILES_util-linux-fsck = "${base_sbindir}/fsck*" +FILES_util-linux-fsck = "${base_sbindir}/fsck.${BPN}" FILES_util-linux-mkfs = "${sbindir}/mkfs" FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" -FILES_util-linux-sulogin = "${base_sbindir}/sulogin*" +FILES_util-linux-sulogin = "${base_sbindir}/sulogin.${BPN}" FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" FILES_util-linux-switch-root = "${base_sbindir}/switch_root.${BPN}" FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one -FILES_util-linux-blkid = "${base_sbindir}/blkid*" +FILES_util-linux-blkid = "${base_sbindir}/blkid.${BPN}" RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" RREPLACES_util-linux-blkid = "e2fsprogs-blkid" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH 05/12] util-linux: fix the su and runuser packages 2019-01-14 12:56 [PATCH 00/12] RFC: util-linux: one package per binary André Draszik ` (3 preceding siblings ...) 2019-01-14 12:56 ` [PATCH 04/12] util-linux: be more explicit about what files go into packages André Draszik @ 2019-01-14 12:56 ` André Draszik 2019-01-14 12:56 ` [PATCH 06/12] update-alternatives: allow hooks before renaming files André Draszik ` (11 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-14 12:56 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> The packages get an automatic RDEPENDS via shlibs, no need to explicitly state it, so we can drop those useless explicit assignments. su is moved into ${base_bindir} in do_install(), so because of a mismatched FILES specification su is actually packaged into the main package at the moment, not into the -su package as likely originally intended. runuser needs the pam configuration files, so they should be in the -runuser package, not in the main package. While fixing this, we can simplify the update alternatives processing for su. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 79ab302e6a..68534d8744 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -96,7 +96,8 @@ FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" FILES_util-linux-runuser = "${sbindir}/runuser" FILES_util-linux-prlimit = "${bindir}/prlimit" FILES_util-linux-ionice = "${bindir}/ionice.${BPN}" -FILES_util-linux-su = "${bindir}/su.util-linux ${sysconfdir}/pam.d/su-l" +FILES_util-linux-runuser = "${sysconfdir}/pam.d/runuser*" +FILES_util-linux-su = "${base_bindir}/su.${BPN} ${sysconfdir}/pam.d/su-l" CONFFILES_util-linux-su = "${sysconfdir}/pam.d/su-l" FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ @@ -122,9 +123,6 @@ FILES_util-linux-blkid = "${base_sbindir}/blkid.${BPN}" RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" RREPLACES_util-linux-blkid = "e2fsprogs-blkid" -RDEPENDS_util-linux-runuser += "libpam" -RDEPENDS_util-linux-su += "libpam" - 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)}" @@ -228,6 +226,7 @@ ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 rfkill.8 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1" +ALTERNATIVE_${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" @@ -235,6 +234,7 @@ ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" ALTERNATIVE_LINK_NAME[rfkill.8] = "${mandir}/man8/rfkill.8" +ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" @@ -263,6 +263,9 @@ ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" ALTERNATIVE_util-linux-mount = "mount" ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" +ALTERNATIVE_${PN}-su = "su" +ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" + ALTERNATIVE_util-linux-umount = "umount" ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" @@ -305,15 +308,6 @@ ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" BBCLASSEXTEND = "native nativesdk" -python do_package_prepend () { - if '--enable-su' in d.getVar('EXTRA_OECONF').split(): - d.appendVar(d.expand('ALTERNATIVE_${PN}'), ' su') - d.appendVar(d.expand('ALTERNATIVE_${PN}-doc'), ' su.1') - - d.setVarFlag('ALTERNATIVE_LINK_NAME', "su", d.expand('${base_bindir}/su')) - d.setVarFlag('ALTERNATIVE_LINK_NAME', "su.1", d.expand('${mandir}/man1/su.1')) -} - python populate_packages_prepend() { do_split_packages(d, '${base_libdir}', '^lib(.*)\.so\..*$', output_pattern='util-linux-lib%s', -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH 06/12] update-alternatives: allow hooks before renaming files 2019-01-14 12:56 [PATCH 00/12] RFC: util-linux: one package per binary André Draszik ` (4 preceding siblings ...) 2019-01-14 12:56 ` [PATCH 05/12] util-linux: fix the su and runuser packages André Draszik @ 2019-01-14 12:56 ` André Draszik 2019-01-14 12:56 ` [PATCH 07/12] update-alternatives: try to update FILES_${PN} when renaming a file André Draszik ` (10 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-14 12:56 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> At the moment, the update alternatives handling is happening right after copying into PKGD during packaging time using an _append OVERRIDE to the copy function. This means that at this point the PACKAGES variable must have been fully populated, as that is a prerequisite for update-alternatives. In other words, this makes it impossible to e.g. populate PACKAGES dynamically using do_split_packages() and still do update-alternatives, as do_split_packages() can never execute early enough in a deterministic way. By converting the existing python function from a 'def' type function to a 'python' type function, we now make it possible for somebody to hook themselves between copying into PKGD and execution of update-alternatives, via a _prepend OVERRIDE, which is not possible with 'def' type functions. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/classes/update-alternatives.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index f1250f877b..ffedada2f6 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass @@ -135,10 +135,10 @@ populate_packages[vardeps] += "${UPDALTVARS} ${@gen_updatealternativesvars(d)}" # place. python perform_packagecopy_append () { if update_alternatives_enabled(d): - apply_update_alternative_renames(d) + bb.build.exec_func('apply_update_alternative_renames', d) } -def apply_update_alternative_renames(d): +python apply_update_alternative_renames () { # Check for deprecated usage... pn = d.getVar('BPN') if d.getVar('ALTERNATIVE_LINKS') != None: @@ -204,6 +204,7 @@ def apply_update_alternative_renames(d): os.unlink(src) else: bb.warn('%s: Unable to resolve dangling symlink: %s' % (pn, alt_target)) +} PACKAGESPLITFUNCS_prepend = "populate_packages_updatealternatives " -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH 07/12] update-alternatives: try to update FILES_${PN} when renaming a file 2019-01-14 12:56 [PATCH 00/12] RFC: util-linux: one package per binary André Draszik ` (5 preceding siblings ...) 2019-01-14 12:56 ` [PATCH 06/12] update-alternatives: allow hooks before renaming files André Draszik @ 2019-01-14 12:56 ` André Draszik 2019-01-14 12:56 ` [PATCH 08/12] util-linux: one package per binary (pt 1: base_sbindir) André Draszik ` (9 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-14 12:56 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> When using update-alternatives, FILES_${PN} must be referencing the new name after update-alternatives has renamed files. This is more or less OK when having static lists of files to be packaged into a package, but makes it quite hard to dynamically generate FILES_${PN}, e.g. using do_split_packages(), as in that case we can not easily modify what goes into FILES_${PN}, because that list is based on filenames as seen at the time do_split_packages() is executing. Of couse one could explicitly specify the (renamed) file(s) in the recipe, but that contradicts the intended usage of do_split_packages(). Instead, if FILES_${PN} contains the file name as it was pre renaming, we here modify this to reflect the new name. This will allow usage of do_split_packages() to populate FILES_${PN}. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/classes/update-alternatives.bbclass | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index ffedada2f6..a204afb060 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass @@ -139,6 +139,8 @@ python perform_packagecopy_append () { } python apply_update_alternative_renames () { + from re import sub + # Check for deprecated usage... pn = d.getVar('BPN') if d.getVar('ALTERNATIVE_LINKS') != None: @@ -178,6 +180,10 @@ python apply_update_alternative_renames () { else: bb.note('%s: Rename %s -> %s' % (pn, alt_target, alt_target_rename)) os.rename(src, dest) + f = d.getVar('FILES_' + pkg) + if f: + f = sub(r'(^|\s)%s(\s|$)' % alt_target, r'\1%s\2' % alt_target_rename, f) + d.setVar('FILES_' + pkg, f) else: bb.warn("%s: alternative target (%s or %s) does not exist, skipping..." % (pn, alt_target, alt_target_rename)) continue @@ -204,6 +210,11 @@ python apply_update_alternative_renames () { os.unlink(src) else: bb.warn('%s: Unable to resolve dangling symlink: %s' % (pn, alt_target)) + continue + f = d.getVar('FILES_' + pkg) + if f: + f = sub(r'(^|\s)%s(\s|$)' % alt_target, r'\1%s\2' % alt_target_rename, f) + d.setVar('FILES_' + pkg, f) } PACKAGESPLITFUNCS_prepend = "populate_packages_updatealternatives " -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH 08/12] util-linux: one package per binary (pt 1: base_sbindir) 2019-01-14 12:56 [PATCH 00/12] RFC: util-linux: one package per binary André Draszik ` (6 preceding siblings ...) 2019-01-14 12:56 ` [PATCH 07/12] update-alternatives: try to update FILES_${PN} when renaming a file André Draszik @ 2019-01-14 12:56 ` André Draszik 2019-01-14 12:56 ` [PATCH 09/12] util-linux: one package per binary (pt 2: base_bindir) André Draszik ` (8 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-14 12:56 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Now that we have required infrastructure in place, we can start creating one package per binary. To make this process easier to follow, this is done in steps, starting with binaries from base_sbindir. Existing packages (and current dependency by main package): * agetty * blkid * cfdisk <- RRECOMMENDS * fdisk <- RRECOMMENDS * fsck * fstrim * losetup <- RDEPENDS * hwclock * sulogin <- RDEPENDS * swaponoff <- RDEPENDS * switch-root <- RRECOMMENDS New packages: * blockdev * ctrlaltdel * mkswap * nologin * pivot-root * swapon * swapoff swaponoff is empty now and simply depends on swapon swapoff 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. Existing packages that aren't in RDEPENDS / RRECOMMENDS haven't been added to RRECOMMENDS for that reason. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 58 +++++++++------------ 1 file changed, 26 insertions(+), 32 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 68534d8744..c7d6c3a039 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -28,19 +28,29 @@ 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-agetty util-linux-blkdiscard util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ - util-linux-swaponoff util-linux-losetup util-linux-umount \ +PACKAGES =+ "util-linux-blkdiscard util-linux-sfdisk \ + util-linux-swaponoff util-linux-umount \ util-linux-mount util-linux-readprofile util-linux-uuidd \ - util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs util-linux-fsck \ - util-linux-blkid util-linux-mkfs util-linux-mcookie util-linux-rfkill \ - util-linux-lsblk util-linux-mkfs.cramfs util-linux-fstrim \ - util-linux-partx util-linux-hwclock util-linux-mountpoint \ - util-linux-findfs util-linux-getopt util-linux-sulogin util-linux-prlimit \ - util-linux-ionice util-linux-switch-root util-linux-unshare" + util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs \ + util-linux-mkfs util-linux-mcookie util-linux-rfkill \ + util-linux-lsblk util-linux-mkfs.cramfs \ + util-linux-partx util-linux-mountpoint \ + util-linux-findfs util-linux-getopt util-linux-prlimit \ + util-linux-ionice util-linux-unshare" PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}" -PACKAGES_DYNAMIC = "^util-linux-lib.*" +python apply_update_alternative_renames_prepend () { + def pkg_hook(f, pkg, file_regex, output_pattern, modulename): + if d.getVar('ALTERNATIVE_' + pkg): + return + if d.getVarFlag('ALTERNATIVE_LINK_NAME', modulename): + d.setVar('ALTERNATIVE_' + pkg, modulename) + + do_split_packages(d, root='${base_sbindir}', file_regex='(.*)', output_pattern='${BPN}-%s', description='util-linux %s', hook=pkg_hook, extra_depends='', prepend=True) +} + +PACKAGES_DYNAMIC = "^util-linux-.*" SHARED_EXTRA_OECONF = "--disable-use-tty-group \ --disable-makeinstall-chown \ @@ -74,14 +84,8 @@ FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" -FILES_util-linux-agetty = "${base_sbindir}/agetty" FILES_util-linux-blkdiscard = "${sbindir}/blkdiscard" -FILES_util-linux-fdisk = "${base_sbindir}/fdisk.${BPN}" -FILES_util-linux-fstrim = "${base_sbindir}/fstrim.${BPN}" -FILES_util-linux-cfdisk = "${base_sbindir}/cfdisk" FILES_util-linux-sfdisk = "${sbindir}/sfdisk" -FILES_util-linux-swaponoff = "${base_sbindir}/swapon.${BPN} ${base_sbindir}/swapoff.${BPN}" -FILES_util-linux-losetup = "${base_sbindir}/losetup.${BPN}" FILES_util-linux-mount = "${base_bindir}/mount.${BPN}" FILES_util-linux-mcookie = "${bindir}/mcookie" FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" @@ -90,7 +94,6 @@ FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidd = "${sbindir}/uuidd" FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" FILES_util-linux-partx = "${sbindir}/partx" -FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" FILES_util-linux-findfs = "${sbindir}/findfs" FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" FILES_util-linux-runuser = "${sbindir}/runuser" @@ -106,27 +109,24 @@ FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so FILES_util-linux-lsblk = "${bindir}/lsblk" FILES_util-linux-lscpu = "${bindir}/lscpu" -FILES_util-linux-fsck = "${base_sbindir}/fsck.${BPN}" FILES_util-linux-mkfs = "${sbindir}/mkfs" FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" -FILES_util-linux-sulogin = "${base_sbindir}/sulogin.${BPN}" FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" -FILES_util-linux-switch-root = "${base_sbindir}/switch_root.${BPN}" FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one -FILES_util-linux-blkid = "${base_sbindir}/blkid.${BPN}" 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} = "util-linux-blkdiscard util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint util-linux-prlimit util-linux-ionice util-linux-switch-root" +RRECOMMENDS_${PN} = "util-linux-blkdiscard util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint 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}_class-native = "" RRECOMMENDS_${PN}_class-nativesdk = "" @@ -135,6 +135,9 @@ RDEPENDS_${PN}_class-nativesdk = "" RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev" +RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" +ALLOW_EMPTY_${PN}-swaponoff = "1" + #SYSTEMD_PACKAGES = "${PN}-uuidd ${PN}-fstrim" SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.socket uuidd.service" SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable" @@ -206,9 +209,9 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = " \ - dmesg kill more mkswap blockdev pivot_root \ + dmesg kill more \ hexdump last lastb logger mesg renice wall \ - setsid chrt flock utmpdump eject nologin taskset fallocate \ + setsid chrt flock utmpdump eject taskset fallocate \ fsfreeze nsenter cal rev \ " @@ -247,13 +250,10 @@ ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3" ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" -ALTERNATIVE_util-linux-hwclock = "hwclock" ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" -ALTERNATIVE_util-linux-fdisk = "fdisk" ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" -ALTERNATIVE_util-linux-fstrim = "fstrim" ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" ALTERNATIVE_util-linux-agetty = "getty" @@ -272,17 +272,13 @@ ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" ALTERNATIVE_util-linux-readprofile = "readprofile" ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" -ALTERNATIVE_util-linux-losetup = "losetup" ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" -ALTERNATIVE_util-linux-swaponoff = "swapoff swapon" ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" -ALTERNATIVE_util-linux-fsck = "fsck" ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" -ALTERNATIVE_util-linux-blkid = "blkid" ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" ALTERNATIVE_util-linux-rfkill = "rfkill" @@ -291,7 +287,6 @@ ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" ALTERNATIVE_util-linux-getopt = "getopt" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" -ALTERNATIVE_util-linux-sulogin = "sulogin" ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" ALTERNATIVE_util-linux-mountpoint = "mountpoint" @@ -303,7 +298,6 @@ ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" ALTERNATIVE_util-linux-ionice = "ionice" ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" -ALTERNATIVE_util-linux-switch-root = "switch_root" ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" BBCLASSEXTEND = "native nativesdk" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH 09/12] util-linux: one package per binary (pt 2: base_bindir) 2019-01-14 12:56 [PATCH 00/12] RFC: util-linux: one package per binary André Draszik ` (7 preceding siblings ...) 2019-01-14 12:56 ` [PATCH 08/12] util-linux: one package per binary (pt 1: base_sbindir) André Draszik @ 2019-01-14 12:56 ` André Draszik 2019-01-14 12:56 ` [PATCH 10/12] util-linux: one package per binary (pt 3: sbindir) André Draszik ` (7 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-14 12:56 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Similar to the previous patch. Existing packages (and current dependency by main package): * mount <- RRECOMMENDS * umount <- RDEPENDS * mountpoint <- RRECOMMENDS * getopt * su <- RDEPENDS New packages: * dmesg * kill * more 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. Existing packages that aren't in RDEPENDS / RRECOMMENDS haven't been added to RRECOMMENDS for that reason. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 29 +++++++-------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index c7d6c3a039..3d97be8c30 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -29,16 +29,16 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz " PACKAGES =+ "util-linux-blkdiscard util-linux-sfdisk \ - util-linux-swaponoff util-linux-umount \ - util-linux-mount util-linux-readprofile util-linux-uuidd \ + util-linux-swaponoff \ + util-linux-readprofile util-linux-uuidd \ util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs \ util-linux-mkfs util-linux-mcookie util-linux-rfkill \ util-linux-lsblk util-linux-mkfs.cramfs \ - util-linux-partx util-linux-mountpoint \ - util-linux-findfs util-linux-getopt util-linux-prlimit \ + util-linux-partx \ + util-linux-findfs util-linux-prlimit \ util-linux-ionice util-linux-unshare" PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" -PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}" +PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}" python apply_update_alternative_renames_prepend () { def pkg_hook(f, pkg, file_regex, output_pattern, modulename): @@ -48,6 +48,7 @@ python apply_update_alternative_renames_prepend () { d.setVar('ALTERNATIVE_' + pkg, modulename) do_split_packages(d, root='${base_sbindir}', file_regex='(.*)', output_pattern='${BPN}-%s', description='util-linux %s', hook=pkg_hook, extra_depends='', prepend=True) + do_split_packages(d, root='${base_bindir}', file_regex='(.*)', output_pattern='${BPN}-%s', description='util-linux %s', hook=pkg_hook, extra_depends='', prepend=True) } PACKAGES_DYNAMIC = "^util-linux-.*" @@ -86,21 +87,18 @@ FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" FILES_util-linux-blkdiscard = "${sbindir}/blkdiscard" FILES_util-linux-sfdisk = "${sbindir}/sfdisk" -FILES_util-linux-mount = "${base_bindir}/mount.${BPN}" FILES_util-linux-mcookie = "${bindir}/mcookie" -FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidd = "${sbindir}/uuidd" FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" FILES_util-linux-partx = "${sbindir}/partx" FILES_util-linux-findfs = "${sbindir}/findfs" -FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" FILES_util-linux-runuser = "${sbindir}/runuser" 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 = "${base_bindir}/su.${BPN} ${sysconfdir}/pam.d/su-l" +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 \ @@ -114,8 +112,6 @@ FILES_util-linux-mkfs = "${sbindir}/mkfs" FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" -FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" - FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one @@ -125,8 +121,9 @@ 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-blkdiscard util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint util-linux-prlimit util-linux-ionice" +RRECOMMENDS_${PN} = "util-linux-blkdiscard util-linux-sfdisk util-linux-readprofile util-linux-mkfs 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" RRECOMMENDS_${PN}_class-native = "" RRECOMMENDS_${PN}_class-nativesdk = "" @@ -209,7 +206,6 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = " \ - dmesg kill more \ hexdump last lastb logger mesg renice wall \ setsid chrt flock utmpdump eject taskset fallocate \ fsfreeze nsenter cal rev \ @@ -260,13 +256,8 @@ ALTERNATIVE_util-linux-agetty = "getty" ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" -ALTERNATIVE_util-linux-mount = "mount" ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" - -ALTERNATIVE_${PN}-su = "su" ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" - -ALTERNATIVE_util-linux-umount = "umount" ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" ALTERNATIVE_util-linux-readprofile = "readprofile" @@ -284,12 +275,10 @@ ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" ALTERNATIVE_util-linux-rfkill = "rfkill" ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" -ALTERNATIVE_util-linux-getopt = "getopt" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" -ALTERNATIVE_util-linux-mountpoint = "mountpoint" ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" ALTERNATIVE_util-linux-unshare = "unshare" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH 10/12] util-linux: one package per binary (pt 3: sbindir) 2019-01-14 12:56 [PATCH 00/12] RFC: util-linux: one package per binary André Draszik ` (8 preceding siblings ...) 2019-01-14 12:56 ` [PATCH 09/12] util-linux: one package per binary (pt 2: base_bindir) André Draszik @ 2019-01-14 12:56 ` André Draszik 2019-01-14 12:56 ` [PATCH 11/12] util-linux: one package per binary (pt 4: bindir) André Draszik ` (6 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-14 12:56 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Similar to the previous patch. Existing packages (and current dependency by main package): * blkdiscard <- RRECOMMENDS * findfs * fsck.cramfs * mkfs <- RRECOMMENDS * mkfs.cramfs * partx * readprofile <- RRECOMMENDS * rfkill * runuser <- RDEPENDS * sfdisk <- RRECOMMENDS * uuidd 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. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 39 +++++++-------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 3d97be8c30..deb000c52f 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -28,17 +28,13 @@ 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-blkdiscard util-linux-sfdisk \ - util-linux-swaponoff \ - util-linux-readprofile util-linux-uuidd \ - util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs \ - util-linux-mkfs util-linux-mcookie util-linux-rfkill \ - util-linux-lsblk util-linux-mkfs.cramfs \ - util-linux-partx \ - util-linux-findfs util-linux-prlimit \ +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 += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" -PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}" python apply_update_alternative_renames_prepend () { def pkg_hook(f, pkg, file_regex, output_pattern, modulename): @@ -47,8 +43,14 @@ python apply_update_alternative_renames_prepend () { 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='(.*)', output_pattern='${BPN}-%s', description='util-linux %s', hook=pkg_hook, extra_depends='', prepend=True) do_split_packages(d, root='${base_bindir}', file_regex='(.*)', output_pattern='${BPN}-%s', description='util-linux %s', hook=pkg_hook, extra_depends='', prepend=True) + do_split_packages(d, root='${sbindir}', file_regex='(.*)', output_pattern='${BPN}-%s', description='util-linux %s', hook=pkg_hook_with_recommends, extra_depends='', prepend=True) } PACKAGES_DYNAMIC = "^util-linux-.*" @@ -85,16 +87,8 @@ FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" -FILES_util-linux-blkdiscard = "${sbindir}/blkdiscard" -FILES_util-linux-sfdisk = "${sbindir}/sfdisk" FILES_util-linux-mcookie = "${bindir}/mcookie" -FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" FILES_util-linux-uuidgen = "${bindir}/uuidgen" -FILES_util-linux-uuidd = "${sbindir}/uuidd" -FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" -FILES_util-linux-partx = "${sbindir}/partx" -FILES_util-linux-findfs = "${sbindir}/findfs" -FILES_util-linux-runuser = "${sbindir}/runuser" FILES_util-linux-prlimit = "${bindir}/prlimit" FILES_util-linux-ionice = "${bindir}/ionice.${BPN}" FILES_util-linux-runuser = "${sysconfdir}/pam.d/runuser*" @@ -107,11 +101,6 @@ FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so FILES_util-linux-lsblk = "${bindir}/lsblk" FILES_util-linux-lscpu = "${bindir}/lscpu" -FILES_util-linux-mkfs = "${sbindir}/mkfs" - -FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" -FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" - FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one @@ -121,7 +110,7 @@ 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-blkdiscard util-linux-sfdisk util-linux-readprofile util-linux-mkfs util-linux-prlimit util-linux-ionice" +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" @@ -208,7 +197,7 @@ ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = " \ hexdump last lastb logger mesg renice wall \ setsid chrt flock utmpdump eject taskset fallocate \ - fsfreeze nsenter cal rev \ + nsenter cal rev \ " ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" @@ -260,7 +249,6 @@ ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" -ALTERNATIVE_util-linux-readprofile = "readprofile" ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" @@ -272,7 +260,6 @@ ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" -ALTERNATIVE_util-linux-rfkill = "rfkill" ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH 11/12] util-linux: one package per binary (pt 4: bindir) 2019-01-14 12:56 [PATCH 00/12] RFC: util-linux: one package per binary André Draszik ` (9 preceding siblings ...) 2019-01-14 12:56 ` [PATCH 10/12] util-linux: one package per binary (pt 3: sbindir) André Draszik @ 2019-01-14 12:56 ` André Draszik 2019-01-14 12:56 ` [PATCH 12/12] utils-linux: final cleanup André Draszik ` (5 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-14 12:56 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> 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] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 41 +++++++++------------ 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index deb000c52f..e25ff17098 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -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 apply_update_alternative_renames_prepend () { @@ -51,6 +46,7 @@ python apply_update_alternative_renames_prepend () { do_split_packages(d, root='${base_sbindir}', file_regex='(.*)', output_pattern='${BPN}-%s', description='util-linux %s', hook=pkg_hook, extra_depends='', prepend=True) do_split_packages(d, root='${base_bindir}', file_regex='(.*)', output_pattern='${BPN}-%s', description='util-linux %s', hook=pkg_hook, extra_depends='', prepend=True) do_split_packages(d, root='${sbindir}', file_regex='(.*)', output_pattern='${BPN}-%s', description='util-linux %s', hook=pkg_hook_with_recommends, extra_depends='', prepend=True) + do_split_packages(d, root='${bindir}', file_regex='(.*)', output_pattern='${BPN}-%s', description='util-linux %s', hook=pkg_hook_with_recommends, extra_depends='', prepend=True) } PACKAGES_DYNAMIC = "^util-linux-.*" @@ -87,21 +83,15 @@ 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_${PN}-last = "${bindir}/lastb" 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}" +FILES_${PN}-setarch = "${bindir}/linux32 ${bindir}/linux64 ${bindir}/uname26" # Util-linux' blkid replaces the e2fsprogs one RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" @@ -110,7 +100,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" @@ -194,12 +183,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" @@ -207,9 +190,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" @@ -268,10 +265,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" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH 12/12] utils-linux: final cleanup 2019-01-14 12:56 [PATCH 00/12] RFC: util-linux: one package per binary André Draszik ` (10 preceding siblings ...) 2019-01-14 12:56 ` [PATCH 11/12] util-linux: one package per binary (pt 4: bindir) André Draszik @ 2019-01-14 12:56 ` André Draszik 2019-01-15 14:45 ` [PATCH v2 00/12] util-linux: one package per binary André Draszik ` (4 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-14 12:56 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> * use ${PN} instead of util-linux * use PACKAGESPLITFUNCS for creating util-linux-lib* packages rather than an _append OVERRIDE * sort ALTERNATIVE_LINK_NAME alphabetically [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 131 +++++++++----------- 1 file changed, 58 insertions(+), 73 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index e25ff17098..aad95791e3 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -28,8 +28,8 @@ 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" -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" +PACKAGES =+ "${PN}-swaponoff" +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', '${PN}-pylibmount', '', d)}" python apply_update_alternative_renames_prepend () { def pkg_hook(f, pkg, file_regex, output_pattern, modulename): @@ -43,13 +43,22 @@ python apply_update_alternative_renames_prepend () { 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='(.*)', output_pattern='${BPN}-%s', description='util-linux %s', hook=pkg_hook, extra_depends='', prepend=True) - do_split_packages(d, root='${base_bindir}', file_regex='(.*)', output_pattern='${BPN}-%s', description='util-linux %s', hook=pkg_hook, extra_depends='', prepend=True) - do_split_packages(d, root='${sbindir}', file_regex='(.*)', output_pattern='${BPN}-%s', description='util-linux %s', hook=pkg_hook_with_recommends, extra_depends='', prepend=True) - do_split_packages(d, root='${bindir}', file_regex='(.*)', output_pattern='${BPN}-%s', description='util-linux %s', hook=pkg_hook_with_recommends, extra_depends='', prepend=True) + do_split_packages(d, root='${base_sbindir}', file_regex='(.*)', output_pattern='${BPN}-%s', description='${PN} %s', hook=pkg_hook, extra_depends='', prepend=True) + do_split_packages(d, root='${base_bindir}', file_regex='(.*)', output_pattern='${BPN}-%s', description='${PN} %s', hook=pkg_hook, extra_depends='', prepend=True) + do_split_packages(d, root='${sbindir}', file_regex='(.*)', output_pattern='${BPN}-%s', description='${PN} %s', hook=pkg_hook_with_recommends, extra_depends='', prepend=True) + do_split_packages(d, root='${bindir}', file_regex='(.*)', output_pattern='${BPN}-%s', description='${PN} %s', hook=pkg_hook_with_recommends, extra_depends='', prepend=True) } -PACKAGES_DYNAMIC = "^util-linux-.*" +python util_linux_libpackages() { + do_split_packages(d, '${base_libdir}', '^lib(.*)\.so\..*$', + output_pattern='${PN}-lib%s', + description='${PN} lib%s', + extra_depends='', prepend=True, allow_links=True) +} + +PACKAGESPLITFUNCS_prepend = "util_linux_libpackages " + +PACKAGES_DYNAMIC = "^${PN}-.*" SHARED_EXTRA_OECONF = "--disable-use-tty-group \ --disable-makeinstall-chown \ @@ -84,21 +93,21 @@ FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" FILES_${PN}-last = "${bindir}/lastb" -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_${PN}-runuser = "${sysconfdir}/pam.d/runuser*" +FILES_${PN}-su = "${sysconfdir}/pam.d/su-l" +CONFFILES_${PN}-su = "${sysconfdir}/pam.d/su-l" +FILES_${PN}-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ + ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \ + ${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*" FILES_${PN}-setarch = "${bindir}/linux32 ${bindir}/linux64 ${bindir}/uname26" # Util-linux' blkid replaces the e2fsprogs one -RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" -RREPLACES_util-linux-blkid = "e2fsprogs-blkid" +RCONFLICTS_${PN}-blkid = "e2fsprogs-blkid" +RREPLACES_${PN}-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)}" +RDEPENDS_${PN} = "${PN}-umount ${PN}-swaponoff ${PN}-losetup ${PN}-sulogin ${PN}-lsblk" +RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PN}-runuser ${PN}-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" @@ -108,8 +117,10 @@ RRECOMMENDS_${PN}_class-nativesdk = "" RDEPENDS_${PN}_class-native = "" RDEPENDS_${PN}_class-nativesdk = "" -RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev" +RPROVIDES_${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev ${PN}-libuuid-dev" +RDEPENDS_${PN}-bash-completion += "${PN}-lsblk" +RDEPENDS_${PN}-ptest = "bash grep coreutils which ${PN}-blkid ${PN}-fsck btrfs-tools" RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" ALLOW_EMPTY_${PN}-swaponoff = "1" @@ -183,32 +194,54 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" -ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" -ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" -ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" -ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" +ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" 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[dmesg] = "${base_bindir}/dmesg" ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate" +ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" ALTERNATIVE_LINK_NAME[flock] = "${bindir}/flock" +ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" +ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" +ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" +ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" +ALTERNATIVE_${PN}-agetty = "getty" +ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" +ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" ALTERNATIVE_LINK_NAME[hexdump] = "${bindir}/hexdump" +ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" +ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" +ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" 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[losetup] = "${base_sbindir}/losetup" ALTERNATIVE_LINK_NAME[mesg] = "${bindir}/mesg" +ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" +ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" +ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" +ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" +ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" ALTERNATIVE_LINK_NAME[nsenter] = "${bindir}/nsenter" +ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" +ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" ALTERNATIVE_LINK_NAME[renice] = "${bindir}/renice" ALTERNATIVE_LINK_NAME[rev] = "${bindir}/rev" +ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" ALTERNATIVE_LINK_NAME[setsid] = "${bindir}/setsid" +ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" +ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" +ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" +ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" +ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" ALTERNATIVE_LINK_NAME[taskset] = "${bindir}/taskset" +ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" +ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" 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" ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 rfkill.8 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1" ALTERNATIVE_${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" @@ -232,57 +265,9 @@ ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3" ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" -ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" - -ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" - -ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" - -ALTERNATIVE_util-linux-agetty = "getty" -ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" -ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" - -ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" -ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" -ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" - -ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" - -ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" - -ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" -ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" - -ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" - -ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" - -ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" - -ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" - -ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" - -ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" - -ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" - -ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" - -ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" BBCLASSEXTEND = "native nativesdk" -python populate_packages_prepend() { - do_split_packages(d, '${base_libdir}', '^lib(.*)\.so\..*$', - output_pattern='util-linux-lib%s', - description='util-linux lib%s', - extra_depends='', prepend=True, allow_links=True) -} - -RDEPENDS_${PN}-bash-completion += "util-linux-lsblk" -RDEPENDS_${PN}-ptest = "bash grep coreutils which util-linux-blkid util-linux-fsck btrfs-tools" - do_compile_ptest() { oe_runmake buildtest-TESTS } -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v2 00/12] util-linux: one package per binary 2019-01-14 12:56 [PATCH 00/12] RFC: util-linux: one package per binary André Draszik ` (11 preceding siblings ...) 2019-01-14 12:56 ` [PATCH 12/12] utils-linux: final cleanup André Draszik @ 2019-01-15 14:45 ` André Draszik 2019-01-15 14:45 ` [PATCH v2 01/15] util-linux: simplify version upgrades (MAJOR_VERSION) André Draszik ` (14 more replies) 2019-01-16 12:00 ` [PATCH v3 00/12] util-linux: one package per binary André Draszik ` (3 subsequent siblings) 16 siblings, 15 replies; 103+ messages in thread From: André Draszik @ 2019-01-15 14:45 UTC (permalink / raw) To: openembedded-core This is version 2 of this series. It addresses all open questions I had, and fixes a few bugs: Previous open questions: * existing RDEPENDS vs RRECOMMENDS for some but not all packages * -dev package depends no some, partly non-existing packages, e.g. util-linux-losetup-dev Both questions solved by simply dropping all pre-existing RDEPENDS, so that the util-linux meta package now unconditionally RRECOMMENDS all split sub-packages. No invalid -dev dependencies remain * /etc/default/mountall moved into util-linux-mount * util-linux-swaponoff remains Some additional fixes have been added: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. (similar to RP's patch posted earlier to other packages) * use PN for package name prefix, not BPN * -ptest depends on the meta-package now, so that all the utils it tries to execute / test are actually available in the file system * use systemd_system_unitdir instead of open-coding * inherit manpages * use EXTRA_OEMAKE instead of duplicating command line arguments * also sort ALTERNATIVE_LINK_NAME for man pages I think this is ready to go now. [YOCTO #13058] Cheers, Andre' ^ permalink raw reply [flat|nested] 103+ messages in thread
* [PATCH v2 01/15] util-linux: simplify version upgrades (MAJOR_VERSION) 2019-01-15 14:45 ` [PATCH v2 00/12] util-linux: one package per binary André Draszik @ 2019-01-15 14:45 ` André Draszik 2019-01-15 14:45 ` [PATCH v2 02/15] util-linux: remove erroneous patch (qsort_r) André Draszik ` (13 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-15 14:45 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> There doesn't appear to be a need to manually and explicitly specificy the major version (for the download URL), it can be deduced easily from PV. Do so. Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 3 ++- meta/recipes-core/util-linux/util-linux_2.32.1.bb | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index b5f77f7b6b..a1702da5b4 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -24,7 +24,8 @@ DEPENDS = "zlib ncurses virtual/crypt" DEPENDS_append_class-native = " lzo-native" DEPENDS_append_class-nativesdk = " lzo-native" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ +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-agetty util-linux-blkdiscard util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ diff --git a/meta/recipes-core/util-linux/util-linux_2.32.1.bb b/meta/recipes-core/util-linux/util-linux_2.32.1.bb index c909836cbb..b0492afff3 100644 --- a/meta/recipes-core/util-linux/util-linux_2.32.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.32.1.bb @@ -1,4 +1,3 @@ -MAJOR_VERSION = "2.32" require util-linux.inc # To support older hosts, we need to patch and/or revert -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v2 02/15] util-linux: remove erroneous patch (qsort_r) 2019-01-15 14:45 ` [PATCH v2 00/12] util-linux: one package per binary André Draszik 2019-01-15 14:45 ` [PATCH v2 01/15] util-linux: simplify version upgrades (MAJOR_VERSION) André Draszik @ 2019-01-15 14:45 ` André Draszik 2019-01-15 14:45 ` [PATCH v2 03/15] util-linux: remove minix remnants André Draszik ` (12 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-15 14:45 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> The patch in question is patching the code to use qsort() instead of qsort_r(), without adopting the compare function. This is a major issue, because the compare function as written is evaluating / accessing a third argument, which is not passed with this OE patch, causing access to random memory. Given this patch was added so as to support (old) linux (host) distros which might not provide qsort_r(), according to the git history, and given these days util-linux detects availability of qsort_r() during configure phase, and given musl builds (which doesn't provide qsort_r() either) work without problem, the right solution is to simply drop this invalid patch. Do so. Signed-off-by: André Draszik <andre.draszik@jci.com> --- .../util-linux/util-linux-native-qsort.patch | 33 ------------------- .../util-linux/util-linux_2.32.1.bb | 6 ---- 2 files changed, 39 deletions(-) delete mode 100644 meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch b/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch deleted file mode 100644 index 68bf22de8c..0000000000 --- a/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f220d809be1baa654503bf6ff52f3630b0d7015c Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Wed, 26 Mar 2014 01:30:29 +0000 -Subject: [PATCH] sun.c: use qsort() to instead of qsort_r() - -qsort_r() was added to glibc in version 2.8, so there is no qsort_r() on -the host like CentOS 5.x. - -Upstream-Status: Inappropriate [Other] - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - libfdisk/src/sun.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -Index: util-linux-2.24.2/libfdisk/src/sun.c -=================================================================== ---- util-linux-2.24.2.orig/libfdisk/src/sun.c -+++ util-linux-2.24.2/libfdisk/src/sun.c -@@ -431,10 +431,9 @@ static int sun_verify_disklabel(struct f - } - verify_sun_starts = starts; - -- qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]), -- (int (*)(const void *,const void *,void *)) verify_sun_cmp, -- verify_sun_starts); -- -+ qsort(array,ARRAY_SIZE(array),sizeof(array[0]), -+ (int (*)(const void *,const void *)) verify_sun_cmp); -+ - if (array[0] == -1) { - fdisk_info(cxt, _("No partitions defined.")); - return 0; diff --git a/meta/recipes-core/util-linux/util-linux_2.32.1.bb b/meta/recipes-core/util-linux/util-linux_2.32.1.bb index b0492afff3..0f860c221b 100644 --- a/meta/recipes-core/util-linux/util-linux_2.32.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.32.1.bb @@ -1,14 +1,8 @@ require util-linux.inc -# To support older hosts, we need to patch and/or revert -# some upstream changes. Only do this for native packages. -OLDHOST = "" -OLDHOST_class-native = "file://util-linux-native-qsort.patch" - SRC_URI += "file://configure-sbindir.patch \ file://runuser.pamd \ file://runuser-l.pamd \ - ${OLDHOST} \ file://ptest.patch \ file://run-ptest \ file://display_testname_for_subtest.patch \ -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v2 03/15] util-linux: remove minix remnants 2019-01-15 14:45 ` [PATCH v2 00/12] util-linux: one package per binary André Draszik 2019-01-15 14:45 ` [PATCH v2 01/15] util-linux: simplify version upgrades (MAJOR_VERSION) André Draszik 2019-01-15 14:45 ` [PATCH v2 02/15] util-linux: remove erroneous patch (qsort_r) André Draszik @ 2019-01-15 14:45 ` André Draszik 2019-01-15 14:45 ` [PATCH v2 04/15] util-linux: be more explicit about what files go into packages André Draszik ` (11 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-15 14:45 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> While commit fc66762d7c11 ("util-linux: Disable minix support.") (or e88cee8cc31d in poky) removed most of the bits, there are still references to minix remaining. Remove them. Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index a1702da5b4..8c8cbde8c2 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -159,7 +159,7 @@ do_install () { mkdir -p ${D}${base_bindir} sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" - sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root nologin" + sbinprogs_a="pivot_root hwclock mkswap losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root nologin" binprogs_a="dmesg getopt kill more umount mount login su mountpoint" if [ "${base_sbindir}" != "${sbindir}" ]; then -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v2 04/15] util-linux: be more explicit about what files go into packages 2019-01-15 14:45 ` [PATCH v2 00/12] util-linux: one package per binary André Draszik ` (2 preceding siblings ...) 2019-01-15 14:45 ` [PATCH v2 03/15] util-linux: remove minix remnants André Draszik @ 2019-01-15 14:45 ` André Draszik 2019-01-15 14:45 ` [PATCH v2 05/15] util-linux: fix the su and runuser packages André Draszik ` (10 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-15 14:45 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Just using a wildcard leaves the reader wondering what is meant here. By being explicit we can describe exactly what is intended, i.e. the file name as resulting from the ALTERNATIVE and ALTERNATIVE_LINK_NAME mechanism. Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 8c8cbde8c2..79ab302e6a 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -88,7 +88,7 @@ FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidd = "${sbindir}/uuidd" -FILES_util-linux-rfkill = "${sbindir}/rfkill*" +FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" FILES_util-linux-partx = "${sbindir}/partx" FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" FILES_util-linux-findfs = "${sbindir}/findfs" @@ -105,20 +105,20 @@ FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so FILES_util-linux-lsblk = "${bindir}/lsblk" FILES_util-linux-lscpu = "${bindir}/lscpu" -FILES_util-linux-fsck = "${base_sbindir}/fsck*" +FILES_util-linux-fsck = "${base_sbindir}/fsck.${BPN}" FILES_util-linux-mkfs = "${sbindir}/mkfs" FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" -FILES_util-linux-sulogin = "${base_sbindir}/sulogin*" +FILES_util-linux-sulogin = "${base_sbindir}/sulogin.${BPN}" FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" FILES_util-linux-switch-root = "${base_sbindir}/switch_root.${BPN}" FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one -FILES_util-linux-blkid = "${base_sbindir}/blkid*" +FILES_util-linux-blkid = "${base_sbindir}/blkid.${BPN}" RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" RREPLACES_util-linux-blkid = "e2fsprogs-blkid" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v2 05/15] util-linux: fix the su and runuser packages 2019-01-15 14:45 ` [PATCH v2 00/12] util-linux: one package per binary André Draszik ` (3 preceding siblings ...) 2019-01-15 14:45 ` [PATCH v2 04/15] util-linux: be more explicit about what files go into packages André Draszik @ 2019-01-15 14:45 ` André Draszik 2019-01-15 14:45 ` [PATCH v2 06/15] update-alternatives: allow hooks before renaming files André Draszik ` (9 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-15 14:45 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> The packages get an automatic RDEPENDS via shlibs, no need to explicitly state it, so we can drop those useless explicit assignments. su is moved into ${base_bindir} in do_install(), so because of a mismatched FILES specification su is actually packaged into the main package at the moment, not into the -su package as likely originally intended. runuser needs the pam configuration files, so they should be in the -runuser package, not in the main package. While fixing this, we can simplify the update alternatives processing for su. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 79ab302e6a..68534d8744 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -96,7 +96,8 @@ FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" FILES_util-linux-runuser = "${sbindir}/runuser" FILES_util-linux-prlimit = "${bindir}/prlimit" FILES_util-linux-ionice = "${bindir}/ionice.${BPN}" -FILES_util-linux-su = "${bindir}/su.util-linux ${sysconfdir}/pam.d/su-l" +FILES_util-linux-runuser = "${sysconfdir}/pam.d/runuser*" +FILES_util-linux-su = "${base_bindir}/su.${BPN} ${sysconfdir}/pam.d/su-l" CONFFILES_util-linux-su = "${sysconfdir}/pam.d/su-l" FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ @@ -122,9 +123,6 @@ FILES_util-linux-blkid = "${base_sbindir}/blkid.${BPN}" RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" RREPLACES_util-linux-blkid = "e2fsprogs-blkid" -RDEPENDS_util-linux-runuser += "libpam" -RDEPENDS_util-linux-su += "libpam" - 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)}" @@ -228,6 +226,7 @@ ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 rfkill.8 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1" +ALTERNATIVE_${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" @@ -235,6 +234,7 @@ ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" ALTERNATIVE_LINK_NAME[rfkill.8] = "${mandir}/man8/rfkill.8" +ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" @@ -263,6 +263,9 @@ ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" ALTERNATIVE_util-linux-mount = "mount" ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" +ALTERNATIVE_${PN}-su = "su" +ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" + ALTERNATIVE_util-linux-umount = "umount" ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" @@ -305,15 +308,6 @@ ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" BBCLASSEXTEND = "native nativesdk" -python do_package_prepend () { - if '--enable-su' in d.getVar('EXTRA_OECONF').split(): - d.appendVar(d.expand('ALTERNATIVE_${PN}'), ' su') - d.appendVar(d.expand('ALTERNATIVE_${PN}-doc'), ' su.1') - - d.setVarFlag('ALTERNATIVE_LINK_NAME', "su", d.expand('${base_bindir}/su')) - d.setVarFlag('ALTERNATIVE_LINK_NAME', "su.1", d.expand('${mandir}/man1/su.1')) -} - python populate_packages_prepend() { do_split_packages(d, '${base_libdir}', '^lib(.*)\.so\..*$', output_pattern='util-linux-lib%s', -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v2 06/15] update-alternatives: allow hooks before renaming files 2019-01-15 14:45 ` [PATCH v2 00/12] util-linux: one package per binary André Draszik ` (4 preceding siblings ...) 2019-01-15 14:45 ` [PATCH v2 05/15] util-linux: fix the su and runuser packages André Draszik @ 2019-01-15 14:45 ` André Draszik 2019-01-15 16:45 ` Richard Purdie 2019-01-15 14:45 ` [PATCH v2 07/15] update-alternatives: try to update FILES_${PN} when renaming a file André Draszik ` (8 subsequent siblings) 14 siblings, 1 reply; 103+ messages in thread From: André Draszik @ 2019-01-15 14:45 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> At the moment, the update alternatives handling is happening right after copying into PKGD during packaging time using an _append OVERRIDE to the copy function. This means that at this point the PACKAGES variable must have been fully populated, as that is a prerequisite for update-alternatives. In other words, this makes it impossible to e.g. populate PACKAGES dynamically using do_split_packages() and still do update-alternatives, as do_split_packages() can never execute early enough in a deterministic way. By converting the existing python function from a 'def' type function to a 'python' type function, we now make it possible for somebody to hook themselves between copying into PKGD and execution of update-alternatives, via a _prepend OVERRIDE, which is not possible with 'def' type functions. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/classes/update-alternatives.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index f1250f877b..ffedada2f6 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass @@ -135,10 +135,10 @@ populate_packages[vardeps] += "${UPDALTVARS} ${@gen_updatealternativesvars(d)}" # place. python perform_packagecopy_append () { if update_alternatives_enabled(d): - apply_update_alternative_renames(d) + bb.build.exec_func('apply_update_alternative_renames', d) } -def apply_update_alternative_renames(d): +python apply_update_alternative_renames () { # Check for deprecated usage... pn = d.getVar('BPN') if d.getVar('ALTERNATIVE_LINKS') != None: @@ -204,6 +204,7 @@ def apply_update_alternative_renames(d): os.unlink(src) else: bb.warn('%s: Unable to resolve dangling symlink: %s' % (pn, alt_target)) +} PACKAGESPLITFUNCS_prepend = "populate_packages_updatealternatives " -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* Re: [PATCH v2 06/15] update-alternatives: allow hooks before renaming files 2019-01-15 14:45 ` [PATCH v2 06/15] update-alternatives: allow hooks before renaming files André Draszik @ 2019-01-15 16:45 ` Richard Purdie 2019-01-16 11:40 ` André Draszik 0 siblings, 1 reply; 103+ messages in thread From: Richard Purdie @ 2019-01-15 16:45 UTC (permalink / raw) To: André Draszik, openembedded-core On Tue, 2019-01-15 at 14:45 +0000, André Draszik wrote: > From: André Draszik <andre.draszik@jci.com> > > At the moment, the update alternatives handling is happening > right after copying into PKGD during packaging time using > an _append OVERRIDE to the copy function. This means that at > this point the PACKAGES variable must have been fully > populated, as that is a prerequisite for update-alternatives. > > In other words, this makes it impossible to e.g. populate > PACKAGES dynamically using do_split_packages() and still do > update-alternatives, as do_split_packages() can never > execute early enough in a deterministic way. > > By converting the existing python function from a 'def' > type function to a 'python' type function, we now make it > possible for somebody to hook themselves between copying > into PKGD and execution of update-alternatives, via > a _prepend OVERRIDE, which is not possible with 'def' type > functions. > > [YOCTO #13058] I don't think you need to do this. Can you add your function to the start of PACKAGEBUILDPKGD rather than using apply_update_alternative_renames_prepend ? or maybe use PACKAGE_PREPROCESS_FUNCS? In fact we should probably fix the update-alternatives class to use PACKAGE_PREPROCESS_FUNCS rather than perform_packagecopy_append too. Regardless, I'd like to see us try and make this more readable rather than less which means separate functions and less prepend/appending and more use of the variables... Cheers, Richard > Signed-off-by: André Draszik <andre.draszik@jci.com> > --- > meta/classes/update-alternatives.bbclass | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/meta/classes/update-alternatives.bbclass > b/meta/classes/update-alternatives.bbclass > index f1250f877b..ffedada2f6 100644 > --- a/meta/classes/update-alternatives.bbclass > +++ b/meta/classes/update-alternatives.bbclass > @@ -135,10 +135,10 @@ populate_packages[vardeps] += "${UPDALTVARS} > ${@gen_updatealternativesvars(d)}" > # place. > python perform_packagecopy_append () { > if update_alternatives_enabled(d): > - apply_update_alternative_renames(d) > + bb.build.exec_func('apply_update_alternative_renames', d) > } > > -def apply_update_alternative_renames(d): > +python apply_update_alternative_renames () { > # Check for deprecated usage... > pn = d.getVar('BPN') > if d.getVar('ALTERNATIVE_LINKS') != None: > @@ -204,6 +204,7 @@ def apply_update_alternative_renames(d): > os.unlink(src) > else: > bb.warn('%s: Unable to resolve dangling symlink: > %s' % (pn, alt_target)) > +} > > PACKAGESPLITFUNCS_prepend = "populate_packages_updatealternatives " > > -- > 2.20.1 > ^ permalink raw reply [flat|nested] 103+ messages in thread
* Re: [PATCH v2 06/15] update-alternatives: allow hooks before renaming files 2019-01-15 16:45 ` Richard Purdie @ 2019-01-16 11:40 ` André Draszik 0 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 11:40 UTC (permalink / raw) To: Richard Purdie, openembedded-core On Tue, 2019-01-15 at 16:45 +0000, Richard Purdie wrote: > On Tue, 2019-01-15 at 14:45 +0000, André Draszik wrote: > > From: André Draszik <andre.draszik@jci.com> > > > > At the moment, the update alternatives handling is happening > > right after copying into PKGD during packaging time using > > an _append OVERRIDE to the copy function. This means that at > > this point the PACKAGES variable must have been fully > > populated, as that is a prerequisite for update-alternatives. > > > > In other words, this makes it impossible to e.g. populate > > PACKAGES dynamically using do_split_packages() and still do > > update-alternatives, as do_split_packages() can never > > execute early enough in a deterministic way. > > > > By converting the existing python function from a 'def' > > type function to a 'python' type function, we now make it > > possible for somebody to hook themselves between copying > > into PKGD and execution of update-alternatives, via > > a _prepend OVERRIDE, which is not possible with 'def' type > > functions. > > > > [YOCTO #13058] > > I don't think you need to do this. Can you add your function to the > start of PACKAGEBUILDPKGD rather than using > apply_update_alternative_renames_prepend > ? do_split_packages() can only execute after perform_packagecopy() which is the first function in PACKAGEBUILDPKGD. So other than redefining PACKAGEBUILDPKGD, or adding another variable just for u/a and modifying this var in util-linux, I'd say impossible while keeping it all legible / maintainable. > or maybe use PACKAGE_PREPROCESS_FUNCS? > > In fact we should probably fix the update-alternatives class to use > PACKAGE_PREPROCESS_FUNCS rather than perform_packagecopy_append too. > > Regardless, I'd like to see us try and make this more readable rather > than less which means separate functions and less prepend/appending and > more use of the variables... This sounds good, thank you. While I did contemplate that originally, I was mislead by a comment in the u/a class and didn't follow that approach. I now think it will work fine, though. Patch upcoming. Cheers, Andre' > > Cheers, > > Richard > > > > Signed-off-by: André Draszik <andre.draszik@jci.com> > > --- > > meta/classes/update-alternatives.bbclass | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/meta/classes/update-alternatives.bbclass > > b/meta/classes/update-alternatives.bbclass > > index f1250f877b..ffedada2f6 100644 > > --- a/meta/classes/update-alternatives.bbclass > > +++ b/meta/classes/update-alternatives.bbclass > > @@ -135,10 +135,10 @@ populate_packages[vardeps] += "${UPDALTVARS} > > ${@gen_updatealternativesvars(d)}" > > # place. > > python perform_packagecopy_append () { > > if update_alternatives_enabled(d): > > - apply_update_alternative_renames(d) > > + bb.build.exec_func('apply_update_alternative_renames', d) > > } > > > > -def apply_update_alternative_renames(d): > > +python apply_update_alternative_renames () { > > # Check for deprecated usage... > > pn = d.getVar('BPN') > > if d.getVar('ALTERNATIVE_LINKS') != None: > > @@ -204,6 +204,7 @@ def apply_update_alternative_renames(d): > > os.unlink(src) > > else: > > bb.warn('%s: Unable to resolve dangling symlink: > > %s' % (pn, alt_target)) > > +} > > > > PACKAGESPLITFUNCS_prepend = "populate_packages_updatealternatives " > > > > -- > > 2.20.1 > > ^ permalink raw reply [flat|nested] 103+ messages in thread
* [PATCH v2 07/15] update-alternatives: try to update FILES_${PN} when renaming a file 2019-01-15 14:45 ` [PATCH v2 00/12] util-linux: one package per binary André Draszik ` (5 preceding siblings ...) 2019-01-15 14:45 ` [PATCH v2 06/15] update-alternatives: allow hooks before renaming files André Draszik @ 2019-01-15 14:45 ` André Draszik 2019-01-15 14:45 ` [PATCH v2 08/15] util-linux: one package per binary (pt 1: base_sbindir) André Draszik ` (7 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-15 14:45 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> When using update-alternatives, FILES_${PN} must be referencing the new name after update-alternatives has renamed files. This is more or less OK when having static lists of files to be packaged into a package, but makes it quite hard to dynamically generate FILES_${PN}, e.g. using do_split_packages(), as in that case we can not easily modify what goes into FILES_${PN}, because that list is based on filenames as seen at the time do_split_packages() is executing. Of couse one could explicitly specify the (renamed) file(s) in the recipe, but that contradicts the intended usage of do_split_packages(). Instead, if FILES_${PN} contains the file name as it was pre renaming, we here modify this to reflect the new name. This will allow usage of do_split_packages() to populate FILES_${PN}. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/classes/update-alternatives.bbclass | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index ffedada2f6..a204afb060 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass @@ -139,6 +139,8 @@ python perform_packagecopy_append () { } python apply_update_alternative_renames () { + from re import sub + # Check for deprecated usage... pn = d.getVar('BPN') if d.getVar('ALTERNATIVE_LINKS') != None: @@ -178,6 +180,10 @@ python apply_update_alternative_renames () { else: bb.note('%s: Rename %s -> %s' % (pn, alt_target, alt_target_rename)) os.rename(src, dest) + f = d.getVar('FILES_' + pkg) + if f: + f = sub(r'(^|\s)%s(\s|$)' % alt_target, r'\1%s\2' % alt_target_rename, f) + d.setVar('FILES_' + pkg, f) else: bb.warn("%s: alternative target (%s or %s) does not exist, skipping..." % (pn, alt_target, alt_target_rename)) continue @@ -204,6 +210,11 @@ python apply_update_alternative_renames () { os.unlink(src) else: bb.warn('%s: Unable to resolve dangling symlink: %s' % (pn, alt_target)) + continue + f = d.getVar('FILES_' + pkg) + if f: + f = sub(r'(^|\s)%s(\s|$)' % alt_target, r'\1%s\2' % alt_target_rename, f) + d.setVar('FILES_' + pkg, f) } PACKAGESPLITFUNCS_prepend = "populate_packages_updatealternatives " -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v2 08/15] util-linux: one package per binary (pt 1: base_sbindir) 2019-01-15 14:45 ` [PATCH v2 00/12] util-linux: one package per binary André Draszik ` (6 preceding siblings ...) 2019-01-15 14:45 ` [PATCH v2 07/15] update-alternatives: try to update FILES_${PN} when renaming a file André Draszik @ 2019-01-15 14:45 ` André Draszik 2019-01-15 14:45 ` [PATCH v2 09/15] util-linux: one package per binary (pt 2: base_bindir) André Draszik ` (6 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-15 14:45 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Now that we have required infrastructure in place, we can start creating one package per binary. To make this process easier to follow, this is done in steps, starting with binaries from base_sbindir. Existing packages (and current dependency by main package): * agetty * blkid * cfdisk <- RRECOMMENDS * fdisk <- RRECOMMENDS * fsck * fstrim * losetup <- RDEPENDS * hwclock * sulogin <- RDEPENDS * swaponoff <- RDEPENDS * switch-root <- RRECOMMENDS New packages: * blockdev * ctrlaltdel * mkswap * nologin * pivot-root * swapon * swapoff swaponoff is empty now and simply depends on swapon swapoff 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. Existing packages that aren't in RDEPENDS / RRECOMMENDS haven't been added to RRECOMMENDS for that reason. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use PN for package name prefix, not BPN --- meta/recipes-core/util-linux/util-linux.inc | 61 ++++++++++----------- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 68534d8744..88e3b84dc0 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -28,19 +28,32 @@ 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-agetty util-linux-blkdiscard util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ - util-linux-swaponoff util-linux-losetup util-linux-umount \ +PACKAGES =+ "util-linux-blkdiscard util-linux-sfdisk \ + util-linux-swaponoff util-linux-umount \ util-linux-mount util-linux-readprofile util-linux-uuidd \ - util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs util-linux-fsck \ - util-linux-blkid util-linux-mkfs util-linux-mcookie util-linux-rfkill \ - util-linux-lsblk util-linux-mkfs.cramfs util-linux-fstrim \ - util-linux-partx util-linux-hwclock util-linux-mountpoint \ - util-linux-findfs util-linux-getopt util-linux-sulogin util-linux-prlimit \ - util-linux-ionice util-linux-switch-root util-linux-unshare" + util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs \ + util-linux-mkfs util-linux-mcookie util-linux-rfkill \ + util-linux-lsblk util-linux-mkfs.cramfs \ + util-linux-partx util-linux-mountpoint \ + util-linux-findfs util-linux-getopt util-linux-prlimit \ + util-linux-ionice util-linux-unshare" PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}" -PACKAGES_DYNAMIC = "^util-linux-lib.*" +python apply_update_alternative_renames_prepend () { + def pkg_hook(f, pkg, file_regex, output_pattern, modulename): + if d.getVar('ALTERNATIVE_' + pkg): + return + if d.getVarFlag('ALTERNATIVE_LINK_NAME', modulename): + d.setVar('ALTERNATIVE_' + pkg, modulename) + + do_split_packages(d, root='${base_sbindir}', + file_regex=r'(.*)', output_pattern='${PN}-%s', + description='${PN} %s', + hook=pkg_hook, extra_depends='', prepend=True) +} + +PACKAGES_DYNAMIC = "^util-linux-.*" SHARED_EXTRA_OECONF = "--disable-use-tty-group \ --disable-makeinstall-chown \ @@ -74,14 +87,8 @@ FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" -FILES_util-linux-agetty = "${base_sbindir}/agetty" FILES_util-linux-blkdiscard = "${sbindir}/blkdiscard" -FILES_util-linux-fdisk = "${base_sbindir}/fdisk.${BPN}" -FILES_util-linux-fstrim = "${base_sbindir}/fstrim.${BPN}" -FILES_util-linux-cfdisk = "${base_sbindir}/cfdisk" FILES_util-linux-sfdisk = "${sbindir}/sfdisk" -FILES_util-linux-swaponoff = "${base_sbindir}/swapon.${BPN} ${base_sbindir}/swapoff.${BPN}" -FILES_util-linux-losetup = "${base_sbindir}/losetup.${BPN}" FILES_util-linux-mount = "${base_bindir}/mount.${BPN}" FILES_util-linux-mcookie = "${bindir}/mcookie" FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" @@ -90,7 +97,6 @@ FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidd = "${sbindir}/uuidd" FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" FILES_util-linux-partx = "${sbindir}/partx" -FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" FILES_util-linux-findfs = "${sbindir}/findfs" FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" FILES_util-linux-runuser = "${sbindir}/runuser" @@ -106,27 +112,24 @@ FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so FILES_util-linux-lsblk = "${bindir}/lsblk" FILES_util-linux-lscpu = "${bindir}/lscpu" -FILES_util-linux-fsck = "${base_sbindir}/fsck.${BPN}" FILES_util-linux-mkfs = "${sbindir}/mkfs" FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" -FILES_util-linux-sulogin = "${base_sbindir}/sulogin.${BPN}" FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" -FILES_util-linux-switch-root = "${base_sbindir}/switch_root.${BPN}" FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one -FILES_util-linux-blkid = "${base_sbindir}/blkid.${BPN}" 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} = "util-linux-blkdiscard util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint util-linux-prlimit util-linux-ionice util-linux-switch-root" +RRECOMMENDS_${PN} = "util-linux-blkdiscard util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint 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}_class-native = "" RRECOMMENDS_${PN}_class-nativesdk = "" @@ -135,6 +138,9 @@ RDEPENDS_${PN}_class-nativesdk = "" RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev" +RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" +ALLOW_EMPTY_${PN}-swaponoff = "1" + #SYSTEMD_PACKAGES = "${PN}-uuidd ${PN}-fstrim" SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.socket uuidd.service" SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable" @@ -206,9 +212,9 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = " \ - dmesg kill more mkswap blockdev pivot_root \ + dmesg kill more \ hexdump last lastb logger mesg renice wall \ - setsid chrt flock utmpdump eject nologin taskset fallocate \ + setsid chrt flock utmpdump eject taskset fallocate \ fsfreeze nsenter cal rev \ " @@ -247,13 +253,10 @@ ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3" ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" -ALTERNATIVE_util-linux-hwclock = "hwclock" ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" -ALTERNATIVE_util-linux-fdisk = "fdisk" ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" -ALTERNATIVE_util-linux-fstrim = "fstrim" ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" ALTERNATIVE_util-linux-agetty = "getty" @@ -272,17 +275,13 @@ ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" ALTERNATIVE_util-linux-readprofile = "readprofile" ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" -ALTERNATIVE_util-linux-losetup = "losetup" ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" -ALTERNATIVE_util-linux-swaponoff = "swapoff swapon" ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" -ALTERNATIVE_util-linux-fsck = "fsck" ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" -ALTERNATIVE_util-linux-blkid = "blkid" ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" ALTERNATIVE_util-linux-rfkill = "rfkill" @@ -291,7 +290,6 @@ ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" ALTERNATIVE_util-linux-getopt = "getopt" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" -ALTERNATIVE_util-linux-sulogin = "sulogin" ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" ALTERNATIVE_util-linux-mountpoint = "mountpoint" @@ -303,7 +301,6 @@ ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" ALTERNATIVE_util-linux-ionice = "ionice" ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" -ALTERNATIVE_util-linux-switch-root = "switch_root" ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" BBCLASSEXTEND = "native nativesdk" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v2 09/15] util-linux: one package per binary (pt 2: base_bindir) 2019-01-15 14:45 ` [PATCH v2 00/12] util-linux: one package per binary André Draszik ` (7 preceding siblings ...) 2019-01-15 14:45 ` [PATCH v2 08/15] util-linux: one package per binary (pt 1: base_sbindir) André Draszik @ 2019-01-15 14:45 ` André Draszik 2019-01-15 14:45 ` [PATCH v2 10/15] util-linux: one package per binary (pt 3: sbindir) André Draszik ` (5 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-15 14:45 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Similar to the previous patch. Existing packages (and current dependency by main package): * mount <- RRECOMMENDS * umount <- RDEPENDS * mountpoint <- RRECOMMENDS * getopt * su <- RDEPENDS New packages: * dmesg * kill * more 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. Existing packages that aren't in RDEPENDS / RRECOMMENDS haven't been added to RRECOMMENDS for that reason. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use PN for package name prefix, not BPN --- meta/recipes-core/util-linux/util-linux.inc | 32 ++++++++------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 88e3b84dc0..1d6ef6b3d9 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -29,16 +29,16 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz " PACKAGES =+ "util-linux-blkdiscard util-linux-sfdisk \ - util-linux-swaponoff util-linux-umount \ - util-linux-mount util-linux-readprofile util-linux-uuidd \ + util-linux-swaponoff \ + util-linux-readprofile util-linux-uuidd \ util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs \ util-linux-mkfs util-linux-mcookie util-linux-rfkill \ util-linux-lsblk util-linux-mkfs.cramfs \ - util-linux-partx util-linux-mountpoint \ - util-linux-findfs util-linux-getopt util-linux-prlimit \ + util-linux-partx \ + util-linux-findfs util-linux-prlimit \ util-linux-ionice util-linux-unshare" PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" -PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}" +PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}" python apply_update_alternative_renames_prepend () { def pkg_hook(f, pkg, file_regex, output_pattern, modulename): @@ -51,6 +51,10 @@ python apply_update_alternative_renames_prepend () { file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', hook=pkg_hook, extra_depends='', prepend=True) + do_split_packages(d, root='${base_bindir}', + file_regex=r'(.*)', output_pattern='${PN}-%s', + description='${PN} %s', + hook=pkg_hook, extra_depends='', prepend=True) } PACKAGES_DYNAMIC = "^util-linux-.*" @@ -89,21 +93,18 @@ FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" FILES_util-linux-blkdiscard = "${sbindir}/blkdiscard" FILES_util-linux-sfdisk = "${sbindir}/sfdisk" -FILES_util-linux-mount = "${base_bindir}/mount.${BPN}" FILES_util-linux-mcookie = "${bindir}/mcookie" -FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidd = "${sbindir}/uuidd" FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" FILES_util-linux-partx = "${sbindir}/partx" FILES_util-linux-findfs = "${sbindir}/findfs" -FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" FILES_util-linux-runuser = "${sbindir}/runuser" 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 = "${base_bindir}/su.${BPN} ${sysconfdir}/pam.d/su-l" +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 \ @@ -117,8 +118,6 @@ FILES_util-linux-mkfs = "${sbindir}/mkfs" FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" -FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" - FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one @@ -128,8 +127,9 @@ 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-blkdiscard util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint util-linux-prlimit util-linux-ionice" +RRECOMMENDS_${PN} = "util-linux-blkdiscard util-linux-sfdisk util-linux-readprofile util-linux-mkfs 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" RRECOMMENDS_${PN}_class-native = "" RRECOMMENDS_${PN}_class-nativesdk = "" @@ -212,7 +212,6 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = " \ - dmesg kill more \ hexdump last lastb logger mesg renice wall \ setsid chrt flock utmpdump eject taskset fallocate \ fsfreeze nsenter cal rev \ @@ -263,13 +262,8 @@ ALTERNATIVE_util-linux-agetty = "getty" ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" -ALTERNATIVE_util-linux-mount = "mount" ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" - -ALTERNATIVE_${PN}-su = "su" ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" - -ALTERNATIVE_util-linux-umount = "umount" ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" ALTERNATIVE_util-linux-readprofile = "readprofile" @@ -287,12 +281,10 @@ ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" ALTERNATIVE_util-linux-rfkill = "rfkill" ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" -ALTERNATIVE_util-linux-getopt = "getopt" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" -ALTERNATIVE_util-linux-mountpoint = "mountpoint" ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" ALTERNATIVE_util-linux-unshare = "unshare" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v2 10/15] util-linux: one package per binary (pt 3: sbindir) 2019-01-15 14:45 ` [PATCH v2 00/12] util-linux: one package per binary André Draszik ` (8 preceding siblings ...) 2019-01-15 14:45 ` [PATCH v2 09/15] util-linux: one package per binary (pt 2: base_bindir) André Draszik @ 2019-01-15 14:45 ` André Draszik 2019-01-15 14:45 ` [PATCH v2 11/15] util-linux: one package per binary (pt 4: bindir) André Draszik ` (4 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-15 14:45 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Similar to the previous patch. Existing packages (and current dependency by main package): * blkdiscard <- RRECOMMENDS * findfs * fsck.cramfs * mkfs <- RRECOMMENDS * mkfs.cramfs * partx * readprofile <- RRECOMMENDS * rfkill * runuser <- RDEPENDS * sfdisk <- RRECOMMENDS * uuidd 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. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use PN for package name prefix, not BPN --- meta/recipes-core/util-linux/util-linux.inc | 42 ++++++++------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 1d6ef6b3d9..d8cd8bbfff 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -28,17 +28,13 @@ 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-blkdiscard util-linux-sfdisk \ - util-linux-swaponoff \ - util-linux-readprofile util-linux-uuidd \ - util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs \ - util-linux-mkfs util-linux-mcookie util-linux-rfkill \ - util-linux-lsblk util-linux-mkfs.cramfs \ - util-linux-partx \ - util-linux-findfs util-linux-prlimit \ +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 += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" -PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}" python apply_update_alternative_renames_prepend () { def pkg_hook(f, pkg, file_regex, output_pattern, modulename): @@ -47,6 +43,11 @@ python apply_update_alternative_renames_prepend () { 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', @@ -55,6 +56,10 @@ python apply_update_alternative_renames_prepend () { file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', hook=pkg_hook, extra_depends='', prepend=True) + 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) } PACKAGES_DYNAMIC = "^util-linux-.*" @@ -91,16 +96,8 @@ FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" -FILES_util-linux-blkdiscard = "${sbindir}/blkdiscard" -FILES_util-linux-sfdisk = "${sbindir}/sfdisk" FILES_util-linux-mcookie = "${bindir}/mcookie" -FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" FILES_util-linux-uuidgen = "${bindir}/uuidgen" -FILES_util-linux-uuidd = "${sbindir}/uuidd" -FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" -FILES_util-linux-partx = "${sbindir}/partx" -FILES_util-linux-findfs = "${sbindir}/findfs" -FILES_util-linux-runuser = "${sbindir}/runuser" FILES_util-linux-prlimit = "${bindir}/prlimit" FILES_util-linux-ionice = "${bindir}/ionice.${BPN}" FILES_util-linux-runuser = "${sysconfdir}/pam.d/runuser*" @@ -113,11 +110,6 @@ FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so FILES_util-linux-lsblk = "${bindir}/lsblk" FILES_util-linux-lscpu = "${bindir}/lscpu" -FILES_util-linux-mkfs = "${sbindir}/mkfs" - -FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" -FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" - FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one @@ -127,7 +119,7 @@ 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-blkdiscard util-linux-sfdisk util-linux-readprofile util-linux-mkfs util-linux-prlimit util-linux-ionice" +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" @@ -214,7 +206,7 @@ ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = " \ hexdump last lastb logger mesg renice wall \ setsid chrt flock utmpdump eject taskset fallocate \ - fsfreeze nsenter cal rev \ + nsenter cal rev \ " ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" @@ -266,7 +258,6 @@ ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" -ALTERNATIVE_util-linux-readprofile = "readprofile" ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" @@ -278,7 +269,6 @@ ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" -ALTERNATIVE_util-linux-rfkill = "rfkill" ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v2 11/15] util-linux: one package per binary (pt 4: bindir) 2019-01-15 14:45 ` [PATCH v2 00/12] util-linux: one package per binary André Draszik ` (9 preceding siblings ...) 2019-01-15 14:45 ` [PATCH v2 10/15] util-linux: one package per binary (pt 3: sbindir) André Draszik @ 2019-01-15 14:45 ` André Draszik 2019-01-15 14:45 ` [PATCH v2 12/15] util-linux: simplify meta-package RDEPENDS / RRECOMMENDS André Draszik ` (3 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-15 14:45 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> 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] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use PN for package name prefix, not BPN --- meta/recipes-core/util-linux/util-linux.inc | 45 ++++++++++----------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index d8cd8bbfff..3cf1a18419 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -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 apply_update_alternative_renames_prepend () { @@ -60,6 +55,10 @@ python apply_update_alternative_renames_prepend () { file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', hook=pkg_hook_with_recommends, 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) } PACKAGES_DYNAMIC = "^util-linux-.*" @@ -96,21 +95,14 @@ 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_${PN}-last = "${bindir}/lastb" 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}" +FILES_${PN}-setarch = "${bindir}/linux32 ${bindir}/linux64 ${bindir}/uname26" # Util-linux' blkid replaces the e2fsprogs one RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" @@ -119,7 +111,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" @@ -203,12 +194,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" @@ -216,9 +201,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" @@ -277,10 +276,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" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v2 12/15] util-linux: simplify meta-package RDEPENDS / RRECOMMENDS 2019-01-15 14:45 ` [PATCH v2 00/12] util-linux: one package per binary André Draszik ` (10 preceding siblings ...) 2019-01-15 14:45 ` [PATCH v2 11/15] util-linux: one package per binary (pt 4: bindir) André Draszik @ 2019-01-15 14:45 ` André Draszik 2019-01-15 14:45 ` [PATCH v2 13/15] util-linux: move /etc/default/mountall into -mount subpackage André Draszik ` (2 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-15 14:45 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@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. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- 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 3cf1a18419..f3c3ae65c8 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 apply_update_alternative_renames_prepend () { 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 apply_update_alternative_renames_prepend () { 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) } PACKAGES_DYNAMIC = "^util-linux-.*" @@ -108,12 +106,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 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v2 13/15] util-linux: move /etc/default/mountall into -mount subpackage 2019-01-15 14:45 ` [PATCH v2 00/12] util-linux: one package per binary André Draszik ` (11 preceding siblings ...) 2019-01-15 14:45 ` [PATCH v2 12/15] util-linux: simplify meta-package RDEPENDS / RRECOMMENDS André Draszik @ 2019-01-15 14:45 ` André Draszik 2019-01-15 14:45 ` [PATCH v2 14/15] util-linux: let -ptest package depend on all of util-linux André Draszik 2019-01-15 14:45 ` [PATCH v2 15/15] utils-linux: final cleanup André Draszik 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-15 14:45 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> This should probably be there and now the main package is a real meta-package only. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index f3c3ae65c8..6ff947a34a 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -44,19 +44,19 @@ python apply_update_alternative_renames_prepend () { do_split_packages(d, root='${base_sbindir}', file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', - hook=pkg_hook, extra_depends='', prepend=True) + hook=pkg_hook, extra_depends='') do_split_packages(d, root='${base_bindir}', file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', - hook=pkg_hook, extra_depends='', prepend=True) + hook=pkg_hook, extra_depends='') do_split_packages(d, root='${sbindir}', file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', - hook=pkg_hook, extra_depends='', prepend=True) + hook=pkg_hook, extra_depends='') do_split_packages(d, root='${bindir}', file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', - hook=pkg_hook, extra_depends='', prepend=True) + hook=pkg_hook, extra_depends='') } PACKAGES_DYNAMIC = "^util-linux-.*" @@ -89,11 +89,14 @@ PACKAGECONFIG[pylibmount] = "--with-python=3 --enable-pylibmount,--without-pytho # Readline support PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" +ALLOW_EMPTY_${PN} = "1" +FILES_${PN} = "" FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" FILES_${PN}-last = "${bindir}/lastb" +FILES_${PN}-mount = "${sysconfdir}/default/mountall" 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" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v2 14/15] util-linux: let -ptest package depend on all of util-linux 2019-01-15 14:45 ` [PATCH v2 00/12] util-linux: one package per binary André Draszik ` (12 preceding siblings ...) 2019-01-15 14:45 ` [PATCH v2 13/15] util-linux: move /etc/default/mountall into -mount subpackage André Draszik @ 2019-01-15 14:45 ` André Draszik 2019-01-15 14:45 ` [PATCH v2 15/15] utils-linux: final cleanup André Draszik 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-15 14:45 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> ptest executes all the binaries, so they really need to be available in the file system. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 6ff947a34a..641b4486d7 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -287,7 +287,7 @@ python populate_packages_prepend() { } RDEPENDS_${PN}-bash-completion += "util-linux-lsblk" -RDEPENDS_${PN}-ptest = "bash grep coreutils which util-linux-blkid util-linux-fsck btrfs-tools" +RDEPENDS_${PN}-ptest = "bash grep coreutils which btrfs-tools ${PN}" do_compile_ptest() { oe_runmake buildtest-TESTS -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v2 15/15] utils-linux: final cleanup 2019-01-15 14:45 ` [PATCH v2 00/12] util-linux: one package per binary André Draszik ` (13 preceding siblings ...) 2019-01-15 14:45 ` [PATCH v2 14/15] util-linux: let -ptest package depend on all of util-linux André Draszik @ 2019-01-15 14:45 ` André Draszik 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-15 14:45 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> * use ${PN} instead of util-linux * use PACKAGESPLITFUNCS for creating util-linux-lib* packages rather than an _append OVERRIDE * sort ALTERNATIVE_LINK_NAME alphabetically * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use systemd_system_unitdir instead of open-coding * inherit manpages so as to benefit from man-db processing (note that manpages are not generated here, we just want the automatic update of the package index caches * use EXTRA_OEMAKE instead of duplicating command line arguments [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use systemd_system_unitdir instead of open-coding * inherit manpages * use EXTRA_OEMAKE instead of duplicating command line arguments * also sort ALTERNATIVE_LINK_NAME for man pages --- meta/recipes-core/util-linux/util-linux.inc | 156 ++++++++------------ 1 file changed, 65 insertions(+), 91 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 641b4486d7..cf1697faa8 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=1715f5ee3e01203ca1e1e0b9ee65918c file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16" #gtk-doc is not enabled as it requires xmlto which requires util-linux -inherit autotools gettext pkgconfig systemd update-alternatives python3-dir bash-completion ptest +inherit autotools gettext manpages pkgconfig systemd update-alternatives python3-dir bash-completion ptest DEPENDS = "zlib ncurses virtual/crypt" DEPENDS_append_class-native = " lzo-native" DEPENDS_append_class-nativesdk = " lzo-native" @@ -28,8 +28,8 @@ 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" -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" +PACKAGES =+ "${PN}-swaponoff" +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', '${PN}-pylibmount', '', d)}" python apply_update_alternative_renames_prepend () { def pkg_hook(f, pkg, file_regex, output_pattern, modulename): @@ -59,7 +59,16 @@ python apply_update_alternative_renames_prepend () { hook=pkg_hook, extra_depends='') } -PACKAGES_DYNAMIC = "^util-linux-.*" +python util_linux_libpackages() { + do_split_packages(d, root='${base_libdir}', file_regex=r'^lib(.*)\.so\..*$', + output_pattern='${PN}-lib%s', + description='${PN} lib%s', + extra_depends='', prepend=True, allow_links=True) +} + +PACKAGESPLITFUNCS_prepend = "util_linux_libpackages " + +PACKAGES_DYNAMIC = "^${PN}-.*" SHARED_EXTRA_OECONF = "--disable-use-tty-group \ --disable-makeinstall-chown \ @@ -73,49 +82,46 @@ SHARED_EXTRA_OECONF = "--disable-use-tty-group \ " EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}" +EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'" PACKAGECONFIG_class-target ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," - # Respect the systemd feature for uuidd -PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/, --without-systemd --without-systemdsystemunitdir,systemd" - +PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-systemd --without-systemdsystemunitdir,systemd" # Build setpriv requires libcap-ng PACKAGECONFIG[libcap-ng] = "--enable-setpriv,--disable-setpriv,libcap-ng," - # Build python bindings for libmount PACKAGECONFIG[pylibmount] = "--with-python=3 --enable-pylibmount,--without-python --disable-pylibmount,python3" - # Readline support PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" ALLOW_EMPTY_${PN} = "1" FILES_${PN} = "" FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" - FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" - FILES_${PN}-last = "${bindir}/lastb" FILES_${PN}-mount = "${sysconfdir}/default/mountall" -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_${PN}-runuser = "${sysconfdir}/pam.d/runuser*" +FILES_${PN}-su = "${sysconfdir}/pam.d/su-l" +CONFFILES_${PN}-su = "${sysconfdir}/pam.d/su-l" +FILES_${PN}-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ + ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \ + ${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*" FILES_${PN}-setarch = "${bindir}/linux32 ${bindir}/linux64 ${bindir}/uname26" # Util-linux' blkid replaces the e2fsprogs one -RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" -RREPLACES_util-linux-blkid = "e2fsprogs-blkid" +RCONFLICTS_${PN}-blkid = "e2fsprogs-blkid" +RREPLACES_${PN}-blkid = "e2fsprogs-blkid" RRECOMMENDS_${PN}_class-native = "" RRECOMMENDS_${PN}_class-nativesdk = "" RDEPENDS_${PN}_class-native = "" RDEPENDS_${PN}_class-nativesdk = "" -RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev" +RPROVIDES_${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev ${PN}-libuuid-dev" +RDEPENDS_${PN}-bash-completion += "${PN}-lsblk" +RDEPENDS_${PN}-ptest = "bash grep coreutils which btrfs-tools ${PN}" RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" ALLOW_EMPTY_${PN}-swaponoff = "1" @@ -125,17 +131,11 @@ SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable" SYSTEMD_SERVICE_${PN}-fstrim = "fstrim.timer fstrim.service" SYSTEMD_AUTO_ENABLE_${PN}-fstrim = "disable" -do_compile () { - set -e - oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}' -} - do_install () { # with ccache the timestamps on compiled files may # end up earlier than on their inputs, this allows # for the resultant compilation in the install step. - oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \ - 'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \ + oe_runmake 'CC=${CC}' 'LD=${LD}' \ 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install mkdir -p ${D}${base_bindir} @@ -189,38 +189,67 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" -ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" -ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" -ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" -ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" +ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" 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[dmesg] = "${base_bindir}/dmesg" ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate" +ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" ALTERNATIVE_LINK_NAME[flock] = "${bindir}/flock" +ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" +ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" +ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" +ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" +ALTERNATIVE_${PN}-agetty = "getty" +ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" +ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" ALTERNATIVE_LINK_NAME[hexdump] = "${bindir}/hexdump" +ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" +ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" +ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" 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[losetup] = "${base_sbindir}/losetup" ALTERNATIVE_LINK_NAME[mesg] = "${bindir}/mesg" +ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" +ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" +ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" +ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" +ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" ALTERNATIVE_LINK_NAME[nsenter] = "${bindir}/nsenter" +ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" +ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" ALTERNATIVE_LINK_NAME[renice] = "${bindir}/renice" ALTERNATIVE_LINK_NAME[rev] = "${bindir}/rev" +ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" ALTERNATIVE_LINK_NAME[setsid] = "${bindir}/setsid" +ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" +ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" +ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" +ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" +ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" ALTERNATIVE_LINK_NAME[taskset] = "${bindir}/taskset" +ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" +ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" 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" -ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 rfkill.8 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1" +ALTERNATIVE_${PN}-doc = "blkid.8 eject.1 findfs.8 fsck.8 kill.1 last.1 lastb.1 libblkid.3 logger.1 mesg.1 mountpoint.1 nologin.8 rfkill.8 sulogin.8 utmpdump.1 uuid.3 wall.1" ALTERNATIVE_${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" +ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8" +ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" +ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" +ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" +ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" +ALTERNATIVE_LINK_NAME[libblkid.3] = "${mandir}/man3/libblkid.3" +ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" @@ -228,67 +257,12 @@ ALTERNATIVE_LINK_NAME[rfkill.8] = "${mandir}/man8/rfkill.8" ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" -ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" -ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" -ALTERNATIVE_LINK_NAME[libblkid.3] = "${mandir}/man3/libblkid.3" -ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8" -ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" -ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3" -ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" -ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" - -ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" - -ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" - -ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" - -ALTERNATIVE_util-linux-agetty = "getty" -ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" -ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" - -ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" -ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" -ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" - -ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" - -ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" - -ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" -ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" - -ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" - -ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" - -ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" - -ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" - -ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" - -ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" - -ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" +ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" -ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" - -ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" BBCLASSEXTEND = "native nativesdk" -python populate_packages_prepend() { - do_split_packages(d, '${base_libdir}', '^lib(.*)\.so\..*$', - output_pattern='util-linux-lib%s', - description='util-linux lib%s', - extra_depends='', prepend=True, allow_links=True) -} - -RDEPENDS_${PN}-bash-completion += "util-linux-lsblk" -RDEPENDS_${PN}-ptest = "bash grep coreutils which btrfs-tools ${PN}" - do_compile_ptest() { oe_runmake buildtest-TESTS } -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v3 00/12] util-linux: one package per binary 2019-01-14 12:56 [PATCH 00/12] RFC: util-linux: one package per binary André Draszik ` (12 preceding siblings ...) 2019-01-15 14:45 ` [PATCH v2 00/12] util-linux: one package per binary André Draszik @ 2019-01-16 12:00 ` André Draszik 2019-01-16 12:00 ` [PATCH v3 01/15] util-linux: simplify version upgrades (MAJOR_VERSION) André Draszik ` (15 more replies) 2019-01-16 12:51 ` [PATCH v4 " André Draszik ` (2 subsequent siblings) 16 siblings, 16 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:00 UTC (permalink / raw) To: openembedded-core v3: * update 12/15 util-linux: simplify meta-package RDEPENDS / RRECOMMENDS commit message * replace patch 06/15 update-alternatives: allow hooks before renaming files with 06/15 update-alternatives: convert file renames to PACKAGE_PREPROCESS_FUNCS * update follow-up patches 7 8 9 10 accordingly As per Richard's request / suggestion [YOCTO #13058] Cheers, Andre' ^ permalink raw reply [flat|nested] 103+ messages in thread
* [PATCH v3 01/15] util-linux: simplify version upgrades (MAJOR_VERSION) 2019-01-16 12:00 ` [PATCH v3 00/12] util-linux: one package per binary André Draszik @ 2019-01-16 12:00 ` André Draszik 2019-01-16 12:00 ` [PATCH v3 02/15] util-linux: remove erroneous patch (qsort_r) André Draszik ` (14 subsequent siblings) 15 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:00 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> There doesn't appear to be a need to manually and explicitly specificy the major version (for the download URL), it can be deduced easily from PV. Do so. Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 3 ++- meta/recipes-core/util-linux/util-linux_2.32.1.bb | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index e514041a19..7bfec80508 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -24,7 +24,8 @@ DEPENDS = "zlib ncurses virtual/crypt" DEPENDS_append_class-native = " lzo-native" DEPENDS_append_class-nativesdk = " lzo-native" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ +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-agetty util-linux-blkdiscard util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ diff --git a/meta/recipes-core/util-linux/util-linux_2.32.1.bb b/meta/recipes-core/util-linux/util-linux_2.32.1.bb index c909836cbb..b0492afff3 100644 --- a/meta/recipes-core/util-linux/util-linux_2.32.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.32.1.bb @@ -1,4 +1,3 @@ -MAJOR_VERSION = "2.32" require util-linux.inc # To support older hosts, we need to patch and/or revert -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v3 02/15] util-linux: remove erroneous patch (qsort_r) 2019-01-16 12:00 ` [PATCH v3 00/12] util-linux: one package per binary André Draszik 2019-01-16 12:00 ` [PATCH v3 01/15] util-linux: simplify version upgrades (MAJOR_VERSION) André Draszik @ 2019-01-16 12:00 ` André Draszik 2019-01-16 12:00 ` [PATCH v3 03/15] util-linux: remove minix remnants André Draszik ` (13 subsequent siblings) 15 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:00 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> The patch in question is patching the code to use qsort() instead of qsort_r(), without adopting the compare function. This is a major issue, because the compare function as written is evaluating / accessing a third argument, which is not passed with this OE patch, causing access to random memory. Given this patch was added so as to support (old) linux (host) distros which might not provide qsort_r(), according to the git history, and given these days util-linux detects availability of qsort_r() during configure phase, and given musl builds (which doesn't provide qsort_r() either) work without problem, the right solution is to simply drop this invalid patch. Do so. Signed-off-by: André Draszik <andre.draszik@jci.com> --- .../util-linux/util-linux-native-qsort.patch | 33 ------------------- .../util-linux/util-linux_2.32.1.bb | 6 ---- 2 files changed, 39 deletions(-) delete mode 100644 meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch b/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch deleted file mode 100644 index 68bf22de8c..0000000000 --- a/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f220d809be1baa654503bf6ff52f3630b0d7015c Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Wed, 26 Mar 2014 01:30:29 +0000 -Subject: [PATCH] sun.c: use qsort() to instead of qsort_r() - -qsort_r() was added to glibc in version 2.8, so there is no qsort_r() on -the host like CentOS 5.x. - -Upstream-Status: Inappropriate [Other] - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - libfdisk/src/sun.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -Index: util-linux-2.24.2/libfdisk/src/sun.c -=================================================================== ---- util-linux-2.24.2.orig/libfdisk/src/sun.c -+++ util-linux-2.24.2/libfdisk/src/sun.c -@@ -431,10 +431,9 @@ static int sun_verify_disklabel(struct f - } - verify_sun_starts = starts; - -- qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]), -- (int (*)(const void *,const void *,void *)) verify_sun_cmp, -- verify_sun_starts); -- -+ qsort(array,ARRAY_SIZE(array),sizeof(array[0]), -+ (int (*)(const void *,const void *)) verify_sun_cmp); -+ - if (array[0] == -1) { - fdisk_info(cxt, _("No partitions defined.")); - return 0; diff --git a/meta/recipes-core/util-linux/util-linux_2.32.1.bb b/meta/recipes-core/util-linux/util-linux_2.32.1.bb index b0492afff3..0f860c221b 100644 --- a/meta/recipes-core/util-linux/util-linux_2.32.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.32.1.bb @@ -1,14 +1,8 @@ require util-linux.inc -# To support older hosts, we need to patch and/or revert -# some upstream changes. Only do this for native packages. -OLDHOST = "" -OLDHOST_class-native = "file://util-linux-native-qsort.patch" - SRC_URI += "file://configure-sbindir.patch \ file://runuser.pamd \ file://runuser-l.pamd \ - ${OLDHOST} \ file://ptest.patch \ file://run-ptest \ file://display_testname_for_subtest.patch \ -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v3 03/15] util-linux: remove minix remnants 2019-01-16 12:00 ` [PATCH v3 00/12] util-linux: one package per binary André Draszik 2019-01-16 12:00 ` [PATCH v3 01/15] util-linux: simplify version upgrades (MAJOR_VERSION) André Draszik 2019-01-16 12:00 ` [PATCH v3 02/15] util-linux: remove erroneous patch (qsort_r) André Draszik @ 2019-01-16 12:00 ` André Draszik 2019-01-16 12:00 ` [PATCH v3 04/15] util-linux: be more explicit about what files go into packages André Draszik ` (12 subsequent siblings) 15 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:00 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> While commit fc66762d7c11 ("util-linux: Disable minix support.") (or e88cee8cc31d in poky) removed most of the bits, there are still references to minix remaining. Remove them. Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 7bfec80508..406af58502 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -159,7 +159,7 @@ do_install () { mkdir -p ${D}${base_bindir} sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" - sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root nologin" + sbinprogs_a="pivot_root hwclock mkswap losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root nologin" binprogs_a="dmesg getopt kill more umount mount login su mountpoint" if [ "${base_sbindir}" != "${sbindir}" ]; then -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v3 04/15] util-linux: be more explicit about what files go into packages 2019-01-16 12:00 ` [PATCH v3 00/12] util-linux: one package per binary André Draszik ` (2 preceding siblings ...) 2019-01-16 12:00 ` [PATCH v3 03/15] util-linux: remove minix remnants André Draszik @ 2019-01-16 12:00 ` André Draszik 2019-01-16 12:00 ` [PATCH v3 05/15] util-linux: fix the su and runuser packages André Draszik ` (11 subsequent siblings) 15 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:00 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Just using a wildcard leaves the reader wondering what is meant here. By being explicit we can describe exactly what is intended, i.e. the file name as resulting from the ALTERNATIVE and ALTERNATIVE_LINK_NAME mechanism. Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 406af58502..e479fc24e1 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -88,7 +88,7 @@ FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidd = "${sbindir}/uuidd" -FILES_util-linux-rfkill = "${sbindir}/rfkill*" +FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" FILES_util-linux-partx = "${sbindir}/partx" FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" FILES_util-linux-findfs = "${sbindir}/findfs" @@ -105,20 +105,20 @@ FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so FILES_util-linux-lsblk = "${bindir}/lsblk" FILES_util-linux-lscpu = "${bindir}/lscpu" -FILES_util-linux-fsck = "${base_sbindir}/fsck*" +FILES_util-linux-fsck = "${base_sbindir}/fsck.${BPN}" FILES_util-linux-mkfs = "${sbindir}/mkfs" FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" -FILES_util-linux-sulogin = "${base_sbindir}/sulogin*" +FILES_util-linux-sulogin = "${base_sbindir}/sulogin.${BPN}" FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" FILES_util-linux-switch-root = "${base_sbindir}/switch_root.${BPN}" FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one -FILES_util-linux-blkid = "${base_sbindir}/blkid*" +FILES_util-linux-blkid = "${base_sbindir}/blkid.${BPN}" RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" RREPLACES_util-linux-blkid = "e2fsprogs-blkid" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v3 05/15] util-linux: fix the su and runuser packages 2019-01-16 12:00 ` [PATCH v3 00/12] util-linux: one package per binary André Draszik ` (3 preceding siblings ...) 2019-01-16 12:00 ` [PATCH v3 04/15] util-linux: be more explicit about what files go into packages André Draszik @ 2019-01-16 12:00 ` André Draszik 2019-01-16 12:00 ` [PATCH v3 06/15] update-alternatives: convert file renames to PACKAGE_PREPROCESS_FUNCS André Draszik ` (10 subsequent siblings) 15 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:00 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> The packages get an automatic RDEPENDS via shlibs, no need to explicitly state it, so we can drop those useless explicit assignments. su is moved into ${base_bindir} in do_install(), so because of a mismatched FILES specification su is actually packaged into the main package at the moment, not into the -su package as likely originally intended. runuser needs the pam configuration files, so they should be in the -runuser package, not in the main package. While fixing this, we can simplify the update alternatives processing for su. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index e479fc24e1..4a72e3d40e 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -96,7 +96,8 @@ FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" FILES_util-linux-runuser = "${sbindir}/runuser" FILES_util-linux-prlimit = "${bindir}/prlimit" FILES_util-linux-ionice = "${bindir}/ionice.${BPN}" -FILES_util-linux-su = "${bindir}/su.util-linux ${sysconfdir}/pam.d/su-l" +FILES_util-linux-runuser = "${sysconfdir}/pam.d/runuser*" +FILES_util-linux-su = "${base_bindir}/su.${BPN} ${sysconfdir}/pam.d/su-l" CONFFILES_util-linux-su = "${sysconfdir}/pam.d/su-l" FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ @@ -122,9 +123,6 @@ FILES_util-linux-blkid = "${base_sbindir}/blkid.${BPN}" RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" RREPLACES_util-linux-blkid = "e2fsprogs-blkid" -RDEPENDS_util-linux-runuser += "libpam" -RDEPENDS_util-linux-su += "libpam" - 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)}" @@ -228,6 +226,7 @@ ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 rfkill.8 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1" +ALTERNATIVE_${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" @@ -235,6 +234,7 @@ ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" ALTERNATIVE_LINK_NAME[rfkill.8] = "${mandir}/man8/rfkill.8" +ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" @@ -263,6 +263,9 @@ ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" ALTERNATIVE_util-linux-mount = "mount" ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" +ALTERNATIVE_${PN}-su = "su" +ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" + ALTERNATIVE_util-linux-umount = "umount" ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" @@ -305,15 +308,6 @@ ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" BBCLASSEXTEND = "native nativesdk" -python do_package_prepend () { - if '--enable-su' in d.getVar('EXTRA_OECONF').split(): - d.appendVar(d.expand('ALTERNATIVE_${PN}'), ' su') - d.appendVar(d.expand('ALTERNATIVE_${PN}-doc'), ' su.1') - - d.setVarFlag('ALTERNATIVE_LINK_NAME', "su", d.expand('${base_bindir}/su')) - d.setVarFlag('ALTERNATIVE_LINK_NAME', "su.1", d.expand('${mandir}/man1/su.1')) -} - python populate_packages_prepend() { do_split_packages(d, '${base_libdir}', r'^lib(.*)\.so\..*$', output_pattern='util-linux-lib%s', -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v3 06/15] update-alternatives: convert file renames to PACKAGE_PREPROCESS_FUNCS 2019-01-16 12:00 ` [PATCH v3 00/12] util-linux: one package per binary André Draszik ` (4 preceding siblings ...) 2019-01-16 12:00 ` [PATCH v3 05/15] util-linux: fix the su and runuser packages André Draszik @ 2019-01-16 12:00 ` André Draszik 2019-01-16 12:17 ` Richard Purdie 2019-01-16 12:00 ` [PATCH v3 07/15] update-alternatives: try to update FILES_${PN} when renaming a file André Draszik ` (9 subsequent siblings) 15 siblings, 1 reply; 103+ messages in thread From: André Draszik @ 2019-01-16 12:00 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> At the moment, the update-alternatives file renaming is happening right after copying into PKGD during packaging time using an _append OVERRIDE to the copy function perform_packagecopy(). This is not really readable and hard to maintain. Additionally, this makes it impossible to e.g. populate PACKAGES dynamically using do_split_packages() and still do update-alternatives - update-alternatives file renaming requires the PACKAGES variable to have been fully populated to work correctly. On the other hand, do_split_packages() can only execute after perform_packagecopy(), as it needs PKGD populated; so it's impossible to insert do_split_packages() early enough in a deterministic way in this use-case. As there doesn't seem to be a reason not to, convert this to a proper function and use PACKAGE_PREPROCESS_FUNCS instead - after all, that's what this is meant for. No other classes or recipes in oe-core or meta-openembededd seem to have a hard requirement on update-alterantives executing before any other PACKAGE_PREPROCESS_FUNCS, so this should be perfectly fine. The only implication is that if compress_doc is inherited, compressed man-page file names will end up being, e.g. eject.1.util-linux.gz or eject.1.gz.util-linux based on the include of compress_doc.bbclass vs. update-alternatives.bbclass order, but the symlink created (alternative name) will always be correct. This solves both problems: * the code is easier to read / follow * the above described use-case can be accomodated easily [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/classes/update-alternatives.bbclass | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index f1250f877b..78291e7e45 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass @@ -131,14 +131,10 @@ def gen_updatealternativesvars(d): populate_packages[vardeps] += "${UPDALTVARS} ${@gen_updatealternativesvars(d)}" # We need to do the rename after the image creation step, but before -# the split and strip steps.. packagecopy seems to be the earliest reasonable -# place. -python perform_packagecopy_append () { - if update_alternatives_enabled(d): - apply_update_alternative_renames(d) -} - -def apply_update_alternative_renames(d): +# the split and strip steps.. PACKAGE_PREPROCESS_FUNCS is the right +# place for that. +PACKAGE_PREPROCESS_FUNCS += "${@'apply_update_alternative_renames' if update_alternatives_enabled(d) else ''}" +python apply_update_alternative_renames () { # Check for deprecated usage... pn = d.getVar('BPN') if d.getVar('ALTERNATIVE_LINKS') != None: @@ -204,6 +200,7 @@ def apply_update_alternative_renames(d): os.unlink(src) else: bb.warn('%s: Unable to resolve dangling symlink: %s' % (pn, alt_target)) +} PACKAGESPLITFUNCS_prepend = "populate_packages_updatealternatives " -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* Re: [PATCH v3 06/15] update-alternatives: convert file renames to PACKAGE_PREPROCESS_FUNCS 2019-01-16 12:00 ` [PATCH v3 06/15] update-alternatives: convert file renames to PACKAGE_PREPROCESS_FUNCS André Draszik @ 2019-01-16 12:17 ` Richard Purdie 0 siblings, 0 replies; 103+ messages in thread From: Richard Purdie @ 2019-01-16 12:17 UTC (permalink / raw) To: André Draszik, openembedded-core On Wed, 2019-01-16 at 12:00 +0000, André Draszik wrote: > From: André Draszik <andre.draszik@jci.com> > > At the moment, the update-alternatives file renaming is > happening right after copying into PKGD during packaging > time using an _append OVERRIDE to the copy function > perform_packagecopy(). > > This is not really readable and hard to maintain. > > Additionally, this makes it impossible to e.g. populate > PACKAGES dynamically using do_split_packages() and still > do update-alternatives - update-alternatives file renaming > requires the PACKAGES variable to have been fully populated > to work correctly. On the other hand, do_split_packages() > can only execute after perform_packagecopy(), as it needs > PKGD populated; so it's impossible to insert > do_split_packages() early enough in a deterministic way in > this use-case. > > As there doesn't seem to be a reason not to, convert > this to a proper function and use PACKAGE_PREPROCESS_FUNCS > instead - after all, that's what this is meant for. > > No other classes or recipes in oe-core or meta-openembededd > seem to have a hard requirement on update-alterantives > executing before any other PACKAGE_PREPROCESS_FUNCS, so > this should be perfectly fine. > > The only implication is that if compress_doc is inherited, > compressed man-page file names will end up being, e.g. > eject.1.util-linux.gz > or > eject.1.gz.util-linux > based on the include of compress_doc.bbclass vs. > update-alternatives.bbclass order, but the symlink created > (alternative name) will always be correct. > > This solves both problems: > * the code is easier to read / follow > * the above described use-case can be accomodated easily > > [YOCTO #13058] > > Signed-off-by: André Draszik <andre.draszik@jci.com> > --- > meta/classes/update-alternatives.bbclass | 13 +++++-------- > 1 file changed, 5 insertions(+), 8 deletions(-) > > diff --git a/meta/classes/update-alternatives.bbclass > b/meta/classes/update-alternatives.bbclass > index f1250f877b..78291e7e45 100644 > --- a/meta/classes/update-alternatives.bbclass > +++ b/meta/classes/update-alternatives.bbclass > @@ -131,14 +131,10 @@ def gen_updatealternativesvars(d): > populate_packages[vardeps] += "${UPDALTVARS} ${@gen_updatealternativ > esvars(d)}" > > # We need to do the rename after the image creation step, but before > -# the split and strip steps.. packagecopy seems to be the earliest > reasonable > -# place. > -python perform_packagecopy_append () { > - if update_alternatives_enabled(d): > - apply_update_alternative_renames(d) > -} > - > -def apply_update_alternative_renames(d): > +# the split and strip steps.. PACKAGE_PREPROCESS_FUNCS is the right > +# place for that. > +PACKAGE_PREPROCESS_FUNCS += "${@'apply_update_alternative_renames' > if update_alternatives_enabled(d) else ''}" > +python apply_update_alternative_renames () { Looks good, how about adding: if not update_alternatives_enabled(d): return here to make it slightly more readable? > # Check for deprecated usage... > pn = d.getVar('BPN') > if d.getVar('ALTERNATIVE_LINKS') != None: > @@ -204,6 +200,7 @@ def apply_update_alternative_renames(d): > os.unlink(src) > else: > bb.warn('%s: Unable to resolve dangling symlink: > %s' % (pn, alt_target)) > +} Cheers, Richard ^ permalink raw reply [flat|nested] 103+ messages in thread
* [PATCH v3 07/15] update-alternatives: try to update FILES_${PN} when renaming a file 2019-01-16 12:00 ` [PATCH v3 00/12] util-linux: one package per binary André Draszik ` (5 preceding siblings ...) 2019-01-16 12:00 ` [PATCH v3 06/15] update-alternatives: convert file renames to PACKAGE_PREPROCESS_FUNCS André Draszik @ 2019-01-16 12:00 ` André Draszik 2019-01-16 12:18 ` Richard Purdie 2019-01-16 12:00 ` [PATCH v3 08/15] util-linux: one package per binary (pt 1: base_sbindir) André Draszik ` (8 subsequent siblings) 15 siblings, 1 reply; 103+ messages in thread From: André Draszik @ 2019-01-16 12:00 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> When using update-alternatives, FILES_${PN} must be referencing the new name after update-alternatives has renamed files. This is more or less OK when having static lists of files to be packaged into a package, but makes it quite hard to dynamically generate FILES_${PN}, e.g. using do_split_packages(), as in that case we can not easily modify what goes into FILES_${PN}, because that list is based on filenames as seen at the time do_split_packages() is executing. Of couse one could explicitly specify the (renamed) file(s) in the recipe, but that contradicts the intended usage of do_split_packages(). Instead, if FILES_${PN} contains the file name as it was pre renaming, we here modify this to reflect the new name. This will allow usage of do_split_packages() to populate FILES_${PN}. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/classes/update-alternatives.bbclass | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index 78291e7e45..363f1ae129 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass @@ -135,6 +135,8 @@ populate_packages[vardeps] += "${UPDALTVARS} ${@gen_updatealternativesvars(d)}" # place for that. PACKAGE_PREPROCESS_FUNCS += "${@'apply_update_alternative_renames' if update_alternatives_enabled(d) else ''}" python apply_update_alternative_renames () { + from re import sub + # Check for deprecated usage... pn = d.getVar('BPN') if d.getVar('ALTERNATIVE_LINKS') != None: @@ -174,6 +176,10 @@ python apply_update_alternative_renames () { else: bb.note('%s: Rename %s -> %s' % (pn, alt_target, alt_target_rename)) os.rename(src, dest) + f = d.getVar('FILES_' + pkg) + if f: + f = sub(r'(^|\s)%s(\s|$)' % alt_target, r'\1%s\2' % alt_target_rename, f) + d.setVar('FILES_' + pkg, f) else: bb.warn("%s: alternative target (%s or %s) does not exist, skipping..." % (pn, alt_target, alt_target_rename)) continue @@ -200,6 +206,11 @@ python apply_update_alternative_renames () { os.unlink(src) else: bb.warn('%s: Unable to resolve dangling symlink: %s' % (pn, alt_target)) + continue + f = d.getVar('FILES_' + pkg) + if f: + f = sub(r'(^|\s)%s(\s|$)' % alt_target, r'\1%s\2' % alt_target_rename, f) + d.setVar('FILES_' + pkg, f) } PACKAGESPLITFUNCS_prepend = "populate_packages_updatealternatives " -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* Re: [PATCH v3 07/15] update-alternatives: try to update FILES_${PN} when renaming a file 2019-01-16 12:00 ` [PATCH v3 07/15] update-alternatives: try to update FILES_${PN} when renaming a file André Draszik @ 2019-01-16 12:18 ` Richard Purdie 0 siblings, 0 replies; 103+ messages in thread From: Richard Purdie @ 2019-01-16 12:18 UTC (permalink / raw) To: André Draszik, openembedded-core On Wed, 2019-01-16 at 12:00 +0000, André Draszik wrote: > From: André Draszik <andre.draszik@jci.com> > > When using update-alternatives, FILES_${PN} must be > referencing the new name after update-alternatives has > renamed files. > > This is more or less OK when having static lists of files to > be packaged into a package, but makes it quite hard to > dynamically generate FILES_${PN}, e.g. using do_split_packages(), > as in that case we can not easily modify what goes into > FILES_${PN}, because that list is based on filenames as seen > at the time do_split_packages() is executing. > > Of couse one could explicitly specify the (renamed) file(s) > in the recipe, but that contradicts the intended usage of > do_split_packages(). > > Instead, if FILES_${PN} contains the file name as it was pre > renaming, we here modify this to reflect the new name. > > This will allow usage of do_split_packages() to populate > FILES_${PN}. > > [YOCTO #13058] > > Signed-off-by: André Draszik <andre.draszik@jci.com> > --- > meta/classes/update-alternatives.bbclass | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass > index 78291e7e45..363f1ae129 100644 > --- a/meta/classes/update-alternatives.bbclass > +++ b/meta/classes/update-alternatives.bbclass > @@ -135,6 +135,8 @@ populate_packages[vardeps] += "${UPDALTVARS} ${@gen_updatealternativesvars(d)}" > # place for that. > PACKAGE_PREPROCESS_FUNCS += "${@'apply_update_alternative_renames' if update_alternatives_enabled(d) else ''}" > python apply_update_alternative_renames () { > + from re import sub > + > # Check for deprecated usage... > pn = d.getVar('BPN') > if d.getVar('ALTERNATIVE_LINKS') != None: > @@ -174,6 +176,10 @@ python apply_update_alternative_renames () { > else: > bb.note('%s: Rename %s -> %s' % (pn, alt_target, alt_target_rename)) > os.rename(src, dest) > + f = d.getVar('FILES_' + pkg) > + if f: > + f = sub(r'(^|\s)%s(\s|$)' % alt_target, r'\1%s\2' % alt_target_rename, f) > + d.setVar('FILES_' + pkg, f) > else: > bb.warn("%s: alternative target (%s or %s) does not exist, skipping..." % (pn, alt_target, alt_target_rename)) > continue > @@ -200,6 +206,11 @@ python apply_update_alternative_renames () { > os.unlink(src) > else: > bb.warn('%s: Unable to resolve dangling symlink: %s' % (pn, alt_target)) > + continue > + f = d.getVar('FILES_' + pkg) > + if f: > + f = sub(r'(^|\s)%s(\s|$)' % alt_target, r'\1%s\2' % alt_target_rename, f) > + d.setVar('FILES_' + pkg, f) > } > Create an internal function and call it twice: def update_files(alt_target, alt_target_rename, pkg, d): f = d.getVar('FILES_' + pkg) if f: f = sub(r'(^|\s)%s(\s|$)' % alt_target, r'\1%s\2' % alt_target_rename, f) d.setVar('FILES_' + pkg, f) ? Cheers, Richard ^ permalink raw reply [flat|nested] 103+ messages in thread
* [PATCH v3 08/15] util-linux: one package per binary (pt 1: base_sbindir) 2019-01-16 12:00 ` [PATCH v3 00/12] util-linux: one package per binary André Draszik ` (6 preceding siblings ...) 2019-01-16 12:00 ` [PATCH v3 07/15] update-alternatives: try to update FILES_${PN} when renaming a file André Draszik @ 2019-01-16 12:00 ` André Draszik 2019-01-16 12:00 ` [PATCH v3 09/15] util-linux: one package per binary (pt 2: base_bindir) André Draszik ` (7 subsequent siblings) 15 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:00 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Now that we have required infrastructure in place, we can start creating one package per binary. To make this process easier to follow, this is done in steps, starting with binaries from base_sbindir. Existing packages (and current dependency by main package): * agetty * blkid * cfdisk <- RRECOMMENDS * fdisk <- RRECOMMENDS * fsck * fstrim * losetup <- RDEPENDS * hwclock * sulogin <- RDEPENDS * swaponoff <- RDEPENDS * switch-root <- RRECOMMENDS New packages: * blockdev * ctrlaltdel * mkswap * nologin * pivot-root * swapon * swapoff swaponoff is empty now and simply depends on swapon swapoff 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. Existing packages that aren't in RDEPENDS / RRECOMMENDS haven't been added to RRECOMMENDS for that reason. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v3: * convert to PACKAGE_PREPROCESS_FUNCS rather than using apply_update_alternative_renames_prepend v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use PN for package name prefix, not BPN --- meta/recipes-core/util-linux/util-linux.inc | 64 ++++++++++----------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 4a72e3d40e..a23fec69ea 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -28,19 +28,35 @@ 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-agetty util-linux-blkdiscard util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ - util-linux-swaponoff util-linux-losetup util-linux-umount \ +PACKAGES =+ "util-linux-blkdiscard util-linux-sfdisk \ + util-linux-swaponoff util-linux-umount \ util-linux-mount util-linux-readprofile util-linux-uuidd \ - util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs util-linux-fsck \ - util-linux-blkid util-linux-mkfs util-linux-mcookie util-linux-rfkill \ - util-linux-lsblk util-linux-mkfs.cramfs util-linux-fstrim \ - util-linux-partx util-linux-hwclock util-linux-mountpoint \ - util-linux-findfs util-linux-getopt util-linux-sulogin util-linux-prlimit \ - util-linux-ionice util-linux-switch-root util-linux-unshare" + util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs \ + util-linux-mkfs util-linux-mcookie util-linux-rfkill \ + util-linux-lsblk util-linux-mkfs.cramfs \ + util-linux-partx util-linux-mountpoint \ + util-linux-findfs util-linux-getopt util-linux-prlimit \ + util-linux-ionice util-linux-unshare" PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}" -PACKAGES_DYNAMIC = "^util-linux-lib.*" +python util_linux_binpackages () { + def pkg_hook(f, pkg, file_regex, output_pattern, modulename): + if d.getVar('ALTERNATIVE_' + pkg): + return + if d.getVarFlag('ALTERNATIVE_LINK_NAME', modulename): + d.setVar('ALTERNATIVE_' + pkg, modulename) + + do_split_packages(d, root='${base_sbindir}', + file_regex=r'(.*)', output_pattern='${PN}-%s', + description='${PN} %s', + hook=pkg_hook, extra_depends='', prepend=True) +} + +# we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS +PACKAGE_PREPROCESS_FUNCS =+ "util_linux_binpackages " + +PACKAGES_DYNAMIC = "^util-linux-.*" SHARED_EXTRA_OECONF = "--disable-use-tty-group \ --disable-makeinstall-chown \ @@ -74,14 +90,8 @@ FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" -FILES_util-linux-agetty = "${base_sbindir}/agetty" FILES_util-linux-blkdiscard = "${sbindir}/blkdiscard" -FILES_util-linux-fdisk = "${base_sbindir}/fdisk.${BPN}" -FILES_util-linux-fstrim = "${base_sbindir}/fstrim.${BPN}" -FILES_util-linux-cfdisk = "${base_sbindir}/cfdisk" FILES_util-linux-sfdisk = "${sbindir}/sfdisk" -FILES_util-linux-swaponoff = "${base_sbindir}/swapon.${BPN} ${base_sbindir}/swapoff.${BPN}" -FILES_util-linux-losetup = "${base_sbindir}/losetup.${BPN}" FILES_util-linux-mount = "${base_bindir}/mount.${BPN}" FILES_util-linux-mcookie = "${bindir}/mcookie" FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" @@ -90,7 +100,6 @@ FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidd = "${sbindir}/uuidd" FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" FILES_util-linux-partx = "${sbindir}/partx" -FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" FILES_util-linux-findfs = "${sbindir}/findfs" FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" FILES_util-linux-runuser = "${sbindir}/runuser" @@ -106,27 +115,24 @@ FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so FILES_util-linux-lsblk = "${bindir}/lsblk" FILES_util-linux-lscpu = "${bindir}/lscpu" -FILES_util-linux-fsck = "${base_sbindir}/fsck.${BPN}" FILES_util-linux-mkfs = "${sbindir}/mkfs" FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" -FILES_util-linux-sulogin = "${base_sbindir}/sulogin.${BPN}" FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" -FILES_util-linux-switch-root = "${base_sbindir}/switch_root.${BPN}" FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one -FILES_util-linux-blkid = "${base_sbindir}/blkid.${BPN}" 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} = "util-linux-blkdiscard util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint util-linux-prlimit util-linux-ionice util-linux-switch-root" +RRECOMMENDS_${PN} = "util-linux-blkdiscard util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint 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}_class-native = "" RRECOMMENDS_${PN}_class-nativesdk = "" @@ -135,6 +141,9 @@ RDEPENDS_${PN}_class-nativesdk = "" RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev" +RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" +ALLOW_EMPTY_${PN}-swaponoff = "1" + #SYSTEMD_PACKAGES = "${PN}-uuidd ${PN}-fstrim" SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.socket uuidd.service" SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable" @@ -206,9 +215,9 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = " \ - dmesg kill more mkswap blockdev pivot_root \ + dmesg kill more \ hexdump last lastb logger mesg renice wall \ - setsid chrt flock utmpdump eject nologin taskset fallocate \ + setsid chrt flock utmpdump eject taskset fallocate \ fsfreeze nsenter cal rev \ " @@ -247,13 +256,10 @@ ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3" ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" -ALTERNATIVE_util-linux-hwclock = "hwclock" ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" -ALTERNATIVE_util-linux-fdisk = "fdisk" ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" -ALTERNATIVE_util-linux-fstrim = "fstrim" ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" ALTERNATIVE_util-linux-agetty = "getty" @@ -272,17 +278,13 @@ ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" ALTERNATIVE_util-linux-readprofile = "readprofile" ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" -ALTERNATIVE_util-linux-losetup = "losetup" ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" -ALTERNATIVE_util-linux-swaponoff = "swapoff swapon" ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" -ALTERNATIVE_util-linux-fsck = "fsck" ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" -ALTERNATIVE_util-linux-blkid = "blkid" ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" ALTERNATIVE_util-linux-rfkill = "rfkill" @@ -291,7 +293,6 @@ ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" ALTERNATIVE_util-linux-getopt = "getopt" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" -ALTERNATIVE_util-linux-sulogin = "sulogin" ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" ALTERNATIVE_util-linux-mountpoint = "mountpoint" @@ -303,7 +304,6 @@ ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" ALTERNATIVE_util-linux-ionice = "ionice" ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" -ALTERNATIVE_util-linux-switch-root = "switch_root" ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" BBCLASSEXTEND = "native nativesdk" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v3 09/15] util-linux: one package per binary (pt 2: base_bindir) 2019-01-16 12:00 ` [PATCH v3 00/12] util-linux: one package per binary André Draszik ` (7 preceding siblings ...) 2019-01-16 12:00 ` [PATCH v3 08/15] util-linux: one package per binary (pt 1: base_sbindir) André Draszik @ 2019-01-16 12:00 ` André Draszik 2019-01-16 12:00 ` [PATCH v3 10/15] util-linux: one package per binary (pt 3: sbindir) André Draszik ` (6 subsequent siblings) 15 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:00 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Similar to the previous patch. Existing packages (and current dependency by main package): * mount <- RRECOMMENDS * umount <- RDEPENDS * mountpoint <- RRECOMMENDS * getopt * su <- RDEPENDS New packages: * dmesg * kill * more 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. Existing packages that aren't in RDEPENDS / RRECOMMENDS haven't been added to RRECOMMENDS for that reason. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v3: * convert to PACKAGE_PREPROCESS_FUNCS rather than using apply_update_alternative_renames_prepend v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use PN for package name prefix, not BPN --- meta/recipes-core/util-linux/util-linux.inc | 32 ++++++++------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index a23fec69ea..36a22cf6d7 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -29,16 +29,16 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz " PACKAGES =+ "util-linux-blkdiscard util-linux-sfdisk \ - util-linux-swaponoff util-linux-umount \ - util-linux-mount util-linux-readprofile util-linux-uuidd \ + util-linux-swaponoff \ + util-linux-readprofile util-linux-uuidd \ util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs \ util-linux-mkfs util-linux-mcookie util-linux-rfkill \ util-linux-lsblk util-linux-mkfs.cramfs \ - util-linux-partx util-linux-mountpoint \ - util-linux-findfs util-linux-getopt util-linux-prlimit \ + util-linux-partx \ + util-linux-findfs util-linux-prlimit \ util-linux-ionice util-linux-unshare" PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" -PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}" +PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}" python util_linux_binpackages () { def pkg_hook(f, pkg, file_regex, output_pattern, modulename): @@ -51,6 +51,10 @@ python util_linux_binpackages () { file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', hook=pkg_hook, extra_depends='', prepend=True) + do_split_packages(d, root='${base_bindir}', + file_regex=r'(.*)', output_pattern='${PN}-%s', + description='${PN} %s', + hook=pkg_hook, extra_depends='', prepend=True) } # we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS @@ -92,21 +96,18 @@ FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" FILES_util-linux-blkdiscard = "${sbindir}/blkdiscard" FILES_util-linux-sfdisk = "${sbindir}/sfdisk" -FILES_util-linux-mount = "${base_bindir}/mount.${BPN}" FILES_util-linux-mcookie = "${bindir}/mcookie" -FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidd = "${sbindir}/uuidd" FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" FILES_util-linux-partx = "${sbindir}/partx" FILES_util-linux-findfs = "${sbindir}/findfs" -FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" FILES_util-linux-runuser = "${sbindir}/runuser" 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 = "${base_bindir}/su.${BPN} ${sysconfdir}/pam.d/su-l" +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 \ @@ -120,8 +121,6 @@ FILES_util-linux-mkfs = "${sbindir}/mkfs" FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" -FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" - FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one @@ -131,8 +130,9 @@ 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-blkdiscard util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint util-linux-prlimit util-linux-ionice" +RRECOMMENDS_${PN} = "util-linux-blkdiscard util-linux-sfdisk util-linux-readprofile util-linux-mkfs 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" RRECOMMENDS_${PN}_class-native = "" RRECOMMENDS_${PN}_class-nativesdk = "" @@ -215,7 +215,6 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = " \ - dmesg kill more \ hexdump last lastb logger mesg renice wall \ setsid chrt flock utmpdump eject taskset fallocate \ fsfreeze nsenter cal rev \ @@ -266,13 +265,8 @@ ALTERNATIVE_util-linux-agetty = "getty" ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" -ALTERNATIVE_util-linux-mount = "mount" ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" - -ALTERNATIVE_${PN}-su = "su" ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" - -ALTERNATIVE_util-linux-umount = "umount" ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" ALTERNATIVE_util-linux-readprofile = "readprofile" @@ -290,12 +284,10 @@ ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" ALTERNATIVE_util-linux-rfkill = "rfkill" ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" -ALTERNATIVE_util-linux-getopt = "getopt" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" -ALTERNATIVE_util-linux-mountpoint = "mountpoint" ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" ALTERNATIVE_util-linux-unshare = "unshare" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v3 10/15] util-linux: one package per binary (pt 3: sbindir) 2019-01-16 12:00 ` [PATCH v3 00/12] util-linux: one package per binary André Draszik ` (8 preceding siblings ...) 2019-01-16 12:00 ` [PATCH v3 09/15] util-linux: one package per binary (pt 2: base_bindir) André Draszik @ 2019-01-16 12:00 ` André Draszik 2019-01-16 12:00 ` [PATCH v3 11/15] util-linux: one package per binary (pt 4: bindir) André Draszik ` (5 subsequent siblings) 15 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:00 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Similar to the previous patch. Existing packages (and current dependency by main package): * blkdiscard <- RRECOMMENDS * findfs * fsck.cramfs * mkfs <- RRECOMMENDS * mkfs.cramfs * partx * readprofile <- RRECOMMENDS * rfkill * runuser <- RDEPENDS * sfdisk <- RRECOMMENDS * uuidd 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. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v3: * convert to PACKAGE_PREPROCESS_FUNCS rather than using apply_update_alternative_renames_prepend v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use PN for package name prefix, not BPN --- meta/recipes-core/util-linux/util-linux.inc | 42 ++++++++------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 36a22cf6d7..bab66f788e 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -28,17 +28,13 @@ 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-blkdiscard util-linux-sfdisk \ - util-linux-swaponoff \ - util-linux-readprofile util-linux-uuidd \ - util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs \ - util-linux-mkfs util-linux-mcookie util-linux-rfkill \ - util-linux-lsblk util-linux-mkfs.cramfs \ - util-linux-partx \ - util-linux-findfs util-linux-prlimit \ +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 += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" -PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}" python util_linux_binpackages () { def pkg_hook(f, pkg, file_regex, output_pattern, modulename): @@ -47,6 +43,11 @@ python util_linux_binpackages () { 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', @@ -55,6 +56,10 @@ python util_linux_binpackages () { file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', hook=pkg_hook, extra_depends='', prepend=True) + 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) } # we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS @@ -94,16 +99,8 @@ FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" -FILES_util-linux-blkdiscard = "${sbindir}/blkdiscard" -FILES_util-linux-sfdisk = "${sbindir}/sfdisk" FILES_util-linux-mcookie = "${bindir}/mcookie" -FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" FILES_util-linux-uuidgen = "${bindir}/uuidgen" -FILES_util-linux-uuidd = "${sbindir}/uuidd" -FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" -FILES_util-linux-partx = "${sbindir}/partx" -FILES_util-linux-findfs = "${sbindir}/findfs" -FILES_util-linux-runuser = "${sbindir}/runuser" FILES_util-linux-prlimit = "${bindir}/prlimit" FILES_util-linux-ionice = "${bindir}/ionice.${BPN}" FILES_util-linux-runuser = "${sysconfdir}/pam.d/runuser*" @@ -116,11 +113,6 @@ FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so FILES_util-linux-lsblk = "${bindir}/lsblk" FILES_util-linux-lscpu = "${bindir}/lscpu" -FILES_util-linux-mkfs = "${sbindir}/mkfs" - -FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" -FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" - FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one @@ -130,7 +122,7 @@ 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-blkdiscard util-linux-sfdisk util-linux-readprofile util-linux-mkfs util-linux-prlimit util-linux-ionice" +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" @@ -217,7 +209,7 @@ ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = " \ hexdump last lastb logger mesg renice wall \ setsid chrt flock utmpdump eject taskset fallocate \ - fsfreeze nsenter cal rev \ + nsenter cal rev \ " ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" @@ -269,7 +261,6 @@ ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" -ALTERNATIVE_util-linux-readprofile = "readprofile" ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" @@ -281,7 +272,6 @@ ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" -ALTERNATIVE_util-linux-rfkill = "rfkill" ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v3 11/15] util-linux: one package per binary (pt 4: bindir) 2019-01-16 12:00 ` [PATCH v3 00/12] util-linux: one package per binary André Draszik ` (9 preceding siblings ...) 2019-01-16 12:00 ` [PATCH v3 10/15] util-linux: one package per binary (pt 3: sbindir) André Draszik @ 2019-01-16 12:00 ` André Draszik 2019-01-16 12:00 ` [PATCH v3 12/15] util-linux: simplify meta-package RDEPENDS / RRECOMMENDS André Draszik ` (4 subsequent siblings) 15 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:00 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> 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] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v3: * convert to PACKAGE_PREPROCESS_FUNCS rather than using apply_update_alternative_renames_prepend v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use PN for package name prefix, not BPN --- meta/recipes-core/util-linux/util-linux.inc | 45 ++++++++++----------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index bab66f788e..7e3887dc92 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -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 () { @@ -60,6 +55,10 @@ python util_linux_binpackages () { file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', hook=pkg_hook_with_recommends, 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) } # we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS @@ -99,21 +98,14 @@ 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_${PN}-last = "${bindir}/lastb" 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}" +FILES_${PN}-setarch = "${bindir}/linux32 ${bindir}/linux64 ${bindir}/uname26" # Util-linux' blkid replaces the e2fsprogs one RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" @@ -122,7 +114,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" @@ -206,12 +197,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" @@ -219,9 +204,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" @@ -280,10 +279,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" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v3 12/15] util-linux: simplify meta-package RDEPENDS / RRECOMMENDS 2019-01-16 12:00 ` [PATCH v3 00/12] util-linux: one package per binary André Draszik ` (10 preceding siblings ...) 2019-01-16 12:00 ` [PATCH v3 11/15] util-linux: one package per binary (pt 4: bindir) André Draszik @ 2019-01-16 12:00 ` André Draszik 2019-01-16 12:00 ` [PATCH v3 13/15] util-linux: move /etc/default/mountall into -mount subpackage André Draszik ` (3 subsequent siblings) 15 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:00 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@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.draszik@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 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v3 13/15] util-linux: move /etc/default/mountall into -mount subpackage 2019-01-16 12:00 ` [PATCH v3 00/12] util-linux: one package per binary André Draszik ` (11 preceding siblings ...) 2019-01-16 12:00 ` [PATCH v3 12/15] util-linux: simplify meta-package RDEPENDS / RRECOMMENDS André Draszik @ 2019-01-16 12:00 ` André Draszik 2019-01-16 12:00 ` [PATCH v3 14/15] util-linux: let -ptest package depend on all of util-linux André Draszik ` (2 subsequent siblings) 15 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:00 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> This should probably be there and now the main package is a real meta-package only. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 000db880a1..47264028f2 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -44,19 +44,19 @@ python util_linux_binpackages () { do_split_packages(d, root='${base_sbindir}', file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', - hook=pkg_hook, extra_depends='', prepend=True) + hook=pkg_hook, extra_depends='') do_split_packages(d, root='${base_bindir}', file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', - hook=pkg_hook, extra_depends='', prepend=True) + hook=pkg_hook, extra_depends='') do_split_packages(d, root='${sbindir}', file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', - hook=pkg_hook, extra_depends='', prepend=True) + hook=pkg_hook, extra_depends='') do_split_packages(d, root='${bindir}', file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', - hook=pkg_hook, extra_depends='', prepend=True) + hook=pkg_hook, extra_depends='') } # we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS @@ -92,11 +92,14 @@ PACKAGECONFIG[pylibmount] = "--with-python=3 --enable-pylibmount,--without-pytho # Readline support PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" +ALLOW_EMPTY_${PN} = "1" +FILES_${PN} = "" FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" FILES_${PN}-last = "${bindir}/lastb" +FILES_${PN}-mount = "${sysconfdir}/default/mountall" 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" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v3 14/15] util-linux: let -ptest package depend on all of util-linux 2019-01-16 12:00 ` [PATCH v3 00/12] util-linux: one package per binary André Draszik ` (12 preceding siblings ...) 2019-01-16 12:00 ` [PATCH v3 13/15] util-linux: move /etc/default/mountall into -mount subpackage André Draszik @ 2019-01-16 12:00 ` André Draszik 2019-01-16 12:00 ` [PATCH v3 15/15] utils-linux: final cleanup André Draszik 2019-01-16 12:02 ` [PATCH v3 00/12] util-linux: one package per binary André Draszik 15 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:00 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> ptest executes all the binaries, so they really need to be available in the file system. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 47264028f2..458df5d047 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -290,7 +290,7 @@ python populate_packages_prepend() { } RDEPENDS_${PN}-bash-completion += "util-linux-lsblk" -RDEPENDS_${PN}-ptest = "bash grep coreutils which util-linux-blkid util-linux-fsck btrfs-tools" +RDEPENDS_${PN}-ptest = "bash grep coreutils which btrfs-tools ${PN}" do_compile_ptest() { oe_runmake buildtest-TESTS -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v3 15/15] utils-linux: final cleanup 2019-01-16 12:00 ` [PATCH v3 00/12] util-linux: one package per binary André Draszik ` (13 preceding siblings ...) 2019-01-16 12:00 ` [PATCH v3 14/15] util-linux: let -ptest package depend on all of util-linux André Draszik @ 2019-01-16 12:00 ` André Draszik 2019-01-16 12:02 ` [PATCH v3 00/12] util-linux: one package per binary André Draszik 15 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:00 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> * use ${PN} instead of util-linux * use PACKAGESPLITFUNCS for creating util-linux-lib* packages rather than an _append OVERRIDE * sort ALTERNATIVE_LINK_NAME alphabetically * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use systemd_system_unitdir instead of open-coding * inherit manpages so as to benefit from man-db processing (note that manpages are not generated here, we just want the automatic update of the package index caches * use EXTRA_OEMAKE instead of duplicating command line arguments [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v3: * use PACKAGESPLITFUNCS =+ rather than PACKAGESPLITFUNCS_prepend v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use systemd_system_unitdir instead of open-coding * inherit manpages * use EXTRA_OEMAKE instead of duplicating command line arguments * also sort ALTERNATIVE_LINK_NAME for man pages --- meta/recipes-core/util-linux/util-linux.inc | 156 ++++++++------------ 1 file changed, 65 insertions(+), 91 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 458df5d047..c5a8c4f41f 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=1715f5ee3e01203ca1e1e0b9ee65918c file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16" #gtk-doc is not enabled as it requires xmlto which requires util-linux -inherit autotools gettext pkgconfig systemd update-alternatives python3-dir bash-completion ptest +inherit autotools gettext manpages pkgconfig systemd update-alternatives python3-dir bash-completion ptest DEPENDS = "zlib ncurses virtual/crypt" DEPENDS_append_class-native = " lzo-native" DEPENDS_append_class-nativesdk = " lzo-native" @@ -28,8 +28,8 @@ 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" -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" +PACKAGES =+ "${PN}-swaponoff" +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', '${PN}-pylibmount', '', d)}" python util_linux_binpackages () { def pkg_hook(f, pkg, file_regex, output_pattern, modulename): @@ -62,7 +62,16 @@ python util_linux_binpackages () { # we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS PACKAGE_PREPROCESS_FUNCS =+ "util_linux_binpackages " -PACKAGES_DYNAMIC = "^util-linux-.*" +python util_linux_libpackages() { + do_split_packages(d, root='${base_libdir}', file_regex=r'^lib(.*)\.so\..*$', + output_pattern='${PN}-lib%s', + description='${PN} lib%s', + extra_depends='', prepend=True, allow_links=True) +} + +PACKAGESPLITFUNCS =+ "util_linux_libpackages" + +PACKAGES_DYNAMIC = "^${PN}-.*" SHARED_EXTRA_OECONF = "--disable-use-tty-group \ --disable-makeinstall-chown \ @@ -76,49 +85,46 @@ SHARED_EXTRA_OECONF = "--disable-use-tty-group \ " EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}" +EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'" PACKAGECONFIG_class-target ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," - # Respect the systemd feature for uuidd -PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/, --without-systemd --without-systemdsystemunitdir,systemd" - +PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-systemd --without-systemdsystemunitdir,systemd" # Build setpriv requires libcap-ng PACKAGECONFIG[libcap-ng] = "--enable-setpriv,--disable-setpriv,libcap-ng," - # Build python bindings for libmount PACKAGECONFIG[pylibmount] = "--with-python=3 --enable-pylibmount,--without-python --disable-pylibmount,python3" - # Readline support PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" ALLOW_EMPTY_${PN} = "1" FILES_${PN} = "" FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" - FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" - FILES_${PN}-last = "${bindir}/lastb" FILES_${PN}-mount = "${sysconfdir}/default/mountall" -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_${PN}-runuser = "${sysconfdir}/pam.d/runuser*" +FILES_${PN}-su = "${sysconfdir}/pam.d/su-l" +CONFFILES_${PN}-su = "${sysconfdir}/pam.d/su-l" +FILES_${PN}-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ + ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \ + ${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*" FILES_${PN}-setarch = "${bindir}/linux32 ${bindir}/linux64 ${bindir}/uname26" # Util-linux' blkid replaces the e2fsprogs one -RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" -RREPLACES_util-linux-blkid = "e2fsprogs-blkid" +RCONFLICTS_${PN}-blkid = "e2fsprogs-blkid" +RREPLACES_${PN}-blkid = "e2fsprogs-blkid" RRECOMMENDS_${PN}_class-native = "" RRECOMMENDS_${PN}_class-nativesdk = "" RDEPENDS_${PN}_class-native = "" RDEPENDS_${PN}_class-nativesdk = "" -RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev" +RPROVIDES_${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev ${PN}-libuuid-dev" +RDEPENDS_${PN}-bash-completion += "${PN}-lsblk" +RDEPENDS_${PN}-ptest = "bash grep coreutils which btrfs-tools ${PN}" RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" ALLOW_EMPTY_${PN}-swaponoff = "1" @@ -128,17 +134,11 @@ SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable" SYSTEMD_SERVICE_${PN}-fstrim = "fstrim.timer fstrim.service" SYSTEMD_AUTO_ENABLE_${PN}-fstrim = "disable" -do_compile () { - set -e - oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}' -} - do_install () { # with ccache the timestamps on compiled files may # end up earlier than on their inputs, this allows # for the resultant compilation in the install step. - oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \ - 'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \ + oe_runmake 'CC=${CC}' 'LD=${LD}' \ 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install mkdir -p ${D}${base_bindir} @@ -192,38 +192,67 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" -ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" -ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" -ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" -ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" +ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" 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[dmesg] = "${base_bindir}/dmesg" ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate" +ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" ALTERNATIVE_LINK_NAME[flock] = "${bindir}/flock" +ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" +ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" +ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" +ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" +ALTERNATIVE_${PN}-agetty = "getty" +ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" +ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" ALTERNATIVE_LINK_NAME[hexdump] = "${bindir}/hexdump" +ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" +ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" +ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" 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[losetup] = "${base_sbindir}/losetup" ALTERNATIVE_LINK_NAME[mesg] = "${bindir}/mesg" +ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" +ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" +ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" +ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" +ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" ALTERNATIVE_LINK_NAME[nsenter] = "${bindir}/nsenter" +ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" +ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" ALTERNATIVE_LINK_NAME[renice] = "${bindir}/renice" ALTERNATIVE_LINK_NAME[rev] = "${bindir}/rev" +ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" ALTERNATIVE_LINK_NAME[setsid] = "${bindir}/setsid" +ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" +ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" +ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" +ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" +ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" ALTERNATIVE_LINK_NAME[taskset] = "${bindir}/taskset" +ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" +ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" 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" -ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 rfkill.8 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1" +ALTERNATIVE_${PN}-doc = "blkid.8 eject.1 findfs.8 fsck.8 kill.1 last.1 lastb.1 libblkid.3 logger.1 mesg.1 mountpoint.1 nologin.8 rfkill.8 sulogin.8 utmpdump.1 uuid.3 wall.1" ALTERNATIVE_${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" +ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8" +ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" +ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" +ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" +ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" +ALTERNATIVE_LINK_NAME[libblkid.3] = "${mandir}/man3/libblkid.3" +ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" @@ -231,67 +260,12 @@ ALTERNATIVE_LINK_NAME[rfkill.8] = "${mandir}/man8/rfkill.8" ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" -ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" -ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" -ALTERNATIVE_LINK_NAME[libblkid.3] = "${mandir}/man3/libblkid.3" -ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8" -ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" -ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3" -ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" -ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" - -ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" - -ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" - -ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" - -ALTERNATIVE_util-linux-agetty = "getty" -ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" -ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" - -ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" -ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" -ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" - -ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" - -ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" - -ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" -ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" - -ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" - -ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" - -ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" - -ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" - -ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" - -ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" - -ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" +ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" -ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" - -ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" BBCLASSEXTEND = "native nativesdk" -python populate_packages_prepend() { - do_split_packages(d, '${base_libdir}', r'^lib(.*)\.so\..*$', - output_pattern='util-linux-lib%s', - description='util-linux lib%s', - extra_depends='', prepend=True, allow_links=True) -} - -RDEPENDS_${PN}-bash-completion += "util-linux-lsblk" -RDEPENDS_${PN}-ptest = "bash grep coreutils which btrfs-tools ${PN}" - do_compile_ptest() { oe_runmake buildtest-TESTS } -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* Re: [PATCH v3 00/12] util-linux: one package per binary 2019-01-16 12:00 ` [PATCH v3 00/12] util-linux: one package per binary André Draszik ` (14 preceding siblings ...) 2019-01-16 12:00 ` [PATCH v3 15/15] utils-linux: final cleanup André Draszik @ 2019-01-16 12:02 ` André Draszik 15 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:02 UTC (permalink / raw) To: openembedded-core On Wed, 2019-01-16 at 12:00 +0000, André Draszik wrote: > v3: > * update 12/15 util-linux: simplify meta-package RDEPENDS / RRECOMMENDS > commit message > * replace patch > 06/15 update-alternatives: allow hooks before renaming files > with > 06/15 update-alternatives: convert file renames to > PACKAGE_PREPROCESS_FUNCS > * update follow-up patches 7 8 9 10 accordingly > > As per Richard's request / suggestion This also was rebased on top of current master-next to avoid merge conflicts due to 'meta: Fix Deprecated warnings from regexs' Cheers, Andre' ^ permalink raw reply [flat|nested] 103+ messages in thread
* [PATCH v4 00/12] util-linux: one package per binary 2019-01-14 12:56 [PATCH 00/12] RFC: util-linux: one package per binary André Draszik ` (13 preceding siblings ...) 2019-01-16 12:00 ` [PATCH v3 00/12] util-linux: one package per binary André Draszik @ 2019-01-16 12:51 ` André Draszik 2019-01-16 12:51 ` [PATCH v4 01/15] util-linux: simplify version upgrades (MAJOR_VERSION) André Draszik ` (16 more replies) 2019-02-04 10:05 ` [PATCH v5 00/11] " André Draszik 2019-02-05 2:32 ` [PATCH v6 00/13] util-linux: one package per binary André Draszik 16 siblings, 17 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:51 UTC (permalink / raw) To: openembedded-core v4: * update patch 06/15 * unconditionally assign PACKAGE_PREPROCESS_FUNCS * update patch 07/15 * introduce update_files() helper function Cheers, Andre' ^ permalink raw reply [flat|nested] 103+ messages in thread
* [PATCH v4 01/15] util-linux: simplify version upgrades (MAJOR_VERSION) 2019-01-16 12:51 ` [PATCH v4 " André Draszik @ 2019-01-16 12:51 ` André Draszik 2019-01-16 12:51 ` [PATCH v4 02/15] util-linux: remove erroneous patch (qsort_r) André Draszik ` (15 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:51 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> There doesn't appear to be a need to manually and explicitly specificy the major version (for the download URL), it can be deduced easily from PV. Do so. Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 3 ++- meta/recipes-core/util-linux/util-linux_2.32.1.bb | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index e514041a19..7bfec80508 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -24,7 +24,8 @@ DEPENDS = "zlib ncurses virtual/crypt" DEPENDS_append_class-native = " lzo-native" DEPENDS_append_class-nativesdk = " lzo-native" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ +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-agetty util-linux-blkdiscard util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ diff --git a/meta/recipes-core/util-linux/util-linux_2.32.1.bb b/meta/recipes-core/util-linux/util-linux_2.32.1.bb index c909836cbb..b0492afff3 100644 --- a/meta/recipes-core/util-linux/util-linux_2.32.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.32.1.bb @@ -1,4 +1,3 @@ -MAJOR_VERSION = "2.32" require util-linux.inc # To support older hosts, we need to patch and/or revert -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v4 02/15] util-linux: remove erroneous patch (qsort_r) 2019-01-16 12:51 ` [PATCH v4 " André Draszik 2019-01-16 12:51 ` [PATCH v4 01/15] util-linux: simplify version upgrades (MAJOR_VERSION) André Draszik @ 2019-01-16 12:51 ` André Draszik 2019-01-16 12:51 ` [PATCH v4 03/15] util-linux: remove minix remnants André Draszik ` (14 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:51 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> The patch in question is patching the code to use qsort() instead of qsort_r(), without adopting the compare function. This is a major issue, because the compare function as written is evaluating / accessing a third argument, which is not passed with this OE patch, causing access to random memory. Given this patch was added so as to support (old) linux (host) distros which might not provide qsort_r(), according to the git history, and given these days util-linux detects availability of qsort_r() during configure phase, and given musl builds (which doesn't provide qsort_r() either) work without problem, the right solution is to simply drop this invalid patch. Do so. Signed-off-by: André Draszik <andre.draszik@jci.com> --- .../util-linux/util-linux-native-qsort.patch | 33 ------------------- .../util-linux/util-linux_2.32.1.bb | 6 ---- 2 files changed, 39 deletions(-) delete mode 100644 meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch b/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch deleted file mode 100644 index 68bf22de8c..0000000000 --- a/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f220d809be1baa654503bf6ff52f3630b0d7015c Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Wed, 26 Mar 2014 01:30:29 +0000 -Subject: [PATCH] sun.c: use qsort() to instead of qsort_r() - -qsort_r() was added to glibc in version 2.8, so there is no qsort_r() on -the host like CentOS 5.x. - -Upstream-Status: Inappropriate [Other] - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - libfdisk/src/sun.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -Index: util-linux-2.24.2/libfdisk/src/sun.c -=================================================================== ---- util-linux-2.24.2.orig/libfdisk/src/sun.c -+++ util-linux-2.24.2/libfdisk/src/sun.c -@@ -431,10 +431,9 @@ static int sun_verify_disklabel(struct f - } - verify_sun_starts = starts; - -- qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]), -- (int (*)(const void *,const void *,void *)) verify_sun_cmp, -- verify_sun_starts); -- -+ qsort(array,ARRAY_SIZE(array),sizeof(array[0]), -+ (int (*)(const void *,const void *)) verify_sun_cmp); -+ - if (array[0] == -1) { - fdisk_info(cxt, _("No partitions defined.")); - return 0; diff --git a/meta/recipes-core/util-linux/util-linux_2.32.1.bb b/meta/recipes-core/util-linux/util-linux_2.32.1.bb index b0492afff3..0f860c221b 100644 --- a/meta/recipes-core/util-linux/util-linux_2.32.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.32.1.bb @@ -1,14 +1,8 @@ require util-linux.inc -# To support older hosts, we need to patch and/or revert -# some upstream changes. Only do this for native packages. -OLDHOST = "" -OLDHOST_class-native = "file://util-linux-native-qsort.patch" - SRC_URI += "file://configure-sbindir.patch \ file://runuser.pamd \ file://runuser-l.pamd \ - ${OLDHOST} \ file://ptest.patch \ file://run-ptest \ file://display_testname_for_subtest.patch \ -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v4 03/15] util-linux: remove minix remnants 2019-01-16 12:51 ` [PATCH v4 " André Draszik 2019-01-16 12:51 ` [PATCH v4 01/15] util-linux: simplify version upgrades (MAJOR_VERSION) André Draszik 2019-01-16 12:51 ` [PATCH v4 02/15] util-linux: remove erroneous patch (qsort_r) André Draszik @ 2019-01-16 12:51 ` André Draszik 2019-01-16 12:51 ` [PATCH v4 04/15] util-linux: be more explicit about what files go into packages André Draszik ` (13 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:51 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> While commit fc66762d7c11 ("util-linux: Disable minix support.") (or e88cee8cc31d in poky) removed most of the bits, there are still references to minix remaining. Remove them. Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 7bfec80508..406af58502 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -159,7 +159,7 @@ do_install () { mkdir -p ${D}${base_bindir} sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" - sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root nologin" + sbinprogs_a="pivot_root hwclock mkswap losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root nologin" binprogs_a="dmesg getopt kill more umount mount login su mountpoint" if [ "${base_sbindir}" != "${sbindir}" ]; then -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v4 04/15] util-linux: be more explicit about what files go into packages 2019-01-16 12:51 ` [PATCH v4 " André Draszik ` (2 preceding siblings ...) 2019-01-16 12:51 ` [PATCH v4 03/15] util-linux: remove minix remnants André Draszik @ 2019-01-16 12:51 ` André Draszik 2019-01-16 12:51 ` [PATCH v4 05/15] util-linux: fix the su and runuser packages André Draszik ` (12 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:51 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Just using a wildcard leaves the reader wondering what is meant here. By being explicit we can describe exactly what is intended, i.e. the file name as resulting from the ALTERNATIVE and ALTERNATIVE_LINK_NAME mechanism. Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 406af58502..e479fc24e1 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -88,7 +88,7 @@ FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidd = "${sbindir}/uuidd" -FILES_util-linux-rfkill = "${sbindir}/rfkill*" +FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" FILES_util-linux-partx = "${sbindir}/partx" FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" FILES_util-linux-findfs = "${sbindir}/findfs" @@ -105,20 +105,20 @@ FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so FILES_util-linux-lsblk = "${bindir}/lsblk" FILES_util-linux-lscpu = "${bindir}/lscpu" -FILES_util-linux-fsck = "${base_sbindir}/fsck*" +FILES_util-linux-fsck = "${base_sbindir}/fsck.${BPN}" FILES_util-linux-mkfs = "${sbindir}/mkfs" FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" -FILES_util-linux-sulogin = "${base_sbindir}/sulogin*" +FILES_util-linux-sulogin = "${base_sbindir}/sulogin.${BPN}" FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" FILES_util-linux-switch-root = "${base_sbindir}/switch_root.${BPN}" FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one -FILES_util-linux-blkid = "${base_sbindir}/blkid*" +FILES_util-linux-blkid = "${base_sbindir}/blkid.${BPN}" RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" RREPLACES_util-linux-blkid = "e2fsprogs-blkid" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v4 05/15] util-linux: fix the su and runuser packages 2019-01-16 12:51 ` [PATCH v4 " André Draszik ` (3 preceding siblings ...) 2019-01-16 12:51 ` [PATCH v4 04/15] util-linux: be more explicit about what files go into packages André Draszik @ 2019-01-16 12:51 ` André Draszik 2019-01-16 12:51 ` [PATCH v4 06/15] update-alternatives: convert file renames to PACKAGE_PREPROCESS_FUNCS André Draszik ` (11 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:51 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> The packages get an automatic RDEPENDS via shlibs, no need to explicitly state it, so we can drop those useless explicit assignments. su is moved into ${base_bindir} in do_install(), so because of a mismatched FILES specification su is actually packaged into the main package at the moment, not into the -su package as likely originally intended. runuser needs the pam configuration files, so they should be in the -runuser package, not in the main package. While fixing this, we can simplify the update alternatives processing for su. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index e479fc24e1..4a72e3d40e 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -96,7 +96,8 @@ FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" FILES_util-linux-runuser = "${sbindir}/runuser" FILES_util-linux-prlimit = "${bindir}/prlimit" FILES_util-linux-ionice = "${bindir}/ionice.${BPN}" -FILES_util-linux-su = "${bindir}/su.util-linux ${sysconfdir}/pam.d/su-l" +FILES_util-linux-runuser = "${sysconfdir}/pam.d/runuser*" +FILES_util-linux-su = "${base_bindir}/su.${BPN} ${sysconfdir}/pam.d/su-l" CONFFILES_util-linux-su = "${sysconfdir}/pam.d/su-l" FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ @@ -122,9 +123,6 @@ FILES_util-linux-blkid = "${base_sbindir}/blkid.${BPN}" RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" RREPLACES_util-linux-blkid = "e2fsprogs-blkid" -RDEPENDS_util-linux-runuser += "libpam" -RDEPENDS_util-linux-su += "libpam" - 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)}" @@ -228,6 +226,7 @@ ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 rfkill.8 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1" +ALTERNATIVE_${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" @@ -235,6 +234,7 @@ ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" ALTERNATIVE_LINK_NAME[rfkill.8] = "${mandir}/man8/rfkill.8" +ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" @@ -263,6 +263,9 @@ ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" ALTERNATIVE_util-linux-mount = "mount" ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" +ALTERNATIVE_${PN}-su = "su" +ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" + ALTERNATIVE_util-linux-umount = "umount" ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" @@ -305,15 +308,6 @@ ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" BBCLASSEXTEND = "native nativesdk" -python do_package_prepend () { - if '--enable-su' in d.getVar('EXTRA_OECONF').split(): - d.appendVar(d.expand('ALTERNATIVE_${PN}'), ' su') - d.appendVar(d.expand('ALTERNATIVE_${PN}-doc'), ' su.1') - - d.setVarFlag('ALTERNATIVE_LINK_NAME', "su", d.expand('${base_bindir}/su')) - d.setVarFlag('ALTERNATIVE_LINK_NAME', "su.1", d.expand('${mandir}/man1/su.1')) -} - python populate_packages_prepend() { do_split_packages(d, '${base_libdir}', r'^lib(.*)\.so\..*$', output_pattern='util-linux-lib%s', -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v4 06/15] update-alternatives: convert file renames to PACKAGE_PREPROCESS_FUNCS 2019-01-16 12:51 ` [PATCH v4 " André Draszik ` (4 preceding siblings ...) 2019-01-16 12:51 ` [PATCH v4 05/15] util-linux: fix the su and runuser packages André Draszik @ 2019-01-16 12:51 ` André Draszik 2019-01-16 12:51 ` [PATCH v4 07/15] update-alternatives: try to update FILES_${PN} when renaming a file André Draszik ` (10 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:51 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> At the moment, the update-alternatives file renaming is happening right after copying into PKGD during packaging time using an _append OVERRIDE to the copy function perform_packagecopy(). This is not really readable and hard to maintain. Additionally, this makes it impossible to e.g. populate PACKAGES dynamically using do_split_packages() and still do update-alternatives - update-alternatives file renaming requires the PACKAGES variable to have been fully populated to work correctly. On the other hand, do_split_packages() can only execute after perform_packagecopy(), as it needs PKGD populated; so it's impossible to insert do_split_packages() early enough in a deterministic way in this use-case. As there doesn't seem to be a reason not to, convert this to a proper function and use PACKAGE_PREPROCESS_FUNCS instead - after all, that's what this is meant for. No other classes or recipes in oe-core or meta-openembededd seem to have a hard requirement on update-alterantives executing before any other PACKAGE_PREPROCESS_FUNCS, so this should be perfectly fine. The only implication is that if compress_doc is inherited, compressed man-page file names will end up being, e.g. eject.1.util-linux.gz or eject.1.gz.util-linux based on the include of compress_doc.bbclass vs. update-alternatives.bbclass order, but the symlink created (alternative name) will always be correct. This solves both problems: * the code is easier to read / follow * the above described use-case can be accomodated easily [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v4: * unconditionally assign PACKAGE_PREPROCESS_FUNCS --- meta/classes/update-alternatives.bbclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index f1250f877b..f3c014a5fc 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass @@ -131,14 +131,13 @@ def gen_updatealternativesvars(d): populate_packages[vardeps] += "${UPDALTVARS} ${@gen_updatealternativesvars(d)}" # We need to do the rename after the image creation step, but before -# the split and strip steps.. packagecopy seems to be the earliest reasonable -# place. -python perform_packagecopy_append () { - if update_alternatives_enabled(d): - apply_update_alternative_renames(d) -} +# the split and strip steps.. PACKAGE_PREPROCESS_FUNCS is the right +# place for that. +PACKAGE_PREPROCESS_FUNCS += "apply_update_alternative_renames" +python apply_update_alternative_renames () { + if not update_alternatives_enabled(d): + return -def apply_update_alternative_renames(d): # Check for deprecated usage... pn = d.getVar('BPN') if d.getVar('ALTERNATIVE_LINKS') != None: @@ -204,6 +203,7 @@ def apply_update_alternative_renames(d): os.unlink(src) else: bb.warn('%s: Unable to resolve dangling symlink: %s' % (pn, alt_target)) +} PACKAGESPLITFUNCS_prepend = "populate_packages_updatealternatives " -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v4 07/15] update-alternatives: try to update FILES_${PN} when renaming a file 2019-01-16 12:51 ` [PATCH v4 " André Draszik ` (5 preceding siblings ...) 2019-01-16 12:51 ` [PATCH v4 06/15] update-alternatives: convert file renames to PACKAGE_PREPROCESS_FUNCS André Draszik @ 2019-01-16 12:51 ` André Draszik 2019-01-16 12:51 ` [PATCH v4 08/15] util-linux: one package per binary (pt 1: base_sbindir) André Draszik ` (9 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:51 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> When using update-alternatives, FILES_${PN} must be referencing the new name after update-alternatives has renamed files. This is more or less OK when having static lists of files to be packaged into a package, but makes it quite hard to dynamically generate FILES_${PN}, e.g. using do_split_packages(), as in that case we can not easily modify what goes into FILES_${PN}, because that list is based on filenames as seen at the time do_split_packages() is executing. Of couse one could explicitly specify the (renamed) file(s) in the recipe, but that contradicts the intended usage of do_split_packages(). Instead, if FILES_${PN} contains the file name as it was pre renaming, we here modify this to reflect the new name. This will allow usage of do_split_packages() to populate FILES_${PN}. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v4: * introduce update_files() helper function --- meta/classes/update-alternatives.bbclass | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index f3c014a5fc..e252651128 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass @@ -138,6 +138,14 @@ python apply_update_alternative_renames () { if not update_alternatives_enabled(d): return + from re import sub + + def update_files(alt_target, alt_target_rename, pkg, d): + f = d.getVar('FILES_' + pkg) + if f: + f = sub(r'(^|\s)%s(\s|$)' % alt_target, r'\1%s\2' % alt_target_rename, f) + d.setVar('FILES_' + pkg, f) + # Check for deprecated usage... pn = d.getVar('BPN') if d.getVar('ALTERNATIVE_LINKS') != None: @@ -177,6 +185,7 @@ python apply_update_alternative_renames () { else: bb.note('%s: Rename %s -> %s' % (pn, alt_target, alt_target_rename)) os.rename(src, dest) + update_files(alt_target, alt_target_rename, pkg, d) else: bb.warn("%s: alternative target (%s or %s) does not exist, skipping..." % (pn, alt_target, alt_target_rename)) continue @@ -203,6 +212,8 @@ python apply_update_alternative_renames () { os.unlink(src) else: bb.warn('%s: Unable to resolve dangling symlink: %s' % (pn, alt_target)) + continue + update_files(alt_target, alt_target_rename, pkg, d) } PACKAGESPLITFUNCS_prepend = "populate_packages_updatealternatives " -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v4 08/15] util-linux: one package per binary (pt 1: base_sbindir) 2019-01-16 12:51 ` [PATCH v4 " André Draszik ` (6 preceding siblings ...) 2019-01-16 12:51 ` [PATCH v4 07/15] update-alternatives: try to update FILES_${PN} when renaming a file André Draszik @ 2019-01-16 12:51 ` André Draszik 2019-01-16 12:51 ` [PATCH v4 09/15] util-linux: one package per binary (pt 2: base_bindir) André Draszik ` (8 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:51 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Now that we have required infrastructure in place, we can start creating one package per binary. To make this process easier to follow, this is done in steps, starting with binaries from base_sbindir. Existing packages (and current dependency by main package): * agetty * blkid * cfdisk <- RRECOMMENDS * fdisk <- RRECOMMENDS * fsck * fstrim * losetup <- RDEPENDS * hwclock * sulogin <- RDEPENDS * swaponoff <- RDEPENDS * switch-root <- RRECOMMENDS New packages: * blockdev * ctrlaltdel * mkswap * nologin * pivot-root * swapon * swapoff swaponoff is empty now and simply depends on swapon swapoff 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. Existing packages that aren't in RDEPENDS / RRECOMMENDS haven't been added to RRECOMMENDS for that reason. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v3: * convert to PACKAGE_PREPROCESS_FUNCS rather than using apply_update_alternative_renames_prepend v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use PN for package name prefix, not BPN --- meta/recipes-core/util-linux/util-linux.inc | 64 ++++++++++----------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 4a72e3d40e..a23fec69ea 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -28,19 +28,35 @@ 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-agetty util-linux-blkdiscard util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ - util-linux-swaponoff util-linux-losetup util-linux-umount \ +PACKAGES =+ "util-linux-blkdiscard util-linux-sfdisk \ + util-linux-swaponoff util-linux-umount \ util-linux-mount util-linux-readprofile util-linux-uuidd \ - util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs util-linux-fsck \ - util-linux-blkid util-linux-mkfs util-linux-mcookie util-linux-rfkill \ - util-linux-lsblk util-linux-mkfs.cramfs util-linux-fstrim \ - util-linux-partx util-linux-hwclock util-linux-mountpoint \ - util-linux-findfs util-linux-getopt util-linux-sulogin util-linux-prlimit \ - util-linux-ionice util-linux-switch-root util-linux-unshare" + util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs \ + util-linux-mkfs util-linux-mcookie util-linux-rfkill \ + util-linux-lsblk util-linux-mkfs.cramfs \ + util-linux-partx util-linux-mountpoint \ + util-linux-findfs util-linux-getopt util-linux-prlimit \ + util-linux-ionice util-linux-unshare" PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}" -PACKAGES_DYNAMIC = "^util-linux-lib.*" +python util_linux_binpackages () { + def pkg_hook(f, pkg, file_regex, output_pattern, modulename): + if d.getVar('ALTERNATIVE_' + pkg): + return + if d.getVarFlag('ALTERNATIVE_LINK_NAME', modulename): + d.setVar('ALTERNATIVE_' + pkg, modulename) + + do_split_packages(d, root='${base_sbindir}', + file_regex=r'(.*)', output_pattern='${PN}-%s', + description='${PN} %s', + hook=pkg_hook, extra_depends='', prepend=True) +} + +# we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS +PACKAGE_PREPROCESS_FUNCS =+ "util_linux_binpackages " + +PACKAGES_DYNAMIC = "^util-linux-.*" SHARED_EXTRA_OECONF = "--disable-use-tty-group \ --disable-makeinstall-chown \ @@ -74,14 +90,8 @@ FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" -FILES_util-linux-agetty = "${base_sbindir}/agetty" FILES_util-linux-blkdiscard = "${sbindir}/blkdiscard" -FILES_util-linux-fdisk = "${base_sbindir}/fdisk.${BPN}" -FILES_util-linux-fstrim = "${base_sbindir}/fstrim.${BPN}" -FILES_util-linux-cfdisk = "${base_sbindir}/cfdisk" FILES_util-linux-sfdisk = "${sbindir}/sfdisk" -FILES_util-linux-swaponoff = "${base_sbindir}/swapon.${BPN} ${base_sbindir}/swapoff.${BPN}" -FILES_util-linux-losetup = "${base_sbindir}/losetup.${BPN}" FILES_util-linux-mount = "${base_bindir}/mount.${BPN}" FILES_util-linux-mcookie = "${bindir}/mcookie" FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" @@ -90,7 +100,6 @@ FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidd = "${sbindir}/uuidd" FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" FILES_util-linux-partx = "${sbindir}/partx" -FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" FILES_util-linux-findfs = "${sbindir}/findfs" FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" FILES_util-linux-runuser = "${sbindir}/runuser" @@ -106,27 +115,24 @@ FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so FILES_util-linux-lsblk = "${bindir}/lsblk" FILES_util-linux-lscpu = "${bindir}/lscpu" -FILES_util-linux-fsck = "${base_sbindir}/fsck.${BPN}" FILES_util-linux-mkfs = "${sbindir}/mkfs" FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" -FILES_util-linux-sulogin = "${base_sbindir}/sulogin.${BPN}" FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" -FILES_util-linux-switch-root = "${base_sbindir}/switch_root.${BPN}" FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one -FILES_util-linux-blkid = "${base_sbindir}/blkid.${BPN}" 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} = "util-linux-blkdiscard util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint util-linux-prlimit util-linux-ionice util-linux-switch-root" +RRECOMMENDS_${PN} = "util-linux-blkdiscard util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint 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}_class-native = "" RRECOMMENDS_${PN}_class-nativesdk = "" @@ -135,6 +141,9 @@ RDEPENDS_${PN}_class-nativesdk = "" RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev" +RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" +ALLOW_EMPTY_${PN}-swaponoff = "1" + #SYSTEMD_PACKAGES = "${PN}-uuidd ${PN}-fstrim" SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.socket uuidd.service" SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable" @@ -206,9 +215,9 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = " \ - dmesg kill more mkswap blockdev pivot_root \ + dmesg kill more \ hexdump last lastb logger mesg renice wall \ - setsid chrt flock utmpdump eject nologin taskset fallocate \ + setsid chrt flock utmpdump eject taskset fallocate \ fsfreeze nsenter cal rev \ " @@ -247,13 +256,10 @@ ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3" ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" -ALTERNATIVE_util-linux-hwclock = "hwclock" ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" -ALTERNATIVE_util-linux-fdisk = "fdisk" ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" -ALTERNATIVE_util-linux-fstrim = "fstrim" ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" ALTERNATIVE_util-linux-agetty = "getty" @@ -272,17 +278,13 @@ ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" ALTERNATIVE_util-linux-readprofile = "readprofile" ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" -ALTERNATIVE_util-linux-losetup = "losetup" ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" -ALTERNATIVE_util-linux-swaponoff = "swapoff swapon" ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" -ALTERNATIVE_util-linux-fsck = "fsck" ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" -ALTERNATIVE_util-linux-blkid = "blkid" ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" ALTERNATIVE_util-linux-rfkill = "rfkill" @@ -291,7 +293,6 @@ ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" ALTERNATIVE_util-linux-getopt = "getopt" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" -ALTERNATIVE_util-linux-sulogin = "sulogin" ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" ALTERNATIVE_util-linux-mountpoint = "mountpoint" @@ -303,7 +304,6 @@ ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" ALTERNATIVE_util-linux-ionice = "ionice" ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" -ALTERNATIVE_util-linux-switch-root = "switch_root" ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" BBCLASSEXTEND = "native nativesdk" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v4 09/15] util-linux: one package per binary (pt 2: base_bindir) 2019-01-16 12:51 ` [PATCH v4 " André Draszik ` (7 preceding siblings ...) 2019-01-16 12:51 ` [PATCH v4 08/15] util-linux: one package per binary (pt 1: base_sbindir) André Draszik @ 2019-01-16 12:51 ` André Draszik 2019-01-16 12:51 ` [PATCH v4 10/15] util-linux: one package per binary (pt 3: sbindir) André Draszik ` (7 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:51 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Similar to the previous patch. Existing packages (and current dependency by main package): * mount <- RRECOMMENDS * umount <- RDEPENDS * mountpoint <- RRECOMMENDS * getopt * su <- RDEPENDS New packages: * dmesg * kill * more 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. Existing packages that aren't in RDEPENDS / RRECOMMENDS haven't been added to RRECOMMENDS for that reason. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v3: * convert to PACKAGE_PREPROCESS_FUNCS rather than using apply_update_alternative_renames_prepend v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use PN for package name prefix, not BPN --- meta/recipes-core/util-linux/util-linux.inc | 32 ++++++++------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index a23fec69ea..36a22cf6d7 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -29,16 +29,16 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz " PACKAGES =+ "util-linux-blkdiscard util-linux-sfdisk \ - util-linux-swaponoff util-linux-umount \ - util-linux-mount util-linux-readprofile util-linux-uuidd \ + util-linux-swaponoff \ + util-linux-readprofile util-linux-uuidd \ util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs \ util-linux-mkfs util-linux-mcookie util-linux-rfkill \ util-linux-lsblk util-linux-mkfs.cramfs \ - util-linux-partx util-linux-mountpoint \ - util-linux-findfs util-linux-getopt util-linux-prlimit \ + util-linux-partx \ + util-linux-findfs util-linux-prlimit \ util-linux-ionice util-linux-unshare" PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" -PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}" +PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}" python util_linux_binpackages () { def pkg_hook(f, pkg, file_regex, output_pattern, modulename): @@ -51,6 +51,10 @@ python util_linux_binpackages () { file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', hook=pkg_hook, extra_depends='', prepend=True) + do_split_packages(d, root='${base_bindir}', + file_regex=r'(.*)', output_pattern='${PN}-%s', + description='${PN} %s', + hook=pkg_hook, extra_depends='', prepend=True) } # we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS @@ -92,21 +96,18 @@ FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" FILES_util-linux-blkdiscard = "${sbindir}/blkdiscard" FILES_util-linux-sfdisk = "${sbindir}/sfdisk" -FILES_util-linux-mount = "${base_bindir}/mount.${BPN}" FILES_util-linux-mcookie = "${bindir}/mcookie" -FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidd = "${sbindir}/uuidd" FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" FILES_util-linux-partx = "${sbindir}/partx" FILES_util-linux-findfs = "${sbindir}/findfs" -FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" FILES_util-linux-runuser = "${sbindir}/runuser" 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 = "${base_bindir}/su.${BPN} ${sysconfdir}/pam.d/su-l" +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 \ @@ -120,8 +121,6 @@ FILES_util-linux-mkfs = "${sbindir}/mkfs" FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" -FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" - FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one @@ -131,8 +130,9 @@ 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-blkdiscard util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint util-linux-prlimit util-linux-ionice" +RRECOMMENDS_${PN} = "util-linux-blkdiscard util-linux-sfdisk util-linux-readprofile util-linux-mkfs 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" RRECOMMENDS_${PN}_class-native = "" RRECOMMENDS_${PN}_class-nativesdk = "" @@ -215,7 +215,6 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = " \ - dmesg kill more \ hexdump last lastb logger mesg renice wall \ setsid chrt flock utmpdump eject taskset fallocate \ fsfreeze nsenter cal rev \ @@ -266,13 +265,8 @@ ALTERNATIVE_util-linux-agetty = "getty" ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" -ALTERNATIVE_util-linux-mount = "mount" ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" - -ALTERNATIVE_${PN}-su = "su" ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" - -ALTERNATIVE_util-linux-umount = "umount" ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" ALTERNATIVE_util-linux-readprofile = "readprofile" @@ -290,12 +284,10 @@ ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" ALTERNATIVE_util-linux-rfkill = "rfkill" ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" -ALTERNATIVE_util-linux-getopt = "getopt" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" -ALTERNATIVE_util-linux-mountpoint = "mountpoint" ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" ALTERNATIVE_util-linux-unshare = "unshare" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v4 10/15] util-linux: one package per binary (pt 3: sbindir) 2019-01-16 12:51 ` [PATCH v4 " André Draszik ` (8 preceding siblings ...) 2019-01-16 12:51 ` [PATCH v4 09/15] util-linux: one package per binary (pt 2: base_bindir) André Draszik @ 2019-01-16 12:51 ` André Draszik 2019-01-16 12:51 ` [PATCH v4 11/15] util-linux: one package per binary (pt 4: bindir) André Draszik ` (6 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:51 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Similar to the previous patch. Existing packages (and current dependency by main package): * blkdiscard <- RRECOMMENDS * findfs * fsck.cramfs * mkfs <- RRECOMMENDS * mkfs.cramfs * partx * readprofile <- RRECOMMENDS * rfkill * runuser <- RDEPENDS * sfdisk <- RRECOMMENDS * uuidd 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. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v3: * convert to PACKAGE_PREPROCESS_FUNCS rather than using apply_update_alternative_renames_prepend v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use PN for package name prefix, not BPN --- meta/recipes-core/util-linux/util-linux.inc | 42 ++++++++------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 36a22cf6d7..bab66f788e 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -28,17 +28,13 @@ 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-blkdiscard util-linux-sfdisk \ - util-linux-swaponoff \ - util-linux-readprofile util-linux-uuidd \ - util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs \ - util-linux-mkfs util-linux-mcookie util-linux-rfkill \ - util-linux-lsblk util-linux-mkfs.cramfs \ - util-linux-partx \ - util-linux-findfs util-linux-prlimit \ +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 += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" -PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}" python util_linux_binpackages () { def pkg_hook(f, pkg, file_regex, output_pattern, modulename): @@ -47,6 +43,11 @@ python util_linux_binpackages () { 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', @@ -55,6 +56,10 @@ python util_linux_binpackages () { file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', hook=pkg_hook, extra_depends='', prepend=True) + 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) } # we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS @@ -94,16 +99,8 @@ FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" -FILES_util-linux-blkdiscard = "${sbindir}/blkdiscard" -FILES_util-linux-sfdisk = "${sbindir}/sfdisk" FILES_util-linux-mcookie = "${bindir}/mcookie" -FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" FILES_util-linux-uuidgen = "${bindir}/uuidgen" -FILES_util-linux-uuidd = "${sbindir}/uuidd" -FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" -FILES_util-linux-partx = "${sbindir}/partx" -FILES_util-linux-findfs = "${sbindir}/findfs" -FILES_util-linux-runuser = "${sbindir}/runuser" FILES_util-linux-prlimit = "${bindir}/prlimit" FILES_util-linux-ionice = "${bindir}/ionice.${BPN}" FILES_util-linux-runuser = "${sysconfdir}/pam.d/runuser*" @@ -116,11 +113,6 @@ FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so FILES_util-linux-lsblk = "${bindir}/lsblk" FILES_util-linux-lscpu = "${bindir}/lscpu" -FILES_util-linux-mkfs = "${sbindir}/mkfs" - -FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" -FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" - FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one @@ -130,7 +122,7 @@ 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-blkdiscard util-linux-sfdisk util-linux-readprofile util-linux-mkfs util-linux-prlimit util-linux-ionice" +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" @@ -217,7 +209,7 @@ ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = " \ hexdump last lastb logger mesg renice wall \ setsid chrt flock utmpdump eject taskset fallocate \ - fsfreeze nsenter cal rev \ + nsenter cal rev \ " ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" @@ -269,7 +261,6 @@ ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" -ALTERNATIVE_util-linux-readprofile = "readprofile" ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" @@ -281,7 +272,6 @@ ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" -ALTERNATIVE_util-linux-rfkill = "rfkill" ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v4 11/15] util-linux: one package per binary (pt 4: bindir) 2019-01-16 12:51 ` [PATCH v4 " André Draszik ` (9 preceding siblings ...) 2019-01-16 12:51 ` [PATCH v4 10/15] util-linux: one package per binary (pt 3: sbindir) André Draszik @ 2019-01-16 12:51 ` André Draszik 2019-01-16 12:51 ` [PATCH v4 12/15] util-linux: simplify meta-package RDEPENDS / RRECOMMENDS André Draszik ` (5 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:51 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> 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] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v3: * convert to PACKAGE_PREPROCESS_FUNCS rather than using apply_update_alternative_renames_prepend v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use PN for package name prefix, not BPN --- meta/recipes-core/util-linux/util-linux.inc | 45 ++++++++++----------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index bab66f788e..7e3887dc92 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -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 () { @@ -60,6 +55,10 @@ python util_linux_binpackages () { file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', hook=pkg_hook_with_recommends, 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) } # we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS @@ -99,21 +98,14 @@ 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_${PN}-last = "${bindir}/lastb" 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}" +FILES_${PN}-setarch = "${bindir}/linux32 ${bindir}/linux64 ${bindir}/uname26" # Util-linux' blkid replaces the e2fsprogs one RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" @@ -122,7 +114,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" @@ -206,12 +197,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" @@ -219,9 +204,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" @@ -280,10 +279,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" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v4 12/15] util-linux: simplify meta-package RDEPENDS / RRECOMMENDS 2019-01-16 12:51 ` [PATCH v4 " André Draszik ` (10 preceding siblings ...) 2019-01-16 12:51 ` [PATCH v4 11/15] util-linux: one package per binary (pt 4: bindir) André Draszik @ 2019-01-16 12:51 ` André Draszik 2019-01-16 12:51 ` [PATCH v4 13/15] util-linux: move /etc/default/mountall into -mount subpackage André Draszik ` (4 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:51 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@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.draszik@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 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v4 13/15] util-linux: move /etc/default/mountall into -mount subpackage 2019-01-16 12:51 ` [PATCH v4 " André Draszik ` (11 preceding siblings ...) 2019-01-16 12:51 ` [PATCH v4 12/15] util-linux: simplify meta-package RDEPENDS / RRECOMMENDS André Draszik @ 2019-01-16 12:51 ` André Draszik 2019-01-16 12:51 ` [PATCH v4 14/15] util-linux: let -ptest package depend on all of util-linux André Draszik ` (3 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:51 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> This should probably be there and now the main package is a real meta-package only. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 000db880a1..47264028f2 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -44,19 +44,19 @@ python util_linux_binpackages () { do_split_packages(d, root='${base_sbindir}', file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', - hook=pkg_hook, extra_depends='', prepend=True) + hook=pkg_hook, extra_depends='') do_split_packages(d, root='${base_bindir}', file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', - hook=pkg_hook, extra_depends='', prepend=True) + hook=pkg_hook, extra_depends='') do_split_packages(d, root='${sbindir}', file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', - hook=pkg_hook, extra_depends='', prepend=True) + hook=pkg_hook, extra_depends='') do_split_packages(d, root='${bindir}', file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', - hook=pkg_hook, extra_depends='', prepend=True) + hook=pkg_hook, extra_depends='') } # we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS @@ -92,11 +92,14 @@ PACKAGECONFIG[pylibmount] = "--with-python=3 --enable-pylibmount,--without-pytho # Readline support PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" +ALLOW_EMPTY_${PN} = "1" +FILES_${PN} = "" FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" FILES_${PN}-last = "${bindir}/lastb" +FILES_${PN}-mount = "${sysconfdir}/default/mountall" 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" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v4 14/15] util-linux: let -ptest package depend on all of util-linux 2019-01-16 12:51 ` [PATCH v4 " André Draszik ` (12 preceding siblings ...) 2019-01-16 12:51 ` [PATCH v4 13/15] util-linux: move /etc/default/mountall into -mount subpackage André Draszik @ 2019-01-16 12:51 ` André Draszik 2019-01-16 12:51 ` [PATCH v4 15/15] utils-linux: final cleanup André Draszik ` (2 subsequent siblings) 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:51 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> ptest executes all the binaries, so they really need to be available in the file system. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 47264028f2..458df5d047 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -290,7 +290,7 @@ python populate_packages_prepend() { } RDEPENDS_${PN}-bash-completion += "util-linux-lsblk" -RDEPENDS_${PN}-ptest = "bash grep coreutils which util-linux-blkid util-linux-fsck btrfs-tools" +RDEPENDS_${PN}-ptest = "bash grep coreutils which btrfs-tools ${PN}" do_compile_ptest() { oe_runmake buildtest-TESTS -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v4 15/15] utils-linux: final cleanup 2019-01-16 12:51 ` [PATCH v4 " André Draszik ` (13 preceding siblings ...) 2019-01-16 12:51 ` [PATCH v4 14/15] util-linux: let -ptest package depend on all of util-linux André Draszik @ 2019-01-16 12:51 ` André Draszik 2019-01-29 9:09 ` [PATCH v4 00/12] util-linux: one package per binary André Draszik 2019-02-01 7:32 ` Richard Purdie 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-16 12:51 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> * use ${PN} instead of util-linux * use PACKAGESPLITFUNCS for creating util-linux-lib* packages rather than an _append OVERRIDE * sort ALTERNATIVE_LINK_NAME alphabetically * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use systemd_system_unitdir instead of open-coding * inherit manpages so as to benefit from man-db processing (note that manpages are not generated here, we just want the automatic update of the package index caches * use EXTRA_OEMAKE instead of duplicating command line arguments [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v3: * use PACKAGESPLITFUNCS =+ rather than PACKAGESPLITFUNCS_prepend v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use systemd_system_unitdir instead of open-coding * inherit manpages * use EXTRA_OEMAKE instead of duplicating command line arguments * also sort ALTERNATIVE_LINK_NAME for man pages --- meta/recipes-core/util-linux/util-linux.inc | 156 ++++++++------------ 1 file changed, 65 insertions(+), 91 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 458df5d047..c5a8c4f41f 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=1715f5ee3e01203ca1e1e0b9ee65918c file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16" #gtk-doc is not enabled as it requires xmlto which requires util-linux -inherit autotools gettext pkgconfig systemd update-alternatives python3-dir bash-completion ptest +inherit autotools gettext manpages pkgconfig systemd update-alternatives python3-dir bash-completion ptest DEPENDS = "zlib ncurses virtual/crypt" DEPENDS_append_class-native = " lzo-native" DEPENDS_append_class-nativesdk = " lzo-native" @@ -28,8 +28,8 @@ 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" -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" +PACKAGES =+ "${PN}-swaponoff" +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', '${PN}-pylibmount', '', d)}" python util_linux_binpackages () { def pkg_hook(f, pkg, file_regex, output_pattern, modulename): @@ -62,7 +62,16 @@ python util_linux_binpackages () { # we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS PACKAGE_PREPROCESS_FUNCS =+ "util_linux_binpackages " -PACKAGES_DYNAMIC = "^util-linux-.*" +python util_linux_libpackages() { + do_split_packages(d, root='${base_libdir}', file_regex=r'^lib(.*)\.so\..*$', + output_pattern='${PN}-lib%s', + description='${PN} lib%s', + extra_depends='', prepend=True, allow_links=True) +} + +PACKAGESPLITFUNCS =+ "util_linux_libpackages" + +PACKAGES_DYNAMIC = "^${PN}-.*" SHARED_EXTRA_OECONF = "--disable-use-tty-group \ --disable-makeinstall-chown \ @@ -76,49 +85,46 @@ SHARED_EXTRA_OECONF = "--disable-use-tty-group \ " EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}" +EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'" PACKAGECONFIG_class-target ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," - # Respect the systemd feature for uuidd -PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/, --without-systemd --without-systemdsystemunitdir,systemd" - +PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-systemd --without-systemdsystemunitdir,systemd" # Build setpriv requires libcap-ng PACKAGECONFIG[libcap-ng] = "--enable-setpriv,--disable-setpriv,libcap-ng," - # Build python bindings for libmount PACKAGECONFIG[pylibmount] = "--with-python=3 --enable-pylibmount,--without-python --disable-pylibmount,python3" - # Readline support PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" ALLOW_EMPTY_${PN} = "1" FILES_${PN} = "" FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" - FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" - FILES_${PN}-last = "${bindir}/lastb" FILES_${PN}-mount = "${sysconfdir}/default/mountall" -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_${PN}-runuser = "${sysconfdir}/pam.d/runuser*" +FILES_${PN}-su = "${sysconfdir}/pam.d/su-l" +CONFFILES_${PN}-su = "${sysconfdir}/pam.d/su-l" +FILES_${PN}-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ + ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \ + ${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*" FILES_${PN}-setarch = "${bindir}/linux32 ${bindir}/linux64 ${bindir}/uname26" # Util-linux' blkid replaces the e2fsprogs one -RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" -RREPLACES_util-linux-blkid = "e2fsprogs-blkid" +RCONFLICTS_${PN}-blkid = "e2fsprogs-blkid" +RREPLACES_${PN}-blkid = "e2fsprogs-blkid" RRECOMMENDS_${PN}_class-native = "" RRECOMMENDS_${PN}_class-nativesdk = "" RDEPENDS_${PN}_class-native = "" RDEPENDS_${PN}_class-nativesdk = "" -RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev" +RPROVIDES_${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev ${PN}-libuuid-dev" +RDEPENDS_${PN}-bash-completion += "${PN}-lsblk" +RDEPENDS_${PN}-ptest = "bash grep coreutils which btrfs-tools ${PN}" RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" ALLOW_EMPTY_${PN}-swaponoff = "1" @@ -128,17 +134,11 @@ SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable" SYSTEMD_SERVICE_${PN}-fstrim = "fstrim.timer fstrim.service" SYSTEMD_AUTO_ENABLE_${PN}-fstrim = "disable" -do_compile () { - set -e - oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}' -} - do_install () { # with ccache the timestamps on compiled files may # end up earlier than on their inputs, this allows # for the resultant compilation in the install step. - oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \ - 'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \ + oe_runmake 'CC=${CC}' 'LD=${LD}' \ 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install mkdir -p ${D}${base_bindir} @@ -192,38 +192,67 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" -ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" -ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" -ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" -ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" +ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" 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[dmesg] = "${base_bindir}/dmesg" ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate" +ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" ALTERNATIVE_LINK_NAME[flock] = "${bindir}/flock" +ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" +ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" +ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" +ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" +ALTERNATIVE_${PN}-agetty = "getty" +ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" +ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" ALTERNATIVE_LINK_NAME[hexdump] = "${bindir}/hexdump" +ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" +ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" +ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" 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[losetup] = "${base_sbindir}/losetup" ALTERNATIVE_LINK_NAME[mesg] = "${bindir}/mesg" +ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" +ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" +ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" +ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" +ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" ALTERNATIVE_LINK_NAME[nsenter] = "${bindir}/nsenter" +ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" +ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" ALTERNATIVE_LINK_NAME[renice] = "${bindir}/renice" ALTERNATIVE_LINK_NAME[rev] = "${bindir}/rev" +ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" ALTERNATIVE_LINK_NAME[setsid] = "${bindir}/setsid" +ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" +ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" +ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" +ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" +ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" ALTERNATIVE_LINK_NAME[taskset] = "${bindir}/taskset" +ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" +ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" 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" -ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 rfkill.8 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1" +ALTERNATIVE_${PN}-doc = "blkid.8 eject.1 findfs.8 fsck.8 kill.1 last.1 lastb.1 libblkid.3 logger.1 mesg.1 mountpoint.1 nologin.8 rfkill.8 sulogin.8 utmpdump.1 uuid.3 wall.1" ALTERNATIVE_${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" +ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8" +ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" +ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" +ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" +ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" +ALTERNATIVE_LINK_NAME[libblkid.3] = "${mandir}/man3/libblkid.3" +ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" @@ -231,67 +260,12 @@ ALTERNATIVE_LINK_NAME[rfkill.8] = "${mandir}/man8/rfkill.8" ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" -ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" -ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" -ALTERNATIVE_LINK_NAME[libblkid.3] = "${mandir}/man3/libblkid.3" -ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8" -ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" -ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3" -ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" -ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" - -ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" - -ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" - -ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" - -ALTERNATIVE_util-linux-agetty = "getty" -ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" -ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" - -ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" -ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" -ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" - -ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" - -ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" - -ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" -ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" - -ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" - -ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" - -ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" - -ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" - -ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" - -ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" - -ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" +ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" -ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" - -ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" BBCLASSEXTEND = "native nativesdk" -python populate_packages_prepend() { - do_split_packages(d, '${base_libdir}', r'^lib(.*)\.so\..*$', - output_pattern='util-linux-lib%s', - description='util-linux lib%s', - extra_depends='', prepend=True, allow_links=True) -} - -RDEPENDS_${PN}-bash-completion += "util-linux-lsblk" -RDEPENDS_${PN}-ptest = "bash grep coreutils which btrfs-tools ${PN}" - do_compile_ptest() { oe_runmake buildtest-TESTS } -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* Re: [PATCH v4 00/12] util-linux: one package per binary 2019-01-16 12:51 ` [PATCH v4 " André Draszik ` (14 preceding siblings ...) 2019-01-16 12:51 ` [PATCH v4 15/15] utils-linux: final cleanup André Draszik @ 2019-01-29 9:09 ` André Draszik 2019-02-01 7:32 ` Richard Purdie 16 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-01-29 9:09 UTC (permalink / raw) To: openembedded-core ping On Wed, 2019-01-16 at 12:51 +0000, André Draszik wrote: > v4: > * update patch 06/15 > * unconditionally assign PACKAGE_PREPROCESS_FUNCS > * update patch 07/15 > * introduce update_files() helper function > > Cheers, > Andre' > > ^ permalink raw reply [flat|nested] 103+ messages in thread
* Re: [PATCH v4 00/12] util-linux: one package per binary 2019-01-16 12:51 ` [PATCH v4 " André Draszik ` (15 preceding siblings ...) 2019-01-29 9:09 ` [PATCH v4 00/12] util-linux: one package per binary André Draszik @ 2019-02-01 7:32 ` Richard Purdie 2019-02-02 10:02 ` André Draszik ` (2 more replies) 16 siblings, 3 replies; 103+ messages in thread From: Richard Purdie @ 2019-02-01 7:32 UTC (permalink / raw) To: André Draszik, openembedded-core On Wed, 2019-01-16 at 12:51 +0000, André Draszik wrote: > v4: > * update patch 06/15 > * unconditionally assign PACKAGE_PREPROCESS_FUNCS > * update patch 07/15 > * introduce update_files() helper function Ran this in -next but we saw things like: ERROR: util-linux-2.32.1-r0 do_package: QA Issue: util-linux: Files/directories were installed but not shipped in any package: /usr/bin/x86_64 /usr/bin/i386 Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install (from https://autobuilder.yoctoproject.org/typhoon/api/v2/logs/267662/raw ) qemuarm was similar: https://autobuilder.yoctoproject.org/typhoon/api/v2/logs/267853/raw so something isn't quite right :( I'll retry with a small subset of the series of patches until we figure this out. Cheers, Richard ^ permalink raw reply [flat|nested] 103+ messages in thread
* Re: [PATCH v4 00/12] util-linux: one package per binary 2019-02-01 7:32 ` Richard Purdie @ 2019-02-02 10:02 ` André Draszik 2019-02-04 10:09 ` André Draszik 2019-02-04 11:53 ` André Draszik 2 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-02 10:02 UTC (permalink / raw) To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 1105 bytes --] I think I know why, I'll post an update in a while. Andre On Fri, 1 Feb 2019, 08:32 Richard Purdie <richard.purdie@linuxfoundation.org wrote: > On Wed, 2019-01-16 at 12:51 +0000, André Draszik wrote: > > v4: > > * update patch 06/15 > > * unconditionally assign PACKAGE_PREPROCESS_FUNCS > > * update patch 07/15 > > * introduce update_files() helper function > > Ran this in -next but we saw things like: > > ERROR: util-linux-2.32.1-r0 do_package: QA Issue: util-linux: > Files/directories were installed but not shipped in any package: > /usr/bin/x86_64 > /usr/bin/i386 > Please set FILES such that these items are packaged. Alternatively if > they are unneeded, avoid installing them or delete them within > do_install > > (from > https://autobuilder.yoctoproject.org/typhoon/api/v2/logs/267662/raw > ) > qemuarm was similar: > https://autobuilder.yoctoproject.org/typhoon/api/v2/logs/267853/raw > > so something isn't quite right :( > > I'll retry with a small subset of the series of patches until we figure > this out. > > Cheers, > > Richard > > [-- Attachment #2: Type: text/html, Size: 1778 bytes --] ^ permalink raw reply [flat|nested] 103+ messages in thread
* Re: [PATCH v4 00/12] util-linux: one package per binary 2019-02-01 7:32 ` Richard Purdie 2019-02-02 10:02 ` André Draszik @ 2019-02-04 10:09 ` André Draszik 2019-02-04 11:53 ` André Draszik 2 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-04 10:09 UTC (permalink / raw) To: Richard Purdie, openembedded-core On Fri, 2019-02-01 at 07:32 +0000, Richard Purdie wrote: > On Wed, 2019-01-16 at 12:51 +0000, André Draszik wrote: > > v4: > > * update patch 06/15 > > * unconditionally assign PACKAGE_PREPROCESS_FUNCS > > * update patch 07/15 > > * introduce update_files() helper function > > Ran this in -next but we saw things like: > > ERROR: util-linux-2.32.1-r0 do_package: QA Issue: util-linux: > Files/directories were installed but not shipped in any package: > /usr/bin/x86_64 > /usr/bin/i386 > Please set FILES such that these items are packaged. Alternatively if > they are unneeded, avoid installing them or delete them within > do_install > > (from > https://autobuilder.yoctoproject.org/typhoon/api/v2/logs/267662/raw > ) > qemuarm was similar: > https://autobuilder.yoctoproject.org/typhoon/api/v2/logs/267853/raw > > so something isn't quite right :( > > I'll retry with a small subset of the series of patches until we figure > this out. Some of the binaries have symlinks. Originally, I've had a hard-coded list, but that only worked for Arm. I've now added patch 04/11 ("util-linux: one package per binary (pt 1b: symlinks") to deal with that more generically. Cheers, André ^ permalink raw reply [flat|nested] 103+ messages in thread
* Re: [PATCH v4 00/12] util-linux: one package per binary 2019-02-01 7:32 ` Richard Purdie 2019-02-02 10:02 ` André Draszik 2019-02-04 10:09 ` André Draszik @ 2019-02-04 11:53 ` André Draszik 2019-02-04 12:39 ` Richard Purdie 2 siblings, 1 reply; 103+ messages in thread From: André Draszik @ 2019-02-04 11:53 UTC (permalink / raw) To: Richard Purdie, openembedded-core Actually, On Fri, 2019-02-01 at 07:32 +0000, Richard Purdie wrote: > On Wed, 2019-01-16 at 12:51 +0000, André Draszik wrote: > > v4: > > * update patch 06/15 > > * unconditionally assign PACKAGE_PREPROCESS_FUNCS > > * update patch 07/15 > > * introduce update_files() helper function > > Ran this in -next but we saw things like: > > ERROR: util-linux-2.32.1-r0 do_package: QA Issue: util-linux: > Files/directories were installed but not shipped in any package: > /usr/bin/x86_64 > /usr/bin/i386 > Please set FILES such that these items are packaged. Alternatively if > they are unneeded, avoid installing them or delete them within > do_install > > (from > https://autobuilder.yoctoproject.org/typhoon/api/v2/logs/267662/raw > ) > qemuarm was similar: > https://autobuilder.yoctoproject.org/typhoon/api/v2/logs/267853/raw I didn't have access to these logs before - the 2nd log shows a failure in nativesdk. My v5 only addresses the failure for non-nativesdk builds. No need to try v5... Cheers, André ^ permalink raw reply [flat|nested] 103+ messages in thread
* Re: [PATCH v4 00/12] util-linux: one package per binary 2019-02-04 11:53 ` André Draszik @ 2019-02-04 12:39 ` Richard Purdie 0 siblings, 0 replies; 103+ messages in thread From: Richard Purdie @ 2019-02-04 12:39 UTC (permalink / raw) To: André Draszik, openembedded-core On Mon, 2019-02-04 at 11:53 +0000, André Draszik wrote: > Actually, > > On Fri, 2019-02-01 at 07:32 +0000, Richard Purdie wrote: > > On Wed, 2019-01-16 at 12:51 +0000, André Draszik wrote: > > > v4: > > > * update patch 06/15 > > > * unconditionally assign PACKAGE_PREPROCESS_FUNCS > > > * update patch 07/15 > > > * introduce update_files() helper function > > > > Ran this in -next but we saw things like: > > > > ERROR: util-linux-2.32.1-r0 do_package: QA Issue: util-linux: > > Files/directories were installed but not shipped in any package: > > /usr/bin/x86_64 > > /usr/bin/i386 > > Please set FILES such that these items are packaged. Alternatively > > if > > they are unneeded, avoid installing them or delete them within > > do_install > > > > (from > > https://autobuilder.yoctoproject.org/typhoon/api/v2/logs/267662/raw > > ) > > qemuarm was similar: > > https://autobuilder.yoctoproject.org/typhoon/api/v2/logs/267853/raw > > I didn't have access to these logs before - the 2nd log shows a > failure in > nativesdk. My v5 only addresses the failure for non-nativesdk builds. > > No need to try v5... Well, its actually in progress already: https://autobuilder.yoctoproject.org/typhoon/#/builders/85/builds/193 Cheers, Richard ^ permalink raw reply [flat|nested] 103+ messages in thread
* [PATCH v5 00/11] util-linux: one package per binary 2019-01-14 12:56 [PATCH 00/12] RFC: util-linux: one package per binary André Draszik ` (14 preceding siblings ...) 2019-01-16 12:51 ` [PATCH v4 " André Draszik @ 2019-02-04 10:05 ` André Draszik 2019-02-04 10:05 ` [PATCH v5 01/11] util-linux: be more explicit about what files go into packages André Draszik ` (10 more replies) 2019-02-05 2:32 ` [PATCH v6 00/13] util-linux: one package per binary André Draszik 16 siblings, 11 replies; 103+ messages in thread From: André Draszik @ 2019-02-04 10:05 UTC (permalink / raw) To: openembedded-core v5: * rebase against current master * introduce patch 04: "util-linux: one package per binary (pt 1b: symlinks)" This is to automatically package symlinks into the same package as the binary they're pointing to, without having to hard-code the list of symlinks in FILES_${PN}-xxx * update patches 03 05 06 07 "util-linux: one package per binary (pt xxx)" cosmetic changes * patch 11 fix subject line typo ^ permalink raw reply [flat|nested] 103+ messages in thread
* [PATCH v5 01/11] util-linux: be more explicit about what files go into packages 2019-02-04 10:05 ` [PATCH v5 00/11] " André Draszik @ 2019-02-04 10:05 ` André Draszik 2019-02-04 10:05 ` [PATCH v5 02/11] util-linux: fix the su and runuser packages André Draszik ` (9 subsequent siblings) 10 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-04 10:05 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Just using a wildcard leaves the reader wondering what is meant here. By being explicit we can describe exactly what is intended, i.e. the file name as resulting from the ALTERNATIVE and ALTERNATIVE_LINK_NAME mechanism. Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 406af58502..e479fc24e1 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -88,7 +88,7 @@ FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidd = "${sbindir}/uuidd" -FILES_util-linux-rfkill = "${sbindir}/rfkill*" +FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" FILES_util-linux-partx = "${sbindir}/partx" FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" FILES_util-linux-findfs = "${sbindir}/findfs" @@ -105,20 +105,20 @@ FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so FILES_util-linux-lsblk = "${bindir}/lsblk" FILES_util-linux-lscpu = "${bindir}/lscpu" -FILES_util-linux-fsck = "${base_sbindir}/fsck*" +FILES_util-linux-fsck = "${base_sbindir}/fsck.${BPN}" FILES_util-linux-mkfs = "${sbindir}/mkfs" FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" -FILES_util-linux-sulogin = "${base_sbindir}/sulogin*" +FILES_util-linux-sulogin = "${base_sbindir}/sulogin.${BPN}" FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" FILES_util-linux-switch-root = "${base_sbindir}/switch_root.${BPN}" FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one -FILES_util-linux-blkid = "${base_sbindir}/blkid*" +FILES_util-linux-blkid = "${base_sbindir}/blkid.${BPN}" RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" RREPLACES_util-linux-blkid = "e2fsprogs-blkid" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v5 02/11] util-linux: fix the su and runuser packages 2019-02-04 10:05 ` [PATCH v5 00/11] " André Draszik 2019-02-04 10:05 ` [PATCH v5 01/11] util-linux: be more explicit about what files go into packages André Draszik @ 2019-02-04 10:05 ` André Draszik 2019-02-04 10:05 ` [PATCH v5 03/11] util-linux: one package per binary (pt 1: base_sbindir) André Draszik ` (8 subsequent siblings) 10 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-04 10:05 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> The packages get an automatic RDEPENDS via shlibs, no need to explicitly state it, so we can drop those useless explicit assignments. su is moved into ${base_bindir} in do_install(), so because of a mismatched FILES specification su is actually packaged into the main package at the moment, not into the -su package as likely originally intended. runuser needs the pam configuration files, so they should be in the -runuser package, not in the main package. While fixing this, we can simplify the update alternatives processing for su. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index e479fc24e1..4a72e3d40e 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -96,7 +96,8 @@ FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" FILES_util-linux-runuser = "${sbindir}/runuser" FILES_util-linux-prlimit = "${bindir}/prlimit" FILES_util-linux-ionice = "${bindir}/ionice.${BPN}" -FILES_util-linux-su = "${bindir}/su.util-linux ${sysconfdir}/pam.d/su-l" +FILES_util-linux-runuser = "${sysconfdir}/pam.d/runuser*" +FILES_util-linux-su = "${base_bindir}/su.${BPN} ${sysconfdir}/pam.d/su-l" CONFFILES_util-linux-su = "${sysconfdir}/pam.d/su-l" FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ @@ -122,9 +123,6 @@ FILES_util-linux-blkid = "${base_sbindir}/blkid.${BPN}" RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" RREPLACES_util-linux-blkid = "e2fsprogs-blkid" -RDEPENDS_util-linux-runuser += "libpam" -RDEPENDS_util-linux-su += "libpam" - 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)}" @@ -228,6 +226,7 @@ ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 rfkill.8 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1" +ALTERNATIVE_${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" @@ -235,6 +234,7 @@ ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" ALTERNATIVE_LINK_NAME[rfkill.8] = "${mandir}/man8/rfkill.8" +ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" @@ -263,6 +263,9 @@ ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" ALTERNATIVE_util-linux-mount = "mount" ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" +ALTERNATIVE_${PN}-su = "su" +ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" + ALTERNATIVE_util-linux-umount = "umount" ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" @@ -305,15 +308,6 @@ ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" BBCLASSEXTEND = "native nativesdk" -python do_package_prepend () { - if '--enable-su' in d.getVar('EXTRA_OECONF').split(): - d.appendVar(d.expand('ALTERNATIVE_${PN}'), ' su') - d.appendVar(d.expand('ALTERNATIVE_${PN}-doc'), ' su.1') - - d.setVarFlag('ALTERNATIVE_LINK_NAME', "su", d.expand('${base_bindir}/su')) - d.setVarFlag('ALTERNATIVE_LINK_NAME', "su.1", d.expand('${mandir}/man1/su.1')) -} - python populate_packages_prepend() { do_split_packages(d, '${base_libdir}', r'^lib(.*)\.so\..*$', output_pattern='util-linux-lib%s', -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v5 03/11] util-linux: one package per binary (pt 1: base_sbindir) 2019-02-04 10:05 ` [PATCH v5 00/11] " André Draszik 2019-02-04 10:05 ` [PATCH v5 01/11] util-linux: be more explicit about what files go into packages André Draszik 2019-02-04 10:05 ` [PATCH v5 02/11] util-linux: fix the su and runuser packages André Draszik @ 2019-02-04 10:05 ` André Draszik 2019-02-04 10:05 ` [PATCH v5 04/11] util-linux: one package per binary (pt 1b: symlinks) André Draszik ` (7 subsequent siblings) 10 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-04 10:05 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Now that we have required infrastructure in place, we can start creating one package per binary. To make this process easier to follow, this is done in steps, starting with binaries from base_sbindir. Existing packages (and current dependency by main package): * agetty * blkid * cfdisk <- RRECOMMENDS * fdisk <- RRECOMMENDS * fsck * fstrim * losetup <- RDEPENDS * hwclock * sulogin <- RDEPENDS * swaponoff <- RDEPENDS * switch-root <- RRECOMMENDS New packages: * blockdev * ctrlaltdel * mkswap * nologin * pivot-root * swapon * swapoff swaponoff is empty now and simply depends on swapon swapoff 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. Existing packages that aren't in RDEPENDS / RRECOMMENDS haven't been added to RRECOMMENDS for that reason. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v5: * reduce duplication in util_linux_binpackages() using a for loop v3: * convert to PACKAGE_PREPROCESS_FUNCS rather than using apply_update_alternative_renames_prepend v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use PN for package name prefix, not BPN --- meta/recipes-core/util-linux/util-linux.inc | 65 +++++++++++---------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 4a72e3d40e..b8b3298239 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -28,19 +28,36 @@ 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-agetty util-linux-blkdiscard util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ - util-linux-swaponoff util-linux-losetup util-linux-umount \ +PACKAGES =+ "util-linux-blkdiscard util-linux-sfdisk \ + util-linux-swaponoff util-linux-umount \ util-linux-mount util-linux-readprofile util-linux-uuidd \ - util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs util-linux-fsck \ - util-linux-blkid util-linux-mkfs util-linux-mcookie util-linux-rfkill \ - util-linux-lsblk util-linux-mkfs.cramfs util-linux-fstrim \ - util-linux-partx util-linux-hwclock util-linux-mountpoint \ - util-linux-findfs util-linux-getopt util-linux-sulogin util-linux-prlimit \ - util-linux-ionice util-linux-switch-root util-linux-unshare" + util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs \ + util-linux-mkfs util-linux-mcookie util-linux-rfkill \ + util-linux-lsblk util-linux-mkfs.cramfs \ + util-linux-partx util-linux-mountpoint \ + util-linux-findfs util-linux-getopt util-linux-prlimit \ + util-linux-ionice util-linux-unshare" PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}" -PACKAGES_DYNAMIC = "^util-linux-lib.*" +python util_linux_binpackages () { + def pkg_hook(f, pkg, file_regex, output_pattern, modulename): + if d.getVar('ALTERNATIVE_' + pkg): + return + if d.getVarFlag('ALTERNATIVE_LINK_NAME', modulename): + d.setVar('ALTERNATIVE_' + pkg, modulename) + + for dir in [ '${base_sbindir}' ]: + do_split_packages(d, root=dir, + file_regex=r'(.*)', output_pattern='${PN}-%s', + description='${PN} %s', + hook=pkg_hook, extra_depends='', prepend=True) +} + +# we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS +PACKAGE_PREPROCESS_FUNCS =+ "util_linux_binpackages " + +PACKAGES_DYNAMIC = "^util-linux-.*" SHARED_EXTRA_OECONF = "--disable-use-tty-group \ --disable-makeinstall-chown \ @@ -74,14 +91,8 @@ FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" -FILES_util-linux-agetty = "${base_sbindir}/agetty" FILES_util-linux-blkdiscard = "${sbindir}/blkdiscard" -FILES_util-linux-fdisk = "${base_sbindir}/fdisk.${BPN}" -FILES_util-linux-fstrim = "${base_sbindir}/fstrim.${BPN}" -FILES_util-linux-cfdisk = "${base_sbindir}/cfdisk" FILES_util-linux-sfdisk = "${sbindir}/sfdisk" -FILES_util-linux-swaponoff = "${base_sbindir}/swapon.${BPN} ${base_sbindir}/swapoff.${BPN}" -FILES_util-linux-losetup = "${base_sbindir}/losetup.${BPN}" FILES_util-linux-mount = "${base_bindir}/mount.${BPN}" FILES_util-linux-mcookie = "${bindir}/mcookie" FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" @@ -90,7 +101,6 @@ FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidd = "${sbindir}/uuidd" FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" FILES_util-linux-partx = "${sbindir}/partx" -FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" FILES_util-linux-findfs = "${sbindir}/findfs" FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" FILES_util-linux-runuser = "${sbindir}/runuser" @@ -106,27 +116,24 @@ FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so FILES_util-linux-lsblk = "${bindir}/lsblk" FILES_util-linux-lscpu = "${bindir}/lscpu" -FILES_util-linux-fsck = "${base_sbindir}/fsck.${BPN}" FILES_util-linux-mkfs = "${sbindir}/mkfs" FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" -FILES_util-linux-sulogin = "${base_sbindir}/sulogin.${BPN}" FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" -FILES_util-linux-switch-root = "${base_sbindir}/switch_root.${BPN}" FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one -FILES_util-linux-blkid = "${base_sbindir}/blkid.${BPN}" 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} = "util-linux-blkdiscard util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint util-linux-prlimit util-linux-ionice util-linux-switch-root" +RRECOMMENDS_${PN} = "util-linux-blkdiscard util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint 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}_class-native = "" RRECOMMENDS_${PN}_class-nativesdk = "" @@ -135,6 +142,9 @@ RDEPENDS_${PN}_class-nativesdk = "" RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev" +RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" +ALLOW_EMPTY_${PN}-swaponoff = "1" + #SYSTEMD_PACKAGES = "${PN}-uuidd ${PN}-fstrim" SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.socket uuidd.service" SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable" @@ -206,9 +216,9 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = " \ - dmesg kill more mkswap blockdev pivot_root \ + dmesg kill more \ hexdump last lastb logger mesg renice wall \ - setsid chrt flock utmpdump eject nologin taskset fallocate \ + setsid chrt flock utmpdump eject taskset fallocate \ fsfreeze nsenter cal rev \ " @@ -247,13 +257,10 @@ ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3" ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" -ALTERNATIVE_util-linux-hwclock = "hwclock" ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" -ALTERNATIVE_util-linux-fdisk = "fdisk" ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" -ALTERNATIVE_util-linux-fstrim = "fstrim" ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" ALTERNATIVE_util-linux-agetty = "getty" @@ -272,17 +279,13 @@ ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" ALTERNATIVE_util-linux-readprofile = "readprofile" ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" -ALTERNATIVE_util-linux-losetup = "losetup" ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" -ALTERNATIVE_util-linux-swaponoff = "swapoff swapon" ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" -ALTERNATIVE_util-linux-fsck = "fsck" ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" -ALTERNATIVE_util-linux-blkid = "blkid" ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" ALTERNATIVE_util-linux-rfkill = "rfkill" @@ -291,7 +294,6 @@ ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" ALTERNATIVE_util-linux-getopt = "getopt" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" -ALTERNATIVE_util-linux-sulogin = "sulogin" ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" ALTERNATIVE_util-linux-mountpoint = "mountpoint" @@ -303,7 +305,6 @@ ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" ALTERNATIVE_util-linux-ionice = "ionice" ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" -ALTERNATIVE_util-linux-switch-root = "switch_root" ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" BBCLASSEXTEND = "native nativesdk" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v5 04/11] util-linux: one package per binary (pt 1b: symlinks) 2019-02-04 10:05 ` [PATCH v5 00/11] " André Draszik ` (2 preceding siblings ...) 2019-02-04 10:05 ` [PATCH v5 03/11] util-linux: one package per binary (pt 1: base_sbindir) André Draszik @ 2019-02-04 10:05 ` André Draszik 2019-02-04 10:05 ` [PATCH v5 05/11] util-linux: one package per binary (pt 2: base_bindir) André Draszik ` (6 subsequent siblings) 10 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-04 10:05 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Some of the binaries have symlinks. Add them to the package owning the binary they are pointing to. Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index b8b3298239..bc693a41b4 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -52,6 +52,28 @@ python util_linux_binpackages () { file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', hook=pkg_hook, 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}' ]: + root = d.expand(root) + for walkroot, dirs, files in os.walk(dvar + root): + for f in files: + file = os.path.join(walkroot, f) + if not os.path.islink(file): + continue + + pkg = os.path.basename(os.readlink(file)) + extras[pkg] = extras.get(pkg, '') + ' ' + file.replace(dvar, '', 1) + + pn = d.getVar('PN') + for pkg, links in extras.items(): + of = d.getVar('FILES_' + pn + '-' + pkg) + links = of + links + d.setVar('FILES_' + pn + '-' + pkg, links) } # we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v5 05/11] util-linux: one package per binary (pt 2: base_bindir) 2019-02-04 10:05 ` [PATCH v5 00/11] " André Draszik ` (3 preceding siblings ...) 2019-02-04 10:05 ` [PATCH v5 04/11] util-linux: one package per binary (pt 1b: symlinks) André Draszik @ 2019-02-04 10:05 ` André Draszik 2019-02-04 10:05 ` [PATCH v5 06/11] util-linux: one package per binary (pt 3: sbindir) André Draszik ` (5 subsequent siblings) 10 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-04 10:05 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Similar to the previous patch. Existing packages (and current dependency by main package): * mount <- RRECOMMENDS * umount <- RDEPENDS * mountpoint <- RRECOMMENDS * getopt * su <- RDEPENDS New packages: * dmesg * kill * more 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. Existing packages that aren't in RDEPENDS / RRECOMMENDS haven't been added to RRECOMMENDS for that reason. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v5: * reduce duplication in util_linux_binpackages() using a for loop v3: * convert to PACKAGE_PREPROCESS_FUNCS rather than using apply_update_alternative_renames_prepend v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use PN for package name prefix, not BPN --- meta/recipes-core/util-linux/util-linux.inc | 32 +++++++-------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index bc693a41b4..91ca050533 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -29,16 +29,16 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz " PACKAGES =+ "util-linux-blkdiscard util-linux-sfdisk \ - util-linux-swaponoff util-linux-umount \ - util-linux-mount util-linux-readprofile util-linux-uuidd \ + util-linux-swaponoff \ + util-linux-readprofile util-linux-uuidd \ util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs \ util-linux-mkfs util-linux-mcookie util-linux-rfkill \ util-linux-lsblk util-linux-mkfs.cramfs \ - util-linux-partx util-linux-mountpoint \ - util-linux-findfs util-linux-getopt util-linux-prlimit \ + util-linux-partx \ + util-linux-findfs util-linux-prlimit \ util-linux-ionice util-linux-unshare" PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" -PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}" +PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}" python util_linux_binpackages () { def pkg_hook(f, pkg, file_regex, output_pattern, modulename): @@ -47,7 +47,7 @@ python util_linux_binpackages () { if d.getVarFlag('ALTERNATIVE_LINK_NAME', modulename): d.setVar('ALTERNATIVE_' + pkg, modulename) - for dir in [ '${base_sbindir}' ]: + for dir in [ '${base_sbindir}', '${base_bindir}' ]: do_split_packages(d, root=dir, file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', @@ -58,7 +58,7 @@ python util_linux_binpackages () { # pointing to extras = {} dvar = d.getVar('PKGD') - for root in [ '${base_sbindir}' ]: + for root in [ '${base_sbindir}', '${base_bindir}' ]: root = d.expand(root) for walkroot, dirs, files in os.walk(dvar + root): for f in files: @@ -115,21 +115,18 @@ FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" FILES_util-linux-blkdiscard = "${sbindir}/blkdiscard" FILES_util-linux-sfdisk = "${sbindir}/sfdisk" -FILES_util-linux-mount = "${base_bindir}/mount.${BPN}" FILES_util-linux-mcookie = "${bindir}/mcookie" -FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidd = "${sbindir}/uuidd" FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" FILES_util-linux-partx = "${sbindir}/partx" FILES_util-linux-findfs = "${sbindir}/findfs" -FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" FILES_util-linux-runuser = "${sbindir}/runuser" 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 = "${base_bindir}/su.${BPN} ${sysconfdir}/pam.d/su-l" +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 \ @@ -143,8 +140,6 @@ FILES_util-linux-mkfs = "${sbindir}/mkfs" FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" -FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" - FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one @@ -154,8 +149,9 @@ 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-blkdiscard util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint util-linux-prlimit util-linux-ionice" +RRECOMMENDS_${PN} = "util-linux-blkdiscard util-linux-sfdisk util-linux-readprofile util-linux-mkfs 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" RRECOMMENDS_${PN}_class-native = "" RRECOMMENDS_${PN}_class-nativesdk = "" @@ -238,7 +234,6 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = " \ - dmesg kill more \ hexdump last lastb logger mesg renice wall \ setsid chrt flock utmpdump eject taskset fallocate \ fsfreeze nsenter cal rev \ @@ -289,13 +284,8 @@ ALTERNATIVE_util-linux-agetty = "getty" ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" -ALTERNATIVE_util-linux-mount = "mount" ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" - -ALTERNATIVE_${PN}-su = "su" ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" - -ALTERNATIVE_util-linux-umount = "umount" ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" ALTERNATIVE_util-linux-readprofile = "readprofile" @@ -313,12 +303,10 @@ ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" ALTERNATIVE_util-linux-rfkill = "rfkill" ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" -ALTERNATIVE_util-linux-getopt = "getopt" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" -ALTERNATIVE_util-linux-mountpoint = "mountpoint" ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" ALTERNATIVE_util-linux-unshare = "unshare" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v5 06/11] util-linux: one package per binary (pt 3: sbindir) 2019-02-04 10:05 ` [PATCH v5 00/11] " André Draszik ` (4 preceding siblings ...) 2019-02-04 10:05 ` [PATCH v5 05/11] util-linux: one package per binary (pt 2: base_bindir) André Draszik @ 2019-02-04 10:05 ` André Draszik 2019-02-04 10:05 ` [PATCH v5 07/11] util-linux: one package per binary (pt 4: bindir) André Draszik ` (4 subsequent siblings) 10 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-04 10:05 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Similar to the previous patch. Existing packages (and current dependency by main package): * blkdiscard <- RRECOMMENDS * findfs * fsck.cramfs * mkfs <- RRECOMMENDS * mkfs.cramfs * partx * readprofile <- RRECOMMENDS * rfkill * runuser <- RDEPENDS * sfdisk <- RRECOMMENDS * uuidd 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. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v5: * reduce duplication in util_linux_binpackages() using a for loop v3: * convert to PACKAGE_PREPROCESS_FUNCS rather than using apply_update_alternative_renames_prepend v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use PN for package name prefix, not BPN --- meta/recipes-core/util-linux/util-linux.inc | 46 +++++++++------------ 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 91ca050533..311ce86f39 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -28,17 +28,13 @@ 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-blkdiscard util-linux-sfdisk \ - util-linux-swaponoff \ - util-linux-readprofile util-linux-uuidd \ - util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs \ - util-linux-mkfs util-linux-mcookie util-linux-rfkill \ - util-linux-lsblk util-linux-mkfs.cramfs \ - util-linux-partx \ - util-linux-findfs util-linux-prlimit \ +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 += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" -PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}" python util_linux_binpackages () { def pkg_hook(f, pkg, file_regex, output_pattern, modulename): @@ -47,18 +43,29 @@ python util_linux_binpackages () { 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}' ]: 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}' ]: + 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}' ]: + for root in [ '${base_sbindir}', '${base_bindir}', '${sbindir}' ]: root = d.expand(root) for walkroot, dirs, files in os.walk(dvar + root): for f in files: @@ -113,16 +120,8 @@ FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" -FILES_util-linux-blkdiscard = "${sbindir}/blkdiscard" -FILES_util-linux-sfdisk = "${sbindir}/sfdisk" FILES_util-linux-mcookie = "${bindir}/mcookie" -FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" FILES_util-linux-uuidgen = "${bindir}/uuidgen" -FILES_util-linux-uuidd = "${sbindir}/uuidd" -FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" -FILES_util-linux-partx = "${sbindir}/partx" -FILES_util-linux-findfs = "${sbindir}/findfs" -FILES_util-linux-runuser = "${sbindir}/runuser" FILES_util-linux-prlimit = "${bindir}/prlimit" FILES_util-linux-ionice = "${bindir}/ionice.${BPN}" FILES_util-linux-runuser = "${sysconfdir}/pam.d/runuser*" @@ -135,11 +134,6 @@ FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so FILES_util-linux-lsblk = "${bindir}/lsblk" FILES_util-linux-lscpu = "${bindir}/lscpu" -FILES_util-linux-mkfs = "${sbindir}/mkfs" - -FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" -FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" - FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one @@ -149,7 +143,7 @@ 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-blkdiscard util-linux-sfdisk util-linux-readprofile util-linux-mkfs util-linux-prlimit util-linux-ionice" +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" @@ -236,7 +230,7 @@ ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = " \ hexdump last lastb logger mesg renice wall \ setsid chrt flock utmpdump eject taskset fallocate \ - fsfreeze nsenter cal rev \ + nsenter cal rev \ " ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" @@ -288,7 +282,6 @@ ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" -ALTERNATIVE_util-linux-readprofile = "readprofile" ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" @@ -300,7 +293,6 @@ ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" -ALTERNATIVE_util-linux-rfkill = "rfkill" ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v5 07/11] util-linux: one package per binary (pt 4: bindir) 2019-02-04 10:05 ` [PATCH v5 00/11] " André Draszik ` (5 preceding siblings ...) 2019-02-04 10:05 ` [PATCH v5 06/11] util-linux: one package per binary (pt 3: sbindir) André Draszik @ 2019-02-04 10:05 ` André Draszik 2019-02-04 10:05 ` [PATCH v5 08/11] util-linux: simplify meta-package RDEPENDS / RRECOMMENDS André Draszik ` (3 subsequent siblings) 10 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-04 10:05 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> 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] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v5: * reduce duplication in util_linux_binpackages() using a for loop v3: * convert to PACKAGE_PREPROCESS_FUNCS rather than using apply_update_alternative_renames_prepend v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use PN for package name prefix, not BPN --- meta/recipes-core/util-linux/util-linux.inc | 43 ++++++++------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 311ce86f39..cd1450f2c7 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -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: @@ -120,21 +115,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" @@ -143,7 +129,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" @@ -227,12 +212,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" @@ -240,9 +219,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" @@ -301,10 +294,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" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v5 08/11] util-linux: simplify meta-package RDEPENDS / RRECOMMENDS 2019-02-04 10:05 ` [PATCH v5 00/11] " André Draszik ` (6 preceding siblings ...) 2019-02-04 10:05 ` [PATCH v5 07/11] util-linux: one package per binary (pt 4: bindir) André Draszik @ 2019-02-04 10:05 ` André Draszik 2019-02-04 10:05 ` [PATCH v5 09/11] util-linux: move /etc/default/mountall into -mount subpackage André Draszik ` (2 subsequent siblings) 10 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-04 10:05 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@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.draszik@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 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v5 09/11] util-linux: move /etc/default/mountall into -mount subpackage 2019-02-04 10:05 ` [PATCH v5 00/11] " André Draszik ` (7 preceding siblings ...) 2019-02-04 10:05 ` [PATCH v5 08/11] util-linux: simplify meta-package RDEPENDS / RRECOMMENDS André Draszik @ 2019-02-04 10:05 ` André Draszik 2019-02-04 10:05 ` [PATCH v5 10/11] util-linux: let -ptest package depend on all of util-linux André Draszik 2019-02-04 10:05 ` [PATCH v5 11/11] util-linux: final cleanup André Draszik 10 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-04 10:05 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> This should probably be there and now the main package is a real meta-package only. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 2577d0b1ae..49f6ad3f16 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -46,7 +46,7 @@ python util_linux_binpackages () { do_split_packages(d, root=dir, file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', - hook=pkg_hook, extra_depends='', prepend=True) + hook=pkg_hook, extra_depends='') # There are some symlinks for some binaries which we have ignored # above. Add them to the package owning the binary they are @@ -104,10 +104,13 @@ PACKAGECONFIG[pylibmount] = "--with-python=3 --enable-pylibmount,--without-pytho # Readline support PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" +ALLOW_EMPTY_${PN} = "1" +FILES_${PN} = "" FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" +FILES_${PN}-mount = "${sysconfdir}/default/mountall" 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" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v5 10/11] util-linux: let -ptest package depend on all of util-linux 2019-02-04 10:05 ` [PATCH v5 00/11] " André Draszik ` (8 preceding siblings ...) 2019-02-04 10:05 ` [PATCH v5 09/11] util-linux: move /etc/default/mountall into -mount subpackage André Draszik @ 2019-02-04 10:05 ` André Draszik 2019-02-04 10:05 ` [PATCH v5 11/11] util-linux: final cleanup André Draszik 10 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-04 10:05 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> ptest executes all the binaries, so they really need to be available in the file system. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 49f6ad3f16..78a4d6151c 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -300,7 +300,7 @@ python populate_packages_prepend() { } RDEPENDS_${PN}-bash-completion += "util-linux-lsblk" -RDEPENDS_${PN}-ptest = "bash grep coreutils which util-linux-blkid util-linux-fsck btrfs-tools" +RDEPENDS_${PN}-ptest = "bash grep coreutils which btrfs-tools ${PN}" do_compile_ptest() { oe_runmake buildtest-TESTS -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v5 11/11] util-linux: final cleanup 2019-02-04 10:05 ` [PATCH v5 00/11] " André Draszik ` (9 preceding siblings ...) 2019-02-04 10:05 ` [PATCH v5 10/11] util-linux: let -ptest package depend on all of util-linux André Draszik @ 2019-02-04 10:05 ` André Draszik 10 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-04 10:05 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> * use ${PN} instead of util-linux * use PACKAGESPLITFUNCS for creating util-linux-lib* packages rather than an _append OVERRIDE * sort ALTERNATIVE_LINK_NAME alphabetically * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use systemd_system_unitdir instead of open-coding * inherit manpages so as to benefit from man-db processing (note that manpages are not generated here, we just want the automatic update of the package index caches * use EXTRA_OEMAKE instead of duplicating command line arguments [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v5: * fix subject line typo v3: * use PACKAGESPLITFUNCS =+ rather than PACKAGESPLITFUNCS_prepend v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use systemd_system_unitdir instead of open-coding * inherit manpages * use EXTRA_OEMAKE instead of duplicating command line arguments * also sort ALTERNATIVE_LINK_NAME for man pages --- meta/recipes-core/util-linux/util-linux.inc | 156 ++++++++------------ 1 file changed, 65 insertions(+), 91 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 78a4d6151c..c122b04865 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=1715f5ee3e01203ca1e1e0b9ee65918c file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16" #gtk-doc is not enabled as it requires xmlto which requires util-linux -inherit autotools gettext pkgconfig systemd update-alternatives python3-dir bash-completion ptest +inherit autotools gettext manpages pkgconfig systemd update-alternatives python3-dir bash-completion ptest DEPENDS = "zlib ncurses virtual/crypt" DEPENDS_append_class-native = " lzo-native" DEPENDS_append_class-nativesdk = " lzo-native" @@ -28,8 +28,8 @@ 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" -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" +PACKAGES =+ "${PN}-swaponoff" +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', '${PN}-pylibmount', '', d)}" python util_linux_binpackages () { def pkg_hook(f, pkg, file_regex, output_pattern, modulename): @@ -74,7 +74,16 @@ python util_linux_binpackages () { # we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS PACKAGE_PREPROCESS_FUNCS =+ "util_linux_binpackages " -PACKAGES_DYNAMIC = "^util-linux-.*" +python util_linux_libpackages() { + do_split_packages(d, root='${base_libdir}', file_regex=r'^lib(.*)\.so\..*$', + output_pattern='${PN}-lib%s', + description='${PN} lib%s', + extra_depends='', prepend=True, allow_links=True) +} + +PACKAGESPLITFUNCS =+ "util_linux_libpackages" + +PACKAGES_DYNAMIC = "^${PN}-.*" SHARED_EXTRA_OECONF = "--disable-use-tty-group \ --disable-makeinstall-chown \ @@ -88,47 +97,44 @@ SHARED_EXTRA_OECONF = "--disable-use-tty-group \ " EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}" +EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'" PACKAGECONFIG_class-target ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," - # Respect the systemd feature for uuidd -PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/, --without-systemd --without-systemdsystemunitdir,systemd" - +PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-systemd --without-systemdsystemunitdir,systemd" # Build setpriv requires libcap-ng PACKAGECONFIG[libcap-ng] = "--enable-setpriv,--disable-setpriv,libcap-ng," - # Build python bindings for libmount PACKAGECONFIG[pylibmount] = "--with-python=3 --enable-pylibmount,--without-python --disable-pylibmount,python3" - # Readline support PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" ALLOW_EMPTY_${PN} = "1" FILES_${PN} = "" FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" - FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" - FILES_${PN}-mount = "${sysconfdir}/default/mountall" -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_${PN}-runuser = "${sysconfdir}/pam.d/runuser*" +FILES_${PN}-su = "${sysconfdir}/pam.d/su-l" +CONFFILES_${PN}-su = "${sysconfdir}/pam.d/su-l" +FILES_${PN}-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ + ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \ + ${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*" # Util-linux' blkid replaces the e2fsprogs one -RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" -RREPLACES_util-linux-blkid = "e2fsprogs-blkid" +RCONFLICTS_${PN}-blkid = "e2fsprogs-blkid" +RREPLACES_${PN}-blkid = "e2fsprogs-blkid" RRECOMMENDS_${PN}_class-native = "" RRECOMMENDS_${PN}_class-nativesdk = "" RDEPENDS_${PN}_class-native = "" RDEPENDS_${PN}_class-nativesdk = "" -RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev" +RPROVIDES_${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev ${PN}-libuuid-dev" +RDEPENDS_${PN}-bash-completion += "${PN}-lsblk" +RDEPENDS_${PN}-ptest = "bash grep coreutils which btrfs-tools ${PN}" RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" ALLOW_EMPTY_${PN}-swaponoff = "1" @@ -138,17 +144,11 @@ SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable" SYSTEMD_SERVICE_${PN}-fstrim = "fstrim.timer fstrim.service" SYSTEMD_AUTO_ENABLE_${PN}-fstrim = "disable" -do_compile () { - set -e - oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}' -} - do_install () { # with ccache the timestamps on compiled files may # end up earlier than on their inputs, this allows # for the resultant compilation in the install step. - oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \ - 'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \ + oe_runmake 'CC=${CC}' 'LD=${LD}' \ 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install mkdir -p ${D}${base_bindir} @@ -202,38 +202,67 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" -ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" -ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" -ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" -ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" +ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" 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[dmesg] = "${base_bindir}/dmesg" ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate" +ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" ALTERNATIVE_LINK_NAME[flock] = "${bindir}/flock" +ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" +ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" +ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" +ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" +ALTERNATIVE_${PN}-agetty = "getty" +ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" +ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" ALTERNATIVE_LINK_NAME[hexdump] = "${bindir}/hexdump" +ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" +ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" +ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" 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[losetup] = "${base_sbindir}/losetup" ALTERNATIVE_LINK_NAME[mesg] = "${bindir}/mesg" +ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" +ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" +ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" +ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" +ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" ALTERNATIVE_LINK_NAME[nsenter] = "${bindir}/nsenter" +ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" +ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" ALTERNATIVE_LINK_NAME[renice] = "${bindir}/renice" ALTERNATIVE_LINK_NAME[rev] = "${bindir}/rev" +ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" ALTERNATIVE_LINK_NAME[setsid] = "${bindir}/setsid" +ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" +ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" +ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" +ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" +ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" ALTERNATIVE_LINK_NAME[taskset] = "${bindir}/taskset" +ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" +ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" 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" -ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 rfkill.8 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1" +ALTERNATIVE_${PN}-doc = "blkid.8 eject.1 findfs.8 fsck.8 kill.1 last.1 lastb.1 libblkid.3 logger.1 mesg.1 mountpoint.1 nologin.8 rfkill.8 sulogin.8 utmpdump.1 uuid.3 wall.1" ALTERNATIVE_${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" +ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8" +ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" +ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" +ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" +ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" +ALTERNATIVE_LINK_NAME[libblkid.3] = "${mandir}/man3/libblkid.3" +ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" @@ -241,67 +270,12 @@ ALTERNATIVE_LINK_NAME[rfkill.8] = "${mandir}/man8/rfkill.8" ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" -ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" -ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" -ALTERNATIVE_LINK_NAME[libblkid.3] = "${mandir}/man3/libblkid.3" -ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8" -ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" -ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3" -ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" -ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" - -ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" - -ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" - -ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" - -ALTERNATIVE_util-linux-agetty = "getty" -ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" -ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" - -ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" -ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" -ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" - -ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" - -ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" - -ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" -ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" - -ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" - -ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" - -ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" - -ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" - -ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" - -ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" - -ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" +ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" -ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" - -ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" BBCLASSEXTEND = "native nativesdk" -python populate_packages_prepend() { - do_split_packages(d, '${base_libdir}', r'^lib(.*)\.so\..*$', - output_pattern='util-linux-lib%s', - description='util-linux lib%s', - extra_depends='', prepend=True, allow_links=True) -} - -RDEPENDS_${PN}-bash-completion += "util-linux-lsblk" -RDEPENDS_${PN}-ptest = "bash grep coreutils which btrfs-tools ${PN}" - do_compile_ptest() { oe_runmake buildtest-TESTS } -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v6 00/13] util-linux: one package per binary 2019-01-14 12:56 [PATCH 00/12] RFC: util-linux: one package per binary André Draszik ` (15 preceding siblings ...) 2019-02-04 10:05 ` [PATCH v5 00/11] " André Draszik @ 2019-02-05 2:32 ` André Draszik 2019-02-05 2:32 ` [PATCH v6 01/13] update-alternatives: correctly escape PATHs when updating FILES_${PN} André Draszik ` (14 more replies) 16 siblings, 15 replies; 103+ messages in thread From: André Draszik @ 2019-02-05 2:32 UTC (permalink / raw) To: openembedded-core v6: This version now also builds nativesdk-util-linux fine for me. * introduce patch 04: util-linux: fix packaging nativesdk-util-linux-lib* - this is to fix nativesdk build failures triggered by later patches * update patch 10: util-linux: simplify meta-package RDEPENDS / RRECOMMENDS - make sure to walk each bindir only once, to better support nativesdk and usrmerge builds * update patch 13: util-linux: final cleanup - commit message updated Cheers, André ^ permalink raw reply [flat|nested] 103+ messages in thread
* [PATCH v6 01/13] update-alternatives: correctly escape PATHs when updating FILES_${PN} 2019-02-05 2:32 ` [PATCH v6 00/13] util-linux: one package per binary André Draszik @ 2019-02-05 2:32 ` André Draszik 2019-02-05 2:32 ` [PATCH v6 02/13] util-linux: be more explicit about what files go into packages André Draszik ` (13 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-05 2:32 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> The recently added support for updating FILES based on the file renames that are happening here is using a regex replace, but failed to properly escape the search pattern (the full path). This manifests itself in FILES not being updated as soon as the full path contains any character that has a special meaning, e.g. '+'. In other words an original path (alt_target in the code) like /opt/poky/2.6+snapshot/sysroots/i686-pokysdk-linux/sbin/losetup can't be matched, and hence we fail to update FILES with the new value, causing packaging errors. Fix by using re.escape() on the original path before passing into re.sub() Fixes: 5c23fe378732 ("update-alternatives: try to update FILES_${PN} when renaming a file"), or bcb3e7b7f88a in poky.git [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/classes/update-alternatives.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index e252651128..537e85d9a3 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass @@ -138,12 +138,12 @@ python apply_update_alternative_renames () { if not update_alternatives_enabled(d): return - from re import sub + import re def update_files(alt_target, alt_target_rename, pkg, d): f = d.getVar('FILES_' + pkg) if f: - f = sub(r'(^|\s)%s(\s|$)' % alt_target, r'\1%s\2' % alt_target_rename, f) + f = re.sub(r'(^|\s)%s(\s|$)' % re.escape (alt_target), r'\1%s\2' % alt_target_rename, f) d.setVar('FILES_' + pkg, f) # Check for deprecated usage... -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v6 02/13] util-linux: be more explicit about what files go into packages 2019-02-05 2:32 ` [PATCH v6 00/13] util-linux: one package per binary André Draszik 2019-02-05 2:32 ` [PATCH v6 01/13] update-alternatives: correctly escape PATHs when updating FILES_${PN} André Draszik @ 2019-02-05 2:32 ` André Draszik 2019-02-05 2:32 ` [PATCH v6 03/13] util-linux: fix the su and runuser packages André Draszik ` (12 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-05 2:32 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Just using a wildcard leaves the reader wondering what is meant here. By being explicit we can describe exactly what is intended, i.e. the file name as resulting from the ALTERNATIVE and ALTERNATIVE_LINK_NAME mechanism. Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 406af58502..e479fc24e1 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -88,7 +88,7 @@ FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidd = "${sbindir}/uuidd" -FILES_util-linux-rfkill = "${sbindir}/rfkill*" +FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" FILES_util-linux-partx = "${sbindir}/partx" FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" FILES_util-linux-findfs = "${sbindir}/findfs" @@ -105,20 +105,20 @@ FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so FILES_util-linux-lsblk = "${bindir}/lsblk" FILES_util-linux-lscpu = "${bindir}/lscpu" -FILES_util-linux-fsck = "${base_sbindir}/fsck*" +FILES_util-linux-fsck = "${base_sbindir}/fsck.${BPN}" FILES_util-linux-mkfs = "${sbindir}/mkfs" FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" -FILES_util-linux-sulogin = "${base_sbindir}/sulogin*" +FILES_util-linux-sulogin = "${base_sbindir}/sulogin.${BPN}" FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" FILES_util-linux-switch-root = "${base_sbindir}/switch_root.${BPN}" FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one -FILES_util-linux-blkid = "${base_sbindir}/blkid*" +FILES_util-linux-blkid = "${base_sbindir}/blkid.${BPN}" RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" RREPLACES_util-linux-blkid = "e2fsprogs-blkid" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v6 03/13] util-linux: fix the su and runuser packages 2019-02-05 2:32 ` [PATCH v6 00/13] util-linux: one package per binary André Draszik 2019-02-05 2:32 ` [PATCH v6 01/13] update-alternatives: correctly escape PATHs when updating FILES_${PN} André Draszik 2019-02-05 2:32 ` [PATCH v6 02/13] util-linux: be more explicit about what files go into packages André Draszik @ 2019-02-05 2:32 ` André Draszik 2019-02-05 2:32 ` [PATCH v6 04/13] util-linux: fix packaging nativesdk-util-linux-lib* André Draszik ` (11 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-05 2:32 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> The packages get an automatic RDEPENDS via shlibs, no need to explicitly state it, so we can drop those useless explicit assignments. su is moved into ${base_bindir} in do_install(), so because of a mismatched FILES specification su is actually packaged into the main package at the moment, not into the -su package as likely originally intended. runuser needs the pam configuration files, so they should be in the -runuser package, not in the main package. While fixing this, we can simplify the update alternatives processing for su. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index e479fc24e1..4a72e3d40e 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -96,7 +96,8 @@ FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" FILES_util-linux-runuser = "${sbindir}/runuser" FILES_util-linux-prlimit = "${bindir}/prlimit" FILES_util-linux-ionice = "${bindir}/ionice.${BPN}" -FILES_util-linux-su = "${bindir}/su.util-linux ${sysconfdir}/pam.d/su-l" +FILES_util-linux-runuser = "${sysconfdir}/pam.d/runuser*" +FILES_util-linux-su = "${base_bindir}/su.${BPN} ${sysconfdir}/pam.d/su-l" CONFFILES_util-linux-su = "${sysconfdir}/pam.d/su-l" FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ @@ -122,9 +123,6 @@ FILES_util-linux-blkid = "${base_sbindir}/blkid.${BPN}" RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" RREPLACES_util-linux-blkid = "e2fsprogs-blkid" -RDEPENDS_util-linux-runuser += "libpam" -RDEPENDS_util-linux-su += "libpam" - 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)}" @@ -228,6 +226,7 @@ ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 rfkill.8 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1" +ALTERNATIVE_${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" @@ -235,6 +234,7 @@ ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" ALTERNATIVE_LINK_NAME[rfkill.8] = "${mandir}/man8/rfkill.8" +ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" @@ -263,6 +263,9 @@ ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" ALTERNATIVE_util-linux-mount = "mount" ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" +ALTERNATIVE_${PN}-su = "su" +ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" + ALTERNATIVE_util-linux-umount = "umount" ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" @@ -305,15 +308,6 @@ ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" BBCLASSEXTEND = "native nativesdk" -python do_package_prepend () { - if '--enable-su' in d.getVar('EXTRA_OECONF').split(): - d.appendVar(d.expand('ALTERNATIVE_${PN}'), ' su') - d.appendVar(d.expand('ALTERNATIVE_${PN}-doc'), ' su.1') - - d.setVarFlag('ALTERNATIVE_LINK_NAME', "su", d.expand('${base_bindir}/su')) - d.setVarFlag('ALTERNATIVE_LINK_NAME', "su.1", d.expand('${mandir}/man1/su.1')) -} - python populate_packages_prepend() { do_split_packages(d, '${base_libdir}', r'^lib(.*)\.so\..*$', output_pattern='util-linux-lib%s', -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v6 04/13] util-linux: fix packaging nativesdk-util-linux-lib* 2019-02-05 2:32 ` [PATCH v6 00/13] util-linux: one package per binary André Draszik ` (2 preceding siblings ...) 2019-02-05 2:32 ` [PATCH v6 03/13] util-linux: fix the su and runuser packages André Draszik @ 2019-02-05 2:32 ` André Draszik 2019-02-05 2:32 ` [PATCH v6 05/13] util-linux: one package per binary (pt 1: base_sbindir) André Draszik ` (10 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-05 2:32 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> util-linux is configured with --libdir=${base_libdir} for -target builds, but with the default --libdir=${libdir} for all other builds. Furthermore, dynamic util-linux-lib* packages are unconditionally being generated from ${base_libdir}, which is the right location for -target builds, only. IOW, in the nativesdk case, util-linux-lib* packages are empty, and all the shared libraries implicitly become part of the main package again. While this surely wasn't intended, this also is going to cause problems as upcoming changes are explicitly making util-linux an empty meta-package, which then is going to cause packaging failures. While fixing this, clean up the existing use of EXTRA_OECONF as it is a bit confusing, hard to follow, and needlessly duplicates information: target: ${SHARED_EXTRA_OECONF} --libdir=${base_libdir} native/nativesdk: ${SHARED_EXTRA_OECONF} --disable-use-tty-group where ${SHARED_EXTRA_OECONF} already contains --disable-use-tty-group. This can be simplified by completely dropping the duplicated EXTRA_OECONF assignments and simply using a new variable UTIL_LINUX_LIBDIR with a _class-target override. Additionally, this allows to easily fix packaging of the util-linux-lib* packages, as we can now simply inspect UTIL_LINUX_LIBDIR where and as needed to get to the right directories. Lastly, all this can be moved from the .bb file into the .inc file as none of that appears to actually be version specific, and we can sort the configure options alphabetically for clarity. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 31 ++++++++++++------- .../util-linux/util-linux_2.32.1.bb | 9 ------ 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 4a72e3d40e..a35174f009 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -42,19 +42,26 @@ PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser PACKAGES_DYNAMIC = "^util-linux-lib.*" -SHARED_EXTRA_OECONF = "--disable-use-tty-group \ - --disable-makeinstall-chown \ - --enable-kill --enable-last --enable-mesg --enable-partx \ - --enable-raw --enable-rfkill --disable-login \ - --disable-vipw --disable-newgrp --disable-chfn-chsh \ - --enable-write --enable-mount --enable-unshare \ - --enable-libuuid --enable-libblkid --enable-fsck \ - --disable-minix --disable-bfs --without-udev \ - usrsbin_execdir='${sbindir}' \ +CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" +UTIL_LINUX_LIBDIR = "${libdir}" +UTIL_LINUX_LIBDIR_class-target = "${base_libdir}" +EXTRA_OECONF = "\ + --enable-libuuid --enable-libblkid \ + \ + --enable-fsck --enable-kill --enable-last --enable-mesg \ + --enable-mount --enable-partx --enable-raw --enable-rfkill \ + --enable-unshare --enable-write \ + \ + --disable-bfs --disable-chfn-chsh --disable-login \ + --disable-makeinstall-chown --disable-minix --disable-newgrp \ + --disable-use-tty-group --disable-vipw \ + \ + --without-udev \ + \ + usrsbin_execdir='${sbindir}' \ + --libdir='${UTIL_LINUX_LIBDIR}' \ " -EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}" - PACKAGECONFIG_class-target ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," @@ -309,7 +316,7 @@ ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" BBCLASSEXTEND = "native nativesdk" python populate_packages_prepend() { - do_split_packages(d, '${base_libdir}', r'^lib(.*)\.so\..*$', + do_split_packages(d, d.getVar('UTIL_LINUX_LIBDIR'), r'^lib(.*)\.so\..*$', output_pattern='util-linux-lib%s', description='util-linux lib%s', extra_depends='', prepend=True, allow_links=True) diff --git a/meta/recipes-core/util-linux/util-linux_2.32.1.bb b/meta/recipes-core/util-linux/util-linux_2.32.1.bb index 0f860c221b..e0bd383631 100644 --- a/meta/recipes-core/util-linux/util-linux_2.32.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.32.1.bb @@ -11,12 +11,3 @@ SRC_URI += "file://configure-sbindir.patch \ " SRC_URI[md5sum] = "9e5b1b8c1dc99455bdb6b462cf9436d9" SRC_URI[sha256sum] = "86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2" - -CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" - -EXTRA_OECONF_class-native = "${SHARED_EXTRA_OECONF} \ - --disable-use-tty-group \ -" -EXTRA_OECONF_class-nativesdk = "${SHARED_EXTRA_OECONF} \ - --disable-use-tty-group \ -" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v6 05/13] util-linux: one package per binary (pt 1: base_sbindir) 2019-02-05 2:32 ` [PATCH v6 00/13] util-linux: one package per binary André Draszik ` (3 preceding siblings ...) 2019-02-05 2:32 ` [PATCH v6 04/13] util-linux: fix packaging nativesdk-util-linux-lib* André Draszik @ 2019-02-05 2:32 ` André Draszik 2019-02-05 2:32 ` [PATCH v6 06/13] util-linux: one package per binary (pt 1b: symlinks) André Draszik ` (9 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-05 2:32 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Now that we have required infrastructure in place, we can start creating one package per binary. To make this process easier to follow, this is done in steps, starting with binaries from base_sbindir. Existing packages (and current dependency by main package): * agetty * blkid * cfdisk <- RRECOMMENDS * fdisk <- RRECOMMENDS * fsck * fstrim * losetup <- RDEPENDS * hwclock * sulogin <- RDEPENDS * swaponoff <- RDEPENDS * switch-root <- RRECOMMENDS New packages: * blockdev * ctrlaltdel * mkswap * nologin * pivot-root * swapon * swapoff swaponoff is empty now and simply depends on swapon swapoff 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. Existing packages that aren't in RDEPENDS / RRECOMMENDS haven't been added to RRECOMMENDS for that reason. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v5: * reduce duplication in util_linux_binpackages() using a for loop v3: * convert to PACKAGE_PREPROCESS_FUNCS rather than using apply_update_alternative_renames_prepend v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use PN for package name prefix, not BPN --- meta/recipes-core/util-linux/util-linux.inc | 65 +++++++++++---------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index a35174f009..a81045251b 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -28,19 +28,36 @@ 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-agetty util-linux-blkdiscard util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ - util-linux-swaponoff util-linux-losetup util-linux-umount \ +PACKAGES =+ "util-linux-blkdiscard util-linux-sfdisk \ + util-linux-swaponoff util-linux-umount \ util-linux-mount util-linux-readprofile util-linux-uuidd \ - util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs util-linux-fsck \ - util-linux-blkid util-linux-mkfs util-linux-mcookie util-linux-rfkill \ - util-linux-lsblk util-linux-mkfs.cramfs util-linux-fstrim \ - util-linux-partx util-linux-hwclock util-linux-mountpoint \ - util-linux-findfs util-linux-getopt util-linux-sulogin util-linux-prlimit \ - util-linux-ionice util-linux-switch-root util-linux-unshare" + util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs \ + util-linux-mkfs util-linux-mcookie util-linux-rfkill \ + util-linux-lsblk util-linux-mkfs.cramfs \ + util-linux-partx util-linux-mountpoint \ + util-linux-findfs util-linux-getopt util-linux-prlimit \ + util-linux-ionice util-linux-unshare" PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}" -PACKAGES_DYNAMIC = "^util-linux-lib.*" +python util_linux_binpackages () { + def pkg_hook(f, pkg, file_regex, output_pattern, modulename): + if d.getVar('ALTERNATIVE_' + pkg): + return + if d.getVarFlag('ALTERNATIVE_LINK_NAME', modulename): + d.setVar('ALTERNATIVE_' + pkg, modulename) + + for dir in [ '${base_sbindir}' ]: + do_split_packages(d, root=dir, + file_regex=r'(.*)', output_pattern='${PN}-%s', + description='${PN} %s', + hook=pkg_hook, extra_depends='', prepend=True) +} + +# we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS +PACKAGE_PREPROCESS_FUNCS =+ "util_linux_binpackages " + +PACKAGES_DYNAMIC = "^util-linux-.*" CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" UTIL_LINUX_LIBDIR = "${libdir}" @@ -81,14 +98,8 @@ FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" -FILES_util-linux-agetty = "${base_sbindir}/agetty" FILES_util-linux-blkdiscard = "${sbindir}/blkdiscard" -FILES_util-linux-fdisk = "${base_sbindir}/fdisk.${BPN}" -FILES_util-linux-fstrim = "${base_sbindir}/fstrim.${BPN}" -FILES_util-linux-cfdisk = "${base_sbindir}/cfdisk" FILES_util-linux-sfdisk = "${sbindir}/sfdisk" -FILES_util-linux-swaponoff = "${base_sbindir}/swapon.${BPN} ${base_sbindir}/swapoff.${BPN}" -FILES_util-linux-losetup = "${base_sbindir}/losetup.${BPN}" FILES_util-linux-mount = "${base_bindir}/mount.${BPN}" FILES_util-linux-mcookie = "${bindir}/mcookie" FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" @@ -97,7 +108,6 @@ FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidd = "${sbindir}/uuidd" FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" FILES_util-linux-partx = "${sbindir}/partx" -FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" FILES_util-linux-findfs = "${sbindir}/findfs" FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" FILES_util-linux-runuser = "${sbindir}/runuser" @@ -113,27 +123,24 @@ FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so FILES_util-linux-lsblk = "${bindir}/lsblk" FILES_util-linux-lscpu = "${bindir}/lscpu" -FILES_util-linux-fsck = "${base_sbindir}/fsck.${BPN}" FILES_util-linux-mkfs = "${sbindir}/mkfs" FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" -FILES_util-linux-sulogin = "${base_sbindir}/sulogin.${BPN}" FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" -FILES_util-linux-switch-root = "${base_sbindir}/switch_root.${BPN}" FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one -FILES_util-linux-blkid = "${base_sbindir}/blkid.${BPN}" 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} = "util-linux-blkdiscard util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint util-linux-prlimit util-linux-ionice util-linux-switch-root" +RRECOMMENDS_${PN} = "util-linux-blkdiscard util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint 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}_class-native = "" RRECOMMENDS_${PN}_class-nativesdk = "" @@ -142,6 +149,9 @@ RDEPENDS_${PN}_class-nativesdk = "" RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev" +RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" +ALLOW_EMPTY_${PN}-swaponoff = "1" + #SYSTEMD_PACKAGES = "${PN}-uuidd ${PN}-fstrim" SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.socket uuidd.service" SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable" @@ -213,9 +223,9 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = " \ - dmesg kill more mkswap blockdev pivot_root \ + dmesg kill more \ hexdump last lastb logger mesg renice wall \ - setsid chrt flock utmpdump eject nologin taskset fallocate \ + setsid chrt flock utmpdump eject taskset fallocate \ fsfreeze nsenter cal rev \ " @@ -254,13 +264,10 @@ ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3" ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" -ALTERNATIVE_util-linux-hwclock = "hwclock" ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" -ALTERNATIVE_util-linux-fdisk = "fdisk" ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" -ALTERNATIVE_util-linux-fstrim = "fstrim" ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" ALTERNATIVE_util-linux-agetty = "getty" @@ -279,17 +286,13 @@ ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" ALTERNATIVE_util-linux-readprofile = "readprofile" ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" -ALTERNATIVE_util-linux-losetup = "losetup" ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" -ALTERNATIVE_util-linux-swaponoff = "swapoff swapon" ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" -ALTERNATIVE_util-linux-fsck = "fsck" ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" -ALTERNATIVE_util-linux-blkid = "blkid" ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" ALTERNATIVE_util-linux-rfkill = "rfkill" @@ -298,7 +301,6 @@ ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" ALTERNATIVE_util-linux-getopt = "getopt" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" -ALTERNATIVE_util-linux-sulogin = "sulogin" ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" ALTERNATIVE_util-linux-mountpoint = "mountpoint" @@ -310,7 +312,6 @@ ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" ALTERNATIVE_util-linux-ionice = "ionice" ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" -ALTERNATIVE_util-linux-switch-root = "switch_root" ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" BBCLASSEXTEND = "native nativesdk" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v6 06/13] util-linux: one package per binary (pt 1b: symlinks) 2019-02-05 2:32 ` [PATCH v6 00/13] util-linux: one package per binary André Draszik ` (4 preceding siblings ...) 2019-02-05 2:32 ` [PATCH v6 05/13] util-linux: one package per binary (pt 1: base_sbindir) André Draszik @ 2019-02-05 2:32 ` André Draszik 2019-02-05 2:32 ` [PATCH v6 07/13] util-linux: one package per binary (pt 2: base_bindir) André Draszik ` (8 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-05 2:32 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Some of the binaries have symlinks. Add them to the package owning the binary they are pointing to. Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index a81045251b..a250db94aa 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -52,6 +52,28 @@ python util_linux_binpackages () { file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', hook=pkg_hook, 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}' ]: + root = d.expand(root) + for walkroot, dirs, files in os.walk(dvar + root): + for f in files: + file = os.path.join(walkroot, f) + if not os.path.islink(file): + continue + + pkg = os.path.basename(os.readlink(file)) + extras[pkg] = extras.get(pkg, '') + ' ' + file.replace(dvar, '', 1) + + pn = d.getVar('PN') + for pkg, links in extras.items(): + of = d.getVar('FILES_' + pn + '-' + pkg) + links = of + links + d.setVar('FILES_' + pn + '-' + pkg, links) } # we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v6 07/13] util-linux: one package per binary (pt 2: base_bindir) 2019-02-05 2:32 ` [PATCH v6 00/13] util-linux: one package per binary André Draszik ` (5 preceding siblings ...) 2019-02-05 2:32 ` [PATCH v6 06/13] util-linux: one package per binary (pt 1b: symlinks) André Draszik @ 2019-02-05 2:32 ` André Draszik 2019-02-05 2:32 ` [PATCH v6 08/13] util-linux: one package per binary (pt 3: sbindir) André Draszik ` (7 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-05 2:32 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Similar to the previous patch. Existing packages (and current dependency by main package): * mount <- RRECOMMENDS * umount <- RDEPENDS * mountpoint <- RRECOMMENDS * getopt * su <- RDEPENDS New packages: * dmesg * kill * more 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. Existing packages that aren't in RDEPENDS / RRECOMMENDS haven't been added to RRECOMMENDS for that reason. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v5: * reduce duplication in util_linux_binpackages() using a for loop v3: * convert to PACKAGE_PREPROCESS_FUNCS rather than using apply_update_alternative_renames_prepend v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use PN for package name prefix, not BPN --- meta/recipes-core/util-linux/util-linux.inc | 32 +++++++-------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index a250db94aa..4359a1c3fb 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -29,16 +29,16 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz " PACKAGES =+ "util-linux-blkdiscard util-linux-sfdisk \ - util-linux-swaponoff util-linux-umount \ - util-linux-mount util-linux-readprofile util-linux-uuidd \ + util-linux-swaponoff \ + util-linux-readprofile util-linux-uuidd \ util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs \ util-linux-mkfs util-linux-mcookie util-linux-rfkill \ util-linux-lsblk util-linux-mkfs.cramfs \ - util-linux-partx util-linux-mountpoint \ - util-linux-findfs util-linux-getopt util-linux-prlimit \ + util-linux-partx \ + util-linux-findfs util-linux-prlimit \ util-linux-ionice util-linux-unshare" PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" -PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}" +PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}" python util_linux_binpackages () { def pkg_hook(f, pkg, file_regex, output_pattern, modulename): @@ -47,7 +47,7 @@ python util_linux_binpackages () { if d.getVarFlag('ALTERNATIVE_LINK_NAME', modulename): d.setVar('ALTERNATIVE_' + pkg, modulename) - for dir in [ '${base_sbindir}' ]: + for dir in [ '${base_sbindir}', '${base_bindir}' ]: do_split_packages(d, root=dir, file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', @@ -58,7 +58,7 @@ python util_linux_binpackages () { # pointing to extras = {} dvar = d.getVar('PKGD') - for root in [ '${base_sbindir}' ]: + for root in [ '${base_sbindir}', '${base_bindir}' ]: root = d.expand(root) for walkroot, dirs, files in os.walk(dvar + root): for f in files: @@ -122,21 +122,18 @@ FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" FILES_util-linux-blkdiscard = "${sbindir}/blkdiscard" FILES_util-linux-sfdisk = "${sbindir}/sfdisk" -FILES_util-linux-mount = "${base_bindir}/mount.${BPN}" FILES_util-linux-mcookie = "${bindir}/mcookie" -FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidd = "${sbindir}/uuidd" FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" FILES_util-linux-partx = "${sbindir}/partx" FILES_util-linux-findfs = "${sbindir}/findfs" -FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" FILES_util-linux-runuser = "${sbindir}/runuser" 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 = "${base_bindir}/su.${BPN} ${sysconfdir}/pam.d/su-l" +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 \ @@ -150,8 +147,6 @@ FILES_util-linux-mkfs = "${sbindir}/mkfs" FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" -FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" - FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one @@ -161,8 +156,9 @@ 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-blkdiscard util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint util-linux-prlimit util-linux-ionice" +RRECOMMENDS_${PN} = "util-linux-blkdiscard util-linux-sfdisk util-linux-readprofile util-linux-mkfs 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" RRECOMMENDS_${PN}_class-native = "" RRECOMMENDS_${PN}_class-nativesdk = "" @@ -245,7 +241,6 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = " \ - dmesg kill more \ hexdump last lastb logger mesg renice wall \ setsid chrt flock utmpdump eject taskset fallocate \ fsfreeze nsenter cal rev \ @@ -296,13 +291,8 @@ ALTERNATIVE_util-linux-agetty = "getty" ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" -ALTERNATIVE_util-linux-mount = "mount" ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" - -ALTERNATIVE_${PN}-su = "su" ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" - -ALTERNATIVE_util-linux-umount = "umount" ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" ALTERNATIVE_util-linux-readprofile = "readprofile" @@ -320,12 +310,10 @@ ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" ALTERNATIVE_util-linux-rfkill = "rfkill" ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" -ALTERNATIVE_util-linux-getopt = "getopt" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" -ALTERNATIVE_util-linux-mountpoint = "mountpoint" ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" ALTERNATIVE_util-linux-unshare = "unshare" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v6 08/13] util-linux: one package per binary (pt 3: sbindir) 2019-02-05 2:32 ` [PATCH v6 00/13] util-linux: one package per binary André Draszik ` (6 preceding siblings ...) 2019-02-05 2:32 ` [PATCH v6 07/13] util-linux: one package per binary (pt 2: base_bindir) André Draszik @ 2019-02-05 2:32 ` André Draszik 2019-02-05 2:32 ` [PATCH v6 09/13] util-linux: one package per binary (pt 4: bindir) André Draszik ` (6 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-05 2:32 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> Similar to the previous patch. Existing packages (and current dependency by main package): * blkdiscard <- RRECOMMENDS * findfs * fsck.cramfs * mkfs <- RRECOMMENDS * mkfs.cramfs * partx * readprofile <- RRECOMMENDS * rfkill * runuser <- RDEPENDS * sfdisk <- RRECOMMENDS * uuidd 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. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v5: * reduce duplication in util_linux_binpackages() using a for loop v3: * convert to PACKAGE_PREPROCESS_FUNCS rather than using apply_update_alternative_renames_prepend v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use PN for package name prefix, not BPN --- meta/recipes-core/util-linux/util-linux.inc | 46 +++++++++------------ 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 4359a1c3fb..3b0598b708 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -28,17 +28,13 @@ 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-blkdiscard util-linux-sfdisk \ - util-linux-swaponoff \ - util-linux-readprofile util-linux-uuidd \ - util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs \ - util-linux-mkfs util-linux-mcookie util-linux-rfkill \ - util-linux-lsblk util-linux-mkfs.cramfs \ - util-linux-partx \ - util-linux-findfs util-linux-prlimit \ +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 += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" -PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}" python util_linux_binpackages () { def pkg_hook(f, pkg, file_regex, output_pattern, modulename): @@ -47,18 +43,29 @@ python util_linux_binpackages () { 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}' ]: 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}' ]: + 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}' ]: + for root in [ '${base_sbindir}', '${base_bindir}', '${sbindir}' ]: root = d.expand(root) for walkroot, dirs, files in os.walk(dvar + root): for f in files: @@ -120,16 +127,8 @@ FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" -FILES_util-linux-blkdiscard = "${sbindir}/blkdiscard" -FILES_util-linux-sfdisk = "${sbindir}/sfdisk" FILES_util-linux-mcookie = "${bindir}/mcookie" -FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" FILES_util-linux-uuidgen = "${bindir}/uuidgen" -FILES_util-linux-uuidd = "${sbindir}/uuidd" -FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" -FILES_util-linux-partx = "${sbindir}/partx" -FILES_util-linux-findfs = "${sbindir}/findfs" -FILES_util-linux-runuser = "${sbindir}/runuser" FILES_util-linux-prlimit = "${bindir}/prlimit" FILES_util-linux-ionice = "${bindir}/ionice.${BPN}" FILES_util-linux-runuser = "${sysconfdir}/pam.d/runuser*" @@ -142,11 +141,6 @@ FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so FILES_util-linux-lsblk = "${bindir}/lsblk" FILES_util-linux-lscpu = "${bindir}/lscpu" -FILES_util-linux-mkfs = "${sbindir}/mkfs" - -FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" -FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" - FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one @@ -156,7 +150,7 @@ 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-blkdiscard util-linux-sfdisk util-linux-readprofile util-linux-mkfs util-linux-prlimit util-linux-ionice" +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" @@ -243,7 +237,7 @@ ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = " \ hexdump last lastb logger mesg renice wall \ setsid chrt flock utmpdump eject taskset fallocate \ - fsfreeze nsenter cal rev \ + nsenter cal rev \ " ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" @@ -295,7 +289,6 @@ ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" -ALTERNATIVE_util-linux-readprofile = "readprofile" ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" @@ -307,7 +300,6 @@ ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" -ALTERNATIVE_util-linux-rfkill = "rfkill" ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v6 09/13] util-linux: one package per binary (pt 4: bindir) 2019-02-05 2:32 ` [PATCH v6 00/13] util-linux: one package per binary André Draszik ` (7 preceding siblings ...) 2019-02-05 2:32 ` [PATCH v6 08/13] util-linux: one package per binary (pt 3: sbindir) André Draszik @ 2019-02-05 2:32 ` André Draszik 2019-02-05 2:32 ` [PATCH v6 10/13] util-linux: simplify meta-package RDEPENDS / RRECOMMENDS André Draszik ` (5 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-05 2:32 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> 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] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v5: * reduce duplication in util_linux_binpackages() using a for loop v3: * convert to PACKAGE_PREPROCESS_FUNCS rather than using apply_update_alternative_renames_prepend v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use PN for package name prefix, not BPN --- meta/recipes-core/util-linux/util-linux.inc | 43 ++++++++------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 3b0598b708..5bc179e50b 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -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" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v6 10/13] util-linux: simplify meta-package RDEPENDS / RRECOMMENDS 2019-02-05 2:32 ` [PATCH v6 00/13] util-linux: one package per binary André Draszik ` (8 preceding siblings ...) 2019-02-05 2:32 ` [PATCH v6 09/13] util-linux: one package per binary (pt 4: bindir) André Draszik @ 2019-02-05 2:32 ` André Draszik 2019-02-05 2:32 ` [PATCH v6 11/13] util-linux: move /etc/default/mountall into -mount subpackage André Draszik ` (4 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-05 2:32 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@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.draszik@jci.com> --- v6: * make sure to walk each bindir only once, to better support nativesdk and usrmerge builds v5: * reduce duplication in util_linux_binpackages() using a for loop v3: update commit message other fix --- meta/recipes-core/util-linux/util-linux.inc | 26 +++++---------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 5bc179e50b..5e40698644 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -33,35 +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 = sorted(list(set(d.expand("${base_sbindir} ${base_bindir} ${sbindir} ${bindir}").split()))) + 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}' ]: - root = d.expand(root) + for root in bindirs: for walkroot, dirs, files in os.walk(dvar + root): for f in files: file = os.path.join(walkroot, f) @@ -133,12 +125,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 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v6 11/13] util-linux: move /etc/default/mountall into -mount subpackage 2019-02-05 2:32 ` [PATCH v6 00/13] util-linux: one package per binary André Draszik ` (9 preceding siblings ...) 2019-02-05 2:32 ` [PATCH v6 10/13] util-linux: simplify meta-package RDEPENDS / RRECOMMENDS André Draszik @ 2019-02-05 2:32 ` André Draszik 2019-02-05 2:32 ` [PATCH v6 12/13] util-linux: let -ptest package depend on all of util-linux André Draszik ` (3 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-05 2:32 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> This should probably be there and now the main package is a real meta-package only. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 5e40698644..bbb28c3da0 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -46,7 +46,7 @@ python util_linux_binpackages () { do_split_packages(d, root=dir, file_regex=r'(.*)', output_pattern='${PN}-%s', description='${PN} %s', - hook=pkg_hook, extra_depends='', prepend=True) + hook=pkg_hook, extra_depends='') # There are some symlinks for some binaries which we have ignored # above. Add them to the package owning the binary they are @@ -110,10 +110,13 @@ PACKAGECONFIG[pylibmount] = "--with-python=3 --enable-pylibmount,--without-pytho # Readline support PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" +ALLOW_EMPTY_${PN} = "1" +FILES_${PN} = "" FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" +FILES_${PN}-mount = "${sysconfdir}/default/mountall" 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" -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v6 12/13] util-linux: let -ptest package depend on all of util-linux 2019-02-05 2:32 ` [PATCH v6 00/13] util-linux: one package per binary André Draszik ` (10 preceding siblings ...) 2019-02-05 2:32 ` [PATCH v6 11/13] util-linux: move /etc/default/mountall into -mount subpackage André Draszik @ 2019-02-05 2:32 ` André Draszik 2019-02-05 2:32 ` [PATCH v6 13/13] util-linux: final cleanup André Draszik ` (2 subsequent siblings) 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-05 2:32 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> ptest executes all the binaries, so they really need to be available in the file system. [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- meta/recipes-core/util-linux/util-linux.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index bbb28c3da0..93aa3e407c 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -306,7 +306,7 @@ python populate_packages_prepend() { } RDEPENDS_${PN}-bash-completion += "util-linux-lsblk" -RDEPENDS_${PN}-ptest = "bash grep coreutils which util-linux-blkid util-linux-fsck btrfs-tools" +RDEPENDS_${PN}-ptest = "bash grep coreutils which btrfs-tools ${PN}" do_compile_ptest() { oe_runmake buildtest-TESTS -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* [PATCH v6 13/13] util-linux: final cleanup 2019-02-05 2:32 ` [PATCH v6 00/13] util-linux: one package per binary André Draszik ` (11 preceding siblings ...) 2019-02-05 2:32 ` [PATCH v6 12/13] util-linux: let -ptest package depend on all of util-linux André Draszik @ 2019-02-05 2:32 ` André Draszik 2019-02-21 21:08 ` Burton, Ross 2019-02-05 8:09 ` [PATCH v6 00/13] util-linux: one package per binary André Draszik 2019-02-05 18:26 ` Richard Purdie 14 siblings, 1 reply; 103+ messages in thread From: André Draszik @ 2019-02-05 2:32 UTC (permalink / raw) To: openembedded-core From: André Draszik <andre.draszik@jci.com> * use ${PN} instead of util-linux * use PACKAGESPLITFUNCS for creating util-linux-lib* packages rather than an _append OVERRIDE * sort ALTERNATIVE_LINK_NAME alphabetically * use systemd_system_unitdir instead of open-coding * inherit manpages so as to benefit from man-db processing (note that manpages are not generated here, we just want the automatic update of the package index caches * use EXTRA_OEMAKE instead of duplicating command line arguments [YOCTO #13058] Signed-off-by: André Draszik <andre.draszik@jci.com> --- v6: * update commit message (escape characters in regexs has been merged long ago) v5: * fix subject line typo v3: * use PACKAGESPLITFUNCS =+ rather than PACKAGESPLITFUNCS_prepend v2: * Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. * use systemd_system_unitdir instead of open-coding * inherit manpages * use EXTRA_OEMAKE instead of duplicating command line arguments * also sort ALTERNATIVE_LINK_NAME for man pages --- meta/recipes-core/util-linux/util-linux.inc | 157 ++++++++------------ 1 file changed, 66 insertions(+), 91 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 93aa3e407c..ea654e193a 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=1715f5ee3e01203ca1e1e0b9ee65918c file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16" #gtk-doc is not enabled as it requires xmlto which requires util-linux -inherit autotools gettext pkgconfig systemd update-alternatives python3-dir bash-completion ptest +inherit autotools gettext manpages pkgconfig systemd update-alternatives python3-dir bash-completion ptest DEPENDS = "zlib ncurses virtual/crypt" DEPENDS_append_class-native = " lzo-native" DEPENDS_append_class-nativesdk = " lzo-native" @@ -28,8 +28,8 @@ 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" -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" +PACKAGES =+ "${PN}-swaponoff" +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', '${PN}-pylibmount', '', d)}" python util_linux_binpackages () { def pkg_hook(f, pkg, file_regex, output_pattern, modulename): @@ -73,7 +73,16 @@ python util_linux_binpackages () { # we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS PACKAGE_PREPROCESS_FUNCS =+ "util_linux_binpackages " -PACKAGES_DYNAMIC = "^util-linux-.*" +python util_linux_libpackages() { + do_split_packages(d, root=d.getVar('UTIL_LINUX_LIBDIR'), file_regex=r'^lib(.*)\.so\..*$', + output_pattern='${PN}-lib%s', + description='${PN} lib%s', + extra_depends='', prepend=True, allow_links=True) +} + +PACKAGESPLITFUNCS =+ "util_linux_libpackages" + +PACKAGES_DYNAMIC = "^${PN}-.*" CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" UTIL_LINUX_LIBDIR = "${libdir}" @@ -97,44 +106,42 @@ EXTRA_OECONF = "\ PACKAGECONFIG_class-target ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," - # Respect the systemd feature for uuidd -PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/, --without-systemd --without-systemdsystemunitdir,systemd" - +PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-systemd --without-systemdsystemunitdir,systemd" # Build setpriv requires libcap-ng PACKAGECONFIG[libcap-ng] = "--enable-setpriv,--disable-setpriv,libcap-ng," - # Build python bindings for libmount PACKAGECONFIG[pylibmount] = "--with-python=3 --enable-pylibmount,--without-python --disable-pylibmount,python3" - # Readline support PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" +EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'" + ALLOW_EMPTY_${PN} = "1" FILES_${PN} = "" FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" - FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" - FILES_${PN}-mount = "${sysconfdir}/default/mountall" -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_${PN}-runuser = "${sysconfdir}/pam.d/runuser*" +FILES_${PN}-su = "${sysconfdir}/pam.d/su-l" +CONFFILES_${PN}-su = "${sysconfdir}/pam.d/su-l" +FILES_${PN}-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ + ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \ + ${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*" # Util-linux' blkid replaces the e2fsprogs one -RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" -RREPLACES_util-linux-blkid = "e2fsprogs-blkid" +RCONFLICTS_${PN}-blkid = "e2fsprogs-blkid" +RREPLACES_${PN}-blkid = "e2fsprogs-blkid" RRECOMMENDS_${PN}_class-native = "" RRECOMMENDS_${PN}_class-nativesdk = "" RDEPENDS_${PN}_class-native = "" RDEPENDS_${PN}_class-nativesdk = "" -RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev" +RPROVIDES_${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev ${PN}-libuuid-dev" +RDEPENDS_${PN}-bash-completion += "${PN}-lsblk" +RDEPENDS_${PN}-ptest = "bash grep coreutils which btrfs-tools ${PN}" RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" ALLOW_EMPTY_${PN}-swaponoff = "1" @@ -144,17 +151,11 @@ SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable" SYSTEMD_SERVICE_${PN}-fstrim = "fstrim.timer fstrim.service" SYSTEMD_AUTO_ENABLE_${PN}-fstrim = "disable" -do_compile () { - set -e - oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}' -} - do_install () { # with ccache the timestamps on compiled files may # end up earlier than on their inputs, this allows # for the resultant compilation in the install step. - oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \ - 'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \ + oe_runmake 'CC=${CC}' 'LD=${LD}' \ 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install mkdir -p ${D}${base_bindir} @@ -208,38 +209,67 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" -ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" -ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" -ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" -ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" +ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" 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[dmesg] = "${base_bindir}/dmesg" ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate" +ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" ALTERNATIVE_LINK_NAME[flock] = "${bindir}/flock" +ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" +ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" +ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" +ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" +ALTERNATIVE_${PN}-agetty = "getty" +ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" +ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" ALTERNATIVE_LINK_NAME[hexdump] = "${bindir}/hexdump" +ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" +ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" +ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" 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[losetup] = "${base_sbindir}/losetup" ALTERNATIVE_LINK_NAME[mesg] = "${bindir}/mesg" +ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" +ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" +ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" +ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" +ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" ALTERNATIVE_LINK_NAME[nsenter] = "${bindir}/nsenter" +ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" +ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" ALTERNATIVE_LINK_NAME[renice] = "${bindir}/renice" ALTERNATIVE_LINK_NAME[rev] = "${bindir}/rev" +ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" ALTERNATIVE_LINK_NAME[setsid] = "${bindir}/setsid" +ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" +ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" +ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" +ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" +ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" ALTERNATIVE_LINK_NAME[taskset] = "${bindir}/taskset" +ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" +ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" 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" -ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 rfkill.8 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1" +ALTERNATIVE_${PN}-doc = "blkid.8 eject.1 findfs.8 fsck.8 kill.1 last.1 lastb.1 libblkid.3 logger.1 mesg.1 mountpoint.1 nologin.8 rfkill.8 sulogin.8 utmpdump.1 uuid.3 wall.1" ALTERNATIVE_${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" +ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8" +ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" +ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" +ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" +ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" +ALTERNATIVE_LINK_NAME[libblkid.3] = "${mandir}/man3/libblkid.3" +ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" @@ -247,67 +277,12 @@ ALTERNATIVE_LINK_NAME[rfkill.8] = "${mandir}/man8/rfkill.8" ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" -ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" -ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" -ALTERNATIVE_LINK_NAME[libblkid.3] = "${mandir}/man3/libblkid.3" -ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8" -ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" -ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3" -ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" -ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" - -ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" - -ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" - -ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" - -ALTERNATIVE_util-linux-agetty = "getty" -ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" -ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" - -ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" -ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" -ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" - -ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" - -ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" - -ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" -ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" - -ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" - -ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" - -ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" - -ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" - -ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" - -ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" - -ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" +ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" -ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" - -ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" BBCLASSEXTEND = "native nativesdk" -python populate_packages_prepend() { - do_split_packages(d, d.getVar('UTIL_LINUX_LIBDIR'), r'^lib(.*)\.so\..*$', - output_pattern='util-linux-lib%s', - description='util-linux lib%s', - extra_depends='', prepend=True, allow_links=True) -} - -RDEPENDS_${PN}-bash-completion += "util-linux-lsblk" -RDEPENDS_${PN}-ptest = "bash grep coreutils which btrfs-tools ${PN}" - do_compile_ptest() { oe_runmake buildtest-TESTS } -- 2.20.1 ^ permalink raw reply related [flat|nested] 103+ messages in thread
* Re: [PATCH v6 13/13] util-linux: final cleanup 2019-02-05 2:32 ` [PATCH v6 13/13] util-linux: final cleanup André Draszik @ 2019-02-21 21:08 ` Burton, Ross 2019-02-23 12:11 ` Richard Purdie 0 siblings, 1 reply; 103+ messages in thread From: Burton, Ross @ 2019-02-21 21:08 UTC (permalink / raw) To: André Draszik; +Cc: OE-core Looks like the manpage cleanup didn't quite work: WARNING: util-linux-2.32.1-r0 do_configure: QA Issue: util-linux: invalid PACKAGECONFIG: manpages [invalid-packageconfig] Ross ^ permalink raw reply [flat|nested] 103+ messages in thread
* Re: [PATCH v6 13/13] util-linux: final cleanup 2019-02-21 21:08 ` Burton, Ross @ 2019-02-23 12:11 ` Richard Purdie 0 siblings, 0 replies; 103+ messages in thread From: Richard Purdie @ 2019-02-23 12:11 UTC (permalink / raw) To: Burton, Ross, André Draszik; +Cc: OE-core On Thu, 2019-02-21 at 21:08 +0000, Burton, Ross wrote: > Looks like the manpage cleanup didn't quite work: > > WARNING: util-linux-2.32.1-r0 do_configure: QA Issue: util-linux: > invalid PACKAGECONFIG: manpages [invalid-packageconfig] There is also: https://autobuilder.yoctoproject.org/typhoon/#/builders/52/builds/319/steps/7/logs/warnings WARNING: lib32-util-linux-2.32.1-r0 do_package: QA Issue: lib32-util-linux package lib32-util-linux-blkid - suspicious values 'e2fsprogs-blkid' in RREPLACES [multilib] WARNING: lib32-util-linux-2.32.1-r0 do_package: QA Issue: lib32-util-linux package lib32-util-linux-blkid - suspicious values 'e2fsprogs-blkid' in RCONFLICTS [multilib] so something isn't quite right with the mutlilib variants of the recipe. Cheers, Richard ^ permalink raw reply [flat|nested] 103+ messages in thread
* Re: [PATCH v6 00/13] util-linux: one package per binary 2019-02-05 2:32 ` [PATCH v6 00/13] util-linux: one package per binary André Draszik ` (12 preceding siblings ...) 2019-02-05 2:32 ` [PATCH v6 13/13] util-linux: final cleanup André Draszik @ 2019-02-05 8:09 ` André Draszik 2019-02-05 18:26 ` Richard Purdie 14 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-05 8:09 UTC (permalink / raw) To: openembedded-core On Tue, 2019-02-05 at 02:32 +0000, André Draszik wrote: > v6: > > This version now also builds nativesdk-util-linux fine for me. > > * introduce patch 04: util-linux: fix packaging nativesdk-util-linux-lib* > - this is to fix nativesdk build failures triggered by later patches > * update patch 10: util-linux: simplify meta-package RDEPENDS / > RRECOMMENDS > - make sure to walk each bindir only once, to better > support nativesdk and usrmerge builds > * update patch 13: util-linux: final cleanup > - commit message updated * introduce patch 01: update-alternatives: correctly escape PATHs when updating FILES_${PN} - this one is also new > > Cheers, > André > > ^ permalink raw reply [flat|nested] 103+ messages in thread
* Re: [PATCH v6 00/13] util-linux: one package per binary 2019-02-05 2:32 ` [PATCH v6 00/13] util-linux: one package per binary André Draszik ` (13 preceding siblings ...) 2019-02-05 8:09 ` [PATCH v6 00/13] util-linux: one package per binary André Draszik @ 2019-02-05 18:26 ` Richard Purdie 2019-02-08 12:08 ` André Draszik 14 siblings, 1 reply; 103+ messages in thread From: Richard Purdie @ 2019-02-05 18:26 UTC (permalink / raw) To: André Draszik, openembedded-core On Tue, 2019-02-05 at 02:32 +0000, André Draszik wrote: > v6: > > This version now also builds nativesdk-util-linux fine for me. > > * introduce patch 04: util-linux: fix packaging nativesdk-util-linux- > lib* > - this is to fix nativesdk build failures triggered by later > patches > * update patch 10: util-linux: simplify meta-package RDEPENDS / > RRECOMMENDS > - make sure to walk each bindir only once, to better > support nativesdk and usrmerge builds > * update patch 13: util-linux: final cleanup > - commit message updated Thanks. We appear to be now onto runtime errors: https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/260 https://autobuilder.yoctoproject.org/typhoon/#/builders/67/builds/260 https://autobuilder.yoctoproject.org/typhoon/#/builders/38/builds/257 Seems some util installed into -lsb images (and full-cmdline) causes some getty error? Cheers, Richard ^ permalink raw reply [flat|nested] 103+ messages in thread
* Re: [PATCH v6 00/13] util-linux: one package per binary 2019-02-05 18:26 ` Richard Purdie @ 2019-02-08 12:08 ` André Draszik 0 siblings, 0 replies; 103+ messages in thread From: André Draszik @ 2019-02-08 12:08 UTC (permalink / raw) To: Richard Purdie, openembedded-core On Tue, 2019-02-05 at 18:26 +0000, Richard Purdie wrote: > On Tue, 2019-02-05 at 02:32 +0000, André Draszik wrote: > > v6: > > > > This version now also builds nativesdk-util-linux fine for me. > > > > * introduce patch 04: util-linux: fix packaging nativesdk-util-linux- > > lib* > > - this is to fix nativesdk build failures triggered by later > > patches > > * update patch 10: util-linux: simplify meta-package RDEPENDS / > > RRECOMMENDS > > - make sure to walk each bindir only once, to better > > support nativesdk and usrmerge builds > > * update patch 13: util-linux: final cleanup > > - commit message updated > > Thanks. We appear to be now onto runtime errors: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/260 > https://autobuilder.yoctoproject.org/typhoon/#/builders/67/builds/260 > https://autobuilder.yoctoproject.org/typhoon/#/builders/38/builds/257 > > Seems some util installed into -lsb images (and full-cmdline) causes > some getty error? Because util-linux RRECOMMENDS all binaries now, we end up with util-linux' agetty in the image, which has higher priority than busybox' getty. agetty needs extra help: http://lists.openembedded.org/pipermail/openembedded-core/2019-February/278814.html Other alternatives are to: * bump ALTERNATIVE_PRIORITY_pn-busybox (I do this by default for everything) * add BAD_RECOMMENDATIONS for util-linux-agetty But I think supporting agetty with the patch above is not so bad... Cheers, Andre' > > Cheers, > > Richard > ^ permalink raw reply [flat|nested] 103+ messages in thread
end of thread, other threads:[~2019-02-23 12:11 UTC | newest]
Thread overview: 103+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-14 12:56 [PATCH 00/12] RFC: util-linux: one package per binary André Draszik
2019-01-14 12:56 ` [PATCH 01/12] util-linux: simplify version upgrades (MAJOR_VERSION) André Draszik
2019-01-14 12:56 ` [PATCH 02/12] util-linux: remove erroneous patch (qsort_r) André Draszik
2019-01-14 12:56 ` [PATCH 03/12] util-linux: remove minix remnants André Draszik
2019-01-14 12:56 ` [PATCH 04/12] util-linux: be more explicit about what files go into packages André Draszik
2019-01-14 12:56 ` [PATCH 05/12] util-linux: fix the su and runuser packages André Draszik
2019-01-14 12:56 ` [PATCH 06/12] update-alternatives: allow hooks before renaming files André Draszik
2019-01-14 12:56 ` [PATCH 07/12] update-alternatives: try to update FILES_${PN} when renaming a file André Draszik
2019-01-14 12:56 ` [PATCH 08/12] util-linux: one package per binary (pt 1: base_sbindir) André Draszik
2019-01-14 12:56 ` [PATCH 09/12] util-linux: one package per binary (pt 2: base_bindir) André Draszik
2019-01-14 12:56 ` [PATCH 10/12] util-linux: one package per binary (pt 3: sbindir) André Draszik
2019-01-14 12:56 ` [PATCH 11/12] util-linux: one package per binary (pt 4: bindir) André Draszik
2019-01-14 12:56 ` [PATCH 12/12] utils-linux: final cleanup André Draszik
2019-01-15 14:45 ` [PATCH v2 00/12] util-linux: one package per binary André Draszik
2019-01-15 14:45 ` [PATCH v2 01/15] util-linux: simplify version upgrades (MAJOR_VERSION) André Draszik
2019-01-15 14:45 ` [PATCH v2 02/15] util-linux: remove erroneous patch (qsort_r) André Draszik
2019-01-15 14:45 ` [PATCH v2 03/15] util-linux: remove minix remnants André Draszik
2019-01-15 14:45 ` [PATCH v2 04/15] util-linux: be more explicit about what files go into packages André Draszik
2019-01-15 14:45 ` [PATCH v2 05/15] util-linux: fix the su and runuser packages André Draszik
2019-01-15 14:45 ` [PATCH v2 06/15] update-alternatives: allow hooks before renaming files André Draszik
2019-01-15 16:45 ` Richard Purdie
2019-01-16 11:40 ` André Draszik
2019-01-15 14:45 ` [PATCH v2 07/15] update-alternatives: try to update FILES_${PN} when renaming a file André Draszik
2019-01-15 14:45 ` [PATCH v2 08/15] util-linux: one package per binary (pt 1: base_sbindir) André Draszik
2019-01-15 14:45 ` [PATCH v2 09/15] util-linux: one package per binary (pt 2: base_bindir) André Draszik
2019-01-15 14:45 ` [PATCH v2 10/15] util-linux: one package per binary (pt 3: sbindir) André Draszik
2019-01-15 14:45 ` [PATCH v2 11/15] util-linux: one package per binary (pt 4: bindir) André Draszik
2019-01-15 14:45 ` [PATCH v2 12/15] util-linux: simplify meta-package RDEPENDS / RRECOMMENDS André Draszik
2019-01-15 14:45 ` [PATCH v2 13/15] util-linux: move /etc/default/mountall into -mount subpackage André Draszik
2019-01-15 14:45 ` [PATCH v2 14/15] util-linux: let -ptest package depend on all of util-linux André Draszik
2019-01-15 14:45 ` [PATCH v2 15/15] utils-linux: final cleanup André Draszik
2019-01-16 12:00 ` [PATCH v3 00/12] util-linux: one package per binary André Draszik
2019-01-16 12:00 ` [PATCH v3 01/15] util-linux: simplify version upgrades (MAJOR_VERSION) André Draszik
2019-01-16 12:00 ` [PATCH v3 02/15] util-linux: remove erroneous patch (qsort_r) André Draszik
2019-01-16 12:00 ` [PATCH v3 03/15] util-linux: remove minix remnants André Draszik
2019-01-16 12:00 ` [PATCH v3 04/15] util-linux: be more explicit about what files go into packages André Draszik
2019-01-16 12:00 ` [PATCH v3 05/15] util-linux: fix the su and runuser packages André Draszik
2019-01-16 12:00 ` [PATCH v3 06/15] update-alternatives: convert file renames to PACKAGE_PREPROCESS_FUNCS André Draszik
2019-01-16 12:17 ` Richard Purdie
2019-01-16 12:00 ` [PATCH v3 07/15] update-alternatives: try to update FILES_${PN} when renaming a file André Draszik
2019-01-16 12:18 ` Richard Purdie
2019-01-16 12:00 ` [PATCH v3 08/15] util-linux: one package per binary (pt 1: base_sbindir) André Draszik
2019-01-16 12:00 ` [PATCH v3 09/15] util-linux: one package per binary (pt 2: base_bindir) André Draszik
2019-01-16 12:00 ` [PATCH v3 10/15] util-linux: one package per binary (pt 3: sbindir) André Draszik
2019-01-16 12:00 ` [PATCH v3 11/15] util-linux: one package per binary (pt 4: bindir) André Draszik
2019-01-16 12:00 ` [PATCH v3 12/15] util-linux: simplify meta-package RDEPENDS / RRECOMMENDS André Draszik
2019-01-16 12:00 ` [PATCH v3 13/15] util-linux: move /etc/default/mountall into -mount subpackage André Draszik
2019-01-16 12:00 ` [PATCH v3 14/15] util-linux: let -ptest package depend on all of util-linux André Draszik
2019-01-16 12:00 ` [PATCH v3 15/15] utils-linux: final cleanup André Draszik
2019-01-16 12:02 ` [PATCH v3 00/12] util-linux: one package per binary André Draszik
2019-01-16 12:51 ` [PATCH v4 " André Draszik
2019-01-16 12:51 ` [PATCH v4 01/15] util-linux: simplify version upgrades (MAJOR_VERSION) André Draszik
2019-01-16 12:51 ` [PATCH v4 02/15] util-linux: remove erroneous patch (qsort_r) André Draszik
2019-01-16 12:51 ` [PATCH v4 03/15] util-linux: remove minix remnants André Draszik
2019-01-16 12:51 ` [PATCH v4 04/15] util-linux: be more explicit about what files go into packages André Draszik
2019-01-16 12:51 ` [PATCH v4 05/15] util-linux: fix the su and runuser packages André Draszik
2019-01-16 12:51 ` [PATCH v4 06/15] update-alternatives: convert file renames to PACKAGE_PREPROCESS_FUNCS André Draszik
2019-01-16 12:51 ` [PATCH v4 07/15] update-alternatives: try to update FILES_${PN} when renaming a file André Draszik
2019-01-16 12:51 ` [PATCH v4 08/15] util-linux: one package per binary (pt 1: base_sbindir) André Draszik
2019-01-16 12:51 ` [PATCH v4 09/15] util-linux: one package per binary (pt 2: base_bindir) André Draszik
2019-01-16 12:51 ` [PATCH v4 10/15] util-linux: one package per binary (pt 3: sbindir) André Draszik
2019-01-16 12:51 ` [PATCH v4 11/15] util-linux: one package per binary (pt 4: bindir) André Draszik
2019-01-16 12:51 ` [PATCH v4 12/15] util-linux: simplify meta-package RDEPENDS / RRECOMMENDS André Draszik
2019-01-16 12:51 ` [PATCH v4 13/15] util-linux: move /etc/default/mountall into -mount subpackage André Draszik
2019-01-16 12:51 ` [PATCH v4 14/15] util-linux: let -ptest package depend on all of util-linux André Draszik
2019-01-16 12:51 ` [PATCH v4 15/15] utils-linux: final cleanup André Draszik
2019-01-29 9:09 ` [PATCH v4 00/12] util-linux: one package per binary André Draszik
2019-02-01 7:32 ` Richard Purdie
2019-02-02 10:02 ` André Draszik
2019-02-04 10:09 ` André Draszik
2019-02-04 11:53 ` André Draszik
2019-02-04 12:39 ` Richard Purdie
2019-02-04 10:05 ` [PATCH v5 00/11] " André Draszik
2019-02-04 10:05 ` [PATCH v5 01/11] util-linux: be more explicit about what files go into packages André Draszik
2019-02-04 10:05 ` [PATCH v5 02/11] util-linux: fix the su and runuser packages André Draszik
2019-02-04 10:05 ` [PATCH v5 03/11] util-linux: one package per binary (pt 1: base_sbindir) André Draszik
2019-02-04 10:05 ` [PATCH v5 04/11] util-linux: one package per binary (pt 1b: symlinks) André Draszik
2019-02-04 10:05 ` [PATCH v5 05/11] util-linux: one package per binary (pt 2: base_bindir) André Draszik
2019-02-04 10:05 ` [PATCH v5 06/11] util-linux: one package per binary (pt 3: sbindir) André Draszik
2019-02-04 10:05 ` [PATCH v5 07/11] util-linux: one package per binary (pt 4: bindir) André Draszik
2019-02-04 10:05 ` [PATCH v5 08/11] util-linux: simplify meta-package RDEPENDS / RRECOMMENDS André Draszik
2019-02-04 10:05 ` [PATCH v5 09/11] util-linux: move /etc/default/mountall into -mount subpackage André Draszik
2019-02-04 10:05 ` [PATCH v5 10/11] util-linux: let -ptest package depend on all of util-linux André Draszik
2019-02-04 10:05 ` [PATCH v5 11/11] util-linux: final cleanup André Draszik
2019-02-05 2:32 ` [PATCH v6 00/13] util-linux: one package per binary André Draszik
2019-02-05 2:32 ` [PATCH v6 01/13] update-alternatives: correctly escape PATHs when updating FILES_${PN} André Draszik
2019-02-05 2:32 ` [PATCH v6 02/13] util-linux: be more explicit about what files go into packages André Draszik
2019-02-05 2:32 ` [PATCH v6 03/13] util-linux: fix the su and runuser packages André Draszik
2019-02-05 2:32 ` [PATCH v6 04/13] util-linux: fix packaging nativesdk-util-linux-lib* André Draszik
2019-02-05 2:32 ` [PATCH v6 05/13] util-linux: one package per binary (pt 1: base_sbindir) André Draszik
2019-02-05 2:32 ` [PATCH v6 06/13] util-linux: one package per binary (pt 1b: symlinks) André Draszik
2019-02-05 2:32 ` [PATCH v6 07/13] util-linux: one package per binary (pt 2: base_bindir) André Draszik
2019-02-05 2:32 ` [PATCH v6 08/13] util-linux: one package per binary (pt 3: sbindir) André Draszik
2019-02-05 2:32 ` [PATCH v6 09/13] util-linux: one package per binary (pt 4: bindir) André Draszik
2019-02-05 2:32 ` [PATCH v6 10/13] util-linux: simplify meta-package RDEPENDS / RRECOMMENDS André Draszik
2019-02-05 2:32 ` [PATCH v6 11/13] util-linux: move /etc/default/mountall into -mount subpackage André Draszik
2019-02-05 2:32 ` [PATCH v6 12/13] util-linux: let -ptest package depend on all of util-linux André Draszik
2019-02-05 2:32 ` [PATCH v6 13/13] util-linux: final cleanup André Draszik
2019-02-21 21:08 ` Burton, Ross
2019-02-23 12:11 ` Richard Purdie
2019-02-05 8:09 ` [PATCH v6 00/13] util-linux: one package per binary André Draszik
2019-02-05 18:26 ` Richard Purdie
2019-02-08 12:08 ` André Draszik
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.