diff options
Diffstat (limited to 'poky/meta/recipes-core/util-linux')
-rw-r--r-- | poky/meta/recipes-core/util-linux/util-linux-libuuid_2.37.1.bb (renamed from poky/meta/recipes-core/util-linux/util-linux-libuuid_2.37.bb) | 2 | ||||
-rw-r--r-- | poky/meta/recipes-core/util-linux/util-linux.inc | 19 | ||||
-rw-r--r-- | poky/meta/recipes-core/util-linux/util-linux/0001-login-fix-close_range-use.patch | 62 | ||||
-rw-r--r-- | poky/meta/recipes-core/util-linux/util-linux/8a3a74160b96498d672e3652827aa7e6d7f3a120.patch | 29 | ||||
-rw-r--r-- | poky/meta/recipes-core/util-linux/util-linux/tests-blkdiscard.patch | 31 | ||||
-rw-r--r-- | poky/meta/recipes-core/util-linux/util-linux/tests-eject.patch | 56 | ||||
-rw-r--r-- | poky/meta/recipes-core/util-linux/util-linux/tests-kill.patch | 88 | ||||
-rw-r--r-- | poky/meta/recipes-core/util-linux/util-linux/tests-lscpu.patch | 42 | ||||
-rw-r--r-- | poky/meta/recipes-core/util-linux/util-linux/tests-ul.patch | 35 | ||||
-rw-r--r-- | poky/meta/recipes-core/util-linux/util-linux_2.37.1.bb (renamed from poky/meta/recipes-core/util-linux/util-linux_2.37.bb) | 86 |
10 files changed, 50 insertions, 400 deletions
diff --git a/poky/meta/recipes-core/util-linux/util-linux-libuuid_2.37.bb b/poky/meta/recipes-core/util-linux/util-linux-libuuid_2.37.1.bb index 9612c491c..5d759aed9 100644 --- a/poky/meta/recipes-core/util-linux/util-linux-libuuid_2.37.bb +++ b/poky/meta/recipes-core/util-linux/util-linux-libuuid_2.37.1.bb @@ -9,7 +9,7 @@ S = "${WORKDIR}/util-linux-${PV}" EXTRA_OECONF += "--disable-all-programs --enable-libuuid" LICENSE = "BSD-3-Clause" -do_install_append() { +do_install:append() { rm -rf ${D}${datadir} ${D}${bindir} ${D}${base_bindir} ${D}${sbindir} ${D}${base_sbindir} ${D}${exec_prefix}/sbin } diff --git a/poky/meta/recipes-core/util-linux/util-linux.inc b/poky/meta/recipes-core/util-linux/util-linux.inc index 0648366ba..a76fb9e50 100644 --- a/poky/meta/recipes-core/util-linux/util-linux.inc +++ b/poky/meta/recipes-core/util-linux/util-linux.inc @@ -7,10 +7,10 @@ disk partitioning, kernel message management, filesystem creation, and system lo SECTION = "base" LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause" -LICENSE_${PN}-libblkid = "LGPLv2.1+" -LICENSE_${PN}-libfdisk = "LGPLv2.1+" -LICENSE_${PN}-libmount = "LGPLv2.1+" -LICENSE_${PN}-libsmartcols = "LGPLv2.1+" +LICENSE:${PN}-libblkid = "LGPLv2.1+" +LICENSE:${PN}-libfdisk = "LGPLv2.1+" +LICENSE:${PN}-libmount = "LGPLv2.1+" +LICENSE:${PN}-libsmartcols = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ @@ -25,7 +25,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da file://libsmartcols/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ " -FILESEXTRAPATHS_prepend := "${THISDIR}/util-linux:" +FILESEXTRAPATHS:prepend := "${THISDIR}/util-linux:" MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ file://configure-sbindir.patch \ @@ -35,13 +35,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://run-ptest \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ - file://8a3a74160b96498d672e3652827aa7e6d7f3a120.patch \ - file://tests-kill.patch \ - file://tests-blkdiscard.patch \ - file://tests-ul.patch \ - file://tests-eject.patch \ - file://tests-lscpu.patch \ - file://0001-login-fix-close_range-use.patch \ " -SRC_URI[sha256sum] = "bd07b7e98839e0359842110525a3032fdb8eaf3a90bedde3dd1652d32d15cce5" +SRC_URI[sha256sum] = "8e4bd42053b726cf86eb4d13a73bc1d9225a2c2e1a2e0d2a891f1020f83e6b76" diff --git a/poky/meta/recipes-core/util-linux/util-linux/0001-login-fix-close_range-use.patch b/poky/meta/recipes-core/util-linux/util-linux/0001-login-fix-close_range-use.patch deleted file mode 100644 index 7a47597bd..000000000 --- a/poky/meta/recipes-core/util-linux/util-linux/0001-login-fix-close_range-use.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 76ae0badd3fd7c8653fa4d3c78d2dcfcec51d23d Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Wed, 14 Jul 2021 17:25:57 +0200 -Subject: [PATCH] login: fix close_range() use - -This new syscall comes with three arguments (see kernel commit -278a5fbaed89dacd04e9d052f4594ffd0e0585de). Not sure why util-linux -assume only two. - -Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/b8d99a618baffb4fc03cda4c40e29778b6d77ad4] -Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1981729 -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - include/fileutils.h | 4 ++-- - lib/fileutils.c | 2 +- - login-utils/login.c | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/include/fileutils.h b/include/fileutils.h -index ad54b95..f86426b 100644 ---- a/include/fileutils.h -+++ b/include/fileutils.h -@@ -82,9 +82,9 @@ static inline struct dirent *xreaddir(DIR *dp) - # if defined(SYS_close_range) - # include <sys/types.h> - # ifndef HAVE_CLOSE_RANGE --static inline int close_range(unsigned int first, unsigned int last) -+static inline int close_range(unsigned int first, unsigned int last, int flags) - { -- return syscall(SYS_close_range, first, last); -+ return syscall(SYS_close_range, first, last, flags); - } - # endif - # define HAVE_CLOSE_RANGE 1 -diff --git a/lib/fileutils.c b/lib/fileutils.c -index 846b718..a979b03 100644 ---- a/lib/fileutils.c -+++ b/lib/fileutils.c -@@ -189,7 +189,7 @@ int main(int argc, char *argv[]) - ignore_result( dup(STDIN_FILENO) ); - - # ifdef HAVE_CLOSE_RANGE -- close_range(STDERR_FILENO + 1, ~0U); -+ close_range(STDERR_FILENO + 1, ~0U, 0); - # else - ul_close_all_fds(STDERR_FILENO + 1, ~0U); - # endif -diff --git a/login-utils/login.c b/login-utils/login.c -index 7fefd05..94a042d 100644 ---- a/login-utils/login.c -+++ b/login-utils/login.c -@@ -1358,7 +1358,7 @@ static void initialize(int argc, char **argv, struct login_context *cxt) - #endif - } - #ifdef HAVE_CLOSE_RANGE -- close_range(STDERR_FILENO + 1, ~0U); -+ close_range(STDERR_FILENO + 1, ~0U, 0); - #else - ul_close_all_fds(STDERR_FILENO + 1, ~0U); - #endif --- -2.32.0 diff --git a/poky/meta/recipes-core/util-linux/util-linux/8a3a74160b96498d672e3652827aa7e6d7f3a120.patch b/poky/meta/recipes-core/util-linux/util-linux/8a3a74160b96498d672e3652827aa7e6d7f3a120.patch deleted file mode 100644 index a5bb00ab6..000000000 --- a/poky/meta/recipes-core/util-linux/util-linux/8a3a74160b96498d672e3652827aa7e6d7f3a120.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8a3a74160b96498d672e3652827aa7e6d7f3a120 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Tue, 15 Jun 2021 12:04:43 +0200 -Subject: [PATCH] mkswap: fix holes detection (infinite loop and/or - stack-buffer-underflow) - -Reported-by: Brian Lane <bcl@redhat.com> -Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1971877 -Fix: https://github.com/karelzak/util-linux/issues/1348 -Signed-off-by: Karel Zak <kzak@redhat.com> -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - disk-utils/mkswap.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c -index 27374fd72..c45a3a317 100644 ---- a/disk-utils/mkswap.c -+++ b/disk-utils/mkswap.c -@@ -267,6 +267,8 @@ static void check_extents(struct mkswap_control *ctl) - return; - - n = fiemap->fm_mapped_extents; -+ if (n == 0) -+ break; - - for (i = 0; i < n; i++) { - struct fiemap_extent *e = &fiemap->fm_extents[i]; diff --git a/poky/meta/recipes-core/util-linux/util-linux/tests-blkdiscard.patch b/poky/meta/recipes-core/util-linux/util-linux/tests-blkdiscard.patch deleted file mode 100644 index 34b07a4b2..000000000 --- a/poky/meta/recipes-core/util-linux/util-linux/tests-blkdiscard.patch +++ /dev/null @@ -1,31 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From 45fe65d934df2c938701f1c3cd3e0a6f3bdf25e6 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@arm.com> -Date: Tue, 29 Jun 2021 18:10:40 +0100 -Subject: [PATCH] tests/blkdiscard: check correct log file for errors - -When checking if the discard ioctl is supported, look in stderr not stdout. - -Signed-off-by: Ross Burton <ross.burton@arm.com> ---- - tests/ts/blkdiscard/offsets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/ts/blkdiscard/offsets b/tests/ts/blkdiscard/offsets -index 9dddc35e2..5e724d51b 100755 ---- a/tests/ts/blkdiscard/offsets -+++ b/tests/ts/blkdiscard/offsets -@@ -48,7 +48,7 @@ ts_log "testing offsets with full block size" - run_tscmd $TS_CMD_BLKDISCARD -v $DEVICE - if [ "$?" != "0" ]; then - # Skip the rest? For example loop backing files on NFS seem unsupported. -- grep -q "BLKDISCARD ioctl failed: Operation not supported" "$TS_OUTPUT" \ -+ grep -q "BLKDISCARD ioctl failed: Operation not supported" "$TS_ERRLOG" \ - && ts_skip "BLKDISCARD not supported" - fi - run_tscmd $TS_CMD_BLKDISCARD -v -o 1 $DEVICE --- -2.25.1 - diff --git a/poky/meta/recipes-core/util-linux/util-linux/tests-eject.patch b/poky/meta/recipes-core/util-linux/util-linux/tests-eject.patch deleted file mode 100644 index 51e914d56..000000000 --- a/poky/meta/recipes-core/util-linux/util-linux/tests-eject.patch +++ /dev/null @@ -1,56 +0,0 @@ -Upstream-Status: Submitted [https://github.com/karelzak/util-linux/pull/1375] -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From dd956268ba89fc1caf83c45c3c495f34d261e0e2 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@arm.com> -Date: Thu, 1 Jul 2021 20:44:31 +0100 -Subject: [PATCH] test/eject: guard asan LD_PRELOAD with use-system-commands - check - -This test tries to add asan to LD_PRELOAD because the just-built eject -will call the host /bin/umount, and apparently asan doesn't like this. - -However, if ldd isn't present, this fails as the path to asan is the -error message saying that ldd isn't present. - -As the asan workaround is only needed when executing the binaries that -have just been built and not the system binaries, only use it if the -test is on the built binaries. - -Closes #1373. - -Signed-off-by: Ross Burton <ross.burton@arm.com> ---- - tests/ts/eject/umount | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -diff --git a/tests/ts/eject/umount b/tests/ts/eject/umount -index a829d46c0..2be281ee3 100755 ---- a/tests/ts/eject/umount -+++ b/tests/ts/eject/umount -@@ -60,13 +60,15 @@ function deinit_device { - ts_scsi_debug_rmmod - } - --# As the eject binary execl()s an uninstrumented /bin/umount binary, we need --# to explicitly $LD_PRELOAD the ASan's runtime DSO, otherwise ASan will complain. --# Since all three utilities used by this test (eject, fdisk, mount) are just --# libtool wrappers, let's check the kill binary instead, which should have --# the needed DSO information. --ASAN_RT_PATH="$(ts_get_asan_rt_path "$TS_CMD_KILL")" --[ -n "$ASAN_RT_PATH" ] && export LD_PRELOAD="$ASAN_RT_PATH:$LD_PRELOAD" -+if [ "$TS_USE_SYSTEM_COMMANDS" != "yes" ]; then -+ # As the eject binary execl()s an uninstrumented /bin/umount binary, we need -+ # to explicitly $LD_PRELOAD the ASan's runtime DSO, otherwise ASan will complain. -+ # Since all three utilities used by this test (eject, fdisk, mount) are just -+ # libtool wrappers, let's check the kill binary instead, which should have -+ # the needed DSO information. -+ ASAN_RT_PATH="$(ts_get_asan_rt_path "$TS_CMD_KILL")" -+ [ -n "$ASAN_RT_PATH" ] && export LD_PRELOAD="$ASAN_RT_PATH:$LD_PRELOAD" -+fi - - ts_init_subtest "by-disk" - init_device --- -2.25.1 - diff --git a/poky/meta/recipes-core/util-linux/util-linux/tests-kill.patch b/poky/meta/recipes-core/util-linux/util-linux/tests-kill.patch deleted file mode 100644 index fa49fd414..000000000 --- a/poky/meta/recipes-core/util-linux/util-linux/tests-kill.patch +++ /dev/null @@ -1,88 +0,0 @@ -Don't hardcode the use of /bin/kill, as this could be kill.procps. Instead ask -the shell what kill binary to use, which will be the symlink in -/usr/lib/util-linux/ptest/bin/. - -Upstream-Status: Backport [https://github.com/karelzak/util-linux/pull/1367] -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From e3f8a88cf688dffacb5f6033a8d24e2db40f75f6 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@arm.com> -Date: Tue, 29 Jun 2021 16:34:20 +0100 -Subject: [PATCH] Don't hardcode /bin - ---- - tests/ts/kill/all_processes | 2 +- - tests/ts/kill/name_to_number | 2 +- - tests/ts/kill/options | 2 +- - tests/ts/kill/print_pid | 2 +- - tests/ts/kill/queue | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/tests/ts/kill/all_processes b/tests/ts/kill/all_processes -index 0b137574d..b2280777f 100755 ---- a/tests/ts/kill/all_processes -+++ b/tests/ts/kill/all_processes -@@ -22,7 +22,7 @@ ts_skip_nonroot - - # make sure we do not use shell built-in command - if [ "$TS_USE_SYSTEM_COMMANDS" == "yes" ]; then -- TS_CMD_KILL="/bin/kill" -+ TS_CMD_KILL="$(which kill)" - fi - - ts_check_test_command "$TS_CMD_KILL" -diff --git a/tests/ts/kill/name_to_number b/tests/ts/kill/name_to_number -index 9f4881cb7..8a7f4bef0 100755 ---- a/tests/ts/kill/name_to_number -+++ b/tests/ts/kill/name_to_number -@@ -20,7 +20,7 @@ ts_init "$*" - - # make sure we do not use shell built-in command - if [ "$TS_USE_SYSTEM_COMMANDS" == "yes" ]; then -- TS_CMD_KILL="/bin/kill" -+ TS_CMD_KILL="$(which kill)" - fi - - ts_check_test_command "$TS_CMD_KILL" -diff --git a/tests/ts/kill/options b/tests/ts/kill/options -index 2788c70a2..10653a543 100755 ---- a/tests/ts/kill/options -+++ b/tests/ts/kill/options -@@ -20,7 +20,7 @@ ts_init "$*" - - # make sure we do not use shell built-in command - if [ "$TS_USE_SYSTEM_COMMANDS" == "yes" ]; then -- TS_CMD_KILL="/bin/kill" -+ TS_CMD_KILL="$(which kill)" - fi - - ts_check_test_command "$TS_CMD_KILL" -diff --git a/tests/ts/kill/print_pid b/tests/ts/kill/print_pid -index 6926a3714..6e2db3711 100755 ---- a/tests/ts/kill/print_pid -+++ b/tests/ts/kill/print_pid -@@ -20,7 +20,7 @@ ts_init "$*" - - # make sure we do not use shell built-in command - if [ "$TS_USE_SYSTEM_COMMANDS" == "yes" ]; then -- TS_CMD_KILL="/bin/kill" -+ TS_CMD_KILL="$(which kill)" - fi - - ts_check_test_command "$TS_CMD_KILL" -diff --git a/tests/ts/kill/queue b/tests/ts/kill/queue -index 18f10e8c2..6c9e9efc9 100755 ---- a/tests/ts/kill/queue -+++ b/tests/ts/kill/queue -@@ -20,7 +20,7 @@ ts_init "$*" - - # make sure we do not use shell built-in command - if [ "$TS_USE_SYSTEM_COMMANDS" == "yes" ]; then -- TS_CMD_KILL="/bin/kill" -+ TS_CMD_KILL="$(which kill)" - fi - - ts_check_test_command "$TS_CMD_KILL" --- -2.25.1 - diff --git a/poky/meta/recipes-core/util-linux/util-linux/tests-lscpu.patch b/poky/meta/recipes-core/util-linux/util-linux/tests-lscpu.patch deleted file mode 100644 index 36a19bd5a..000000000 --- a/poky/meta/recipes-core/util-linux/util-linux/tests-lscpu.patch +++ /dev/null @@ -1,42 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From c2ca2837a27a3f1344904037ea691bfdbb288f02 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Fri, 2 Jul 2021 13:12:13 +0200 -Subject: [PATCH] lscpu: don't use DMI if executed with --sysroot - -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - sys-utils/lscpu-arm.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/sys-utils/lscpu-arm.c b/sys-utils/lscpu-arm.c -index d52765f9d..c7128094c 100644 ---- a/sys-utils/lscpu-arm.c -+++ b/sys-utils/lscpu-arm.c -@@ -322,7 +322,8 @@ static void arm_decode(struct lscpu_cxt *cxt, struct lscpu_cputype *ct) - - arm_ids_decode(ct); - arm_rXpY_decode(ct); -- if (cxt->is_cluster) -+ -+ if (!cxt->noalive && cxt->is_cluster) - ct->nr_socket_on_cluster = get_number_of_physical_sockets_from_dmi(); - } - -@@ -330,8 +331,9 @@ static int is_cluster_arm(struct lscpu_cxt *cxt) - { - struct stat st; - -- if (!(strcmp(cxt->arch->name, "aarch64")) && -- (stat(_PATH_ACPI_PPTT, &st) < 0) && (cxt->ncputypes == 1)) -+ if (!cxt->noalive -+ && strcmp(cxt->arch->name, "aarch64") == 0 -+ && stat(_PATH_ACPI_PPTT, &st) < 0 && cxt->ncputypes == 1) - return 1; - else - return 0; --- -2.25.1 - diff --git a/poky/meta/recipes-core/util-linux/util-linux/tests-ul.patch b/poky/meta/recipes-core/util-linux/util-linux/tests-ul.patch deleted file mode 100644 index 689639310..000000000 --- a/poky/meta/recipes-core/util-linux/util-linux/tests-ul.patch +++ /dev/null @@ -1,35 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From b1c71f19ea404e74d36ca5b8fbb0484043cdaef3 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@arm.com> -Date: Wed, 30 Jun 2021 11:25:01 +0100 -Subject: [PATCH] tests: mark ul/ul as a known failure - -As with ul/basic, this test produces different output when ran under -different terminals, which isn't very useful. - -Set TS_KNOWN_FAIL so that these problems don't cause the test to fail. - -Signed-off-by: Ross Burton <ross.burton@arm.com> ---- - tests/ts/ul/ul | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/tests/ts/ul/ul b/tests/ts/ul/ul -index b856e33db..c707658ac 100755 ---- a/tests/ts/ul/ul -+++ b/tests/ts/ul/ul -@@ -20,6 +20,9 @@ ts_init "$*" - - ts_check_test_command "$TS_CMD_UL" - -+# This test provides different result on some terminals and virtual machines -+TS_KNOWN_FAIL="yes" -+ - printf "a\x08ab\x5F\x08c\\n\\ttab\\f\\b\\r" | - $TS_CMD_UL -t xterm >> $TS_OUTPUT 2>> $TS_ERRLOG - --- -2.25.1 - diff --git a/poky/meta/recipes-core/util-linux/util-linux_2.37.bb b/poky/meta/recipes-core/util-linux/util-linux_2.37.1.bb index 2548b7210..b67c3dcb5 100644 --- a/poky/meta/recipes-core/util-linux/util-linux_2.37.bb +++ b/poky/meta/recipes-core/util-linux/util-linux_2.37.1.bb @@ -10,12 +10,12 @@ PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', '${PN}-pylibmou 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) + d.appendVar('RRECOMMENDS:%s' % pn, ' %s' % pkg) - if d.getVar('ALTERNATIVE_' + pkg): + if d.getVar('ALTERNATIVE:' + pkg): return if d.getVarFlag('ALTERNATIVE_LINK_NAME', modulename): - d.setVar('ALTERNATIVE_' + pkg, modulename) + d.setVar('ALTERNATIVE:' + pkg, modulename) bindirs = sorted(list(set(d.expand("${base_sbindir} ${base_bindir} ${sbindir} ${bindir}").split()))) for dir in bindirs: @@ -41,9 +41,9 @@ python util_linux_binpackages () { pn = d.getVar('PN') for pkg, links in extras.items(): - of = d.getVar('FILES_' + pn + '-' + pkg) + of = d.getVar('FILES:' + pn + '-' + pkg) links = of + links - d.setVar('FILES_' + pn + '-' + pkg, links) + d.setVar('FILES:' + pn + '-' + pkg, links) } # we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS @@ -63,7 +63,7 @@ PACKAGES_DYNAMIC = "^${PN}-.*" CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" UTIL_LINUX_LIBDIR = "${libdir}" -UTIL_LINUX_LIBDIR_class-target = "${base_libdir}" +UTIL_LINUX_LIBDIR:class-target = "${base_libdir}" EXTRA_OECONF = "\ --enable-libuuid --enable-libblkid \ \ @@ -81,17 +81,17 @@ EXTRA_OECONF = "\ --libdir='${UTIL_LINUX_LIBDIR}' \ " -EXTRA_OECONF_append_class-target = " --enable-setpriv" -EXTRA_OECONF_append_class-native = " --without-cap-ng --disable-setpriv" -EXTRA_OECONF_append_class-nativesdk = " --without-cap-ng --disable-setpriv" -EXTRA_OECONF_append = " --disable-hwclock-gplv3" +EXTRA_OECONF:append:class-target = " --enable-setpriv" +EXTRA_OECONF:append:class-native = " --without-cap-ng --disable-setpriv" +EXTRA_OECONF:append:class-nativesdk = " --without-cap-ng --disable-setpriv" +EXTRA_OECONF:append = " --disable-hwclock-gplv3" # enable pcre2 for native/nativesdk to match host distros # this helps to keep same expectations when using the SDK or # build host versions during development # PACKAGECONFIG ?= "pcre2" -PACKAGECONFIG_class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'chfn-chsh pam', '', d)}" +PACKAGECONFIG:class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'chfn-chsh 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_system_unitdir}, --without-systemd --without-systemdsystemunitdir,systemd" @@ -106,43 +106,43 @@ PACKAGECONFIG[chfn-chsh] = "--enable-chfn-chsh,--disable-chfn-chsh," 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_${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 \ +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:${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_${PN}-blkid = "${MLPREFIX}e2fsprogs-blkid" -RREPLACES_${PN}-blkid = "${MLPREFIX}e2fsprogs-blkid" +RCONFLICTS:${PN}-blkid = "${MLPREFIX}e2fsprogs-blkid" +RREPLACES:${PN}-blkid = "${MLPREFIX}e2fsprogs-blkid" -RRECOMMENDS_${PN}_class-native = "" -RRECOMMENDS_${PN}_class-nativesdk = "" -RDEPENDS_${PN}_class-native = "" -RDEPENDS_${PN}_class-nativesdk = "" +RRECOMMENDS:${PN}:class-native = "" +RRECOMMENDS:${PN}:class-nativesdk = "" +RDEPENDS:${PN}:class-native = "" +RDEPENDS:${PN}:class-nativesdk = "" -RDEPENDS_${PN} += " util-linux-libuuid" -RDEPENDS_${PN}-dev += " util-linux-libuuid-dev" +RDEPENDS:${PN} += " util-linux-libuuid" +RDEPENDS:${PN}-dev += " util-linux-libuuid-dev" -RPROVIDES_${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev" +RPROVIDES:${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev" -RDEPENDS_${PN}-bash-completion += "${PN}-lsblk" -RDEPENDS_${PN}-ptest += "bash bc btrfs-tools coreutils e2fsprogs findutils grep iproute2 kmod mdadm procps sed socat which xz" -RRECOMMENDS_${PN}-ptest += "kernel-module-scsi-debug kernel-module-sd-mod kernel-module-loop" -RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" -ALLOW_EMPTY_${PN}-swaponoff = "1" +RDEPENDS:${PN}-bash-completion += "${PN}-lsblk" +RDEPENDS:${PN}-ptest += "bash bc btrfs-tools coreutils e2fsprogs findutils grep iproute2 kmod mdadm procps sed socat which xz" +RRECOMMENDS:${PN}-ptest += "kernel-module-scsi-debug kernel-module-sd-mod kernel-module-loop" +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" -SYSTEMD_SERVICE_${PN}-fstrim = "fstrim.timer fstrim.service" -SYSTEMD_AUTO_ENABLE_${PN}-fstrim = "disable" +SYSTEMD_SERVICE:${PN}-uuidd = "uuidd.socket uuidd.service" +SYSTEMD_AUTO_ENABLE:${PN}-uuidd = "disable" +SYSTEMD_SERVICE:${PN}-fstrim = "fstrim.timer fstrim.service" +SYSTEMD_AUTO_ENABLE:${PN}-fstrim = "disable" do_install () { # with ccache the timestamps on compiled files may @@ -181,7 +181,7 @@ do_install () { rm -f ${D}${bindir}/chkdupexe } -do_install_append_class-target () { +do_install:append:class-target () { if [ "${@bb.utils.filter('PACKAGECONFIG', 'pam', d)}" ]; then install -d ${D}${sysconfdir}/pam.d install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser @@ -194,14 +194,14 @@ do_install_append_class-target () { } # nologin causes a conflict with shadow-native # kill causes a conflict with coreutils-native (if ${bindir}==${base_bindir}) -do_install_append_class-native () { +do_install:append:class-native () { rm -f ${D}${base_sbindir}/nologin rm -f ${D}${base_bindir}/kill } # dm-verity support introduces a circular build dependency, so util-linux-libuuid is split out for target builds # Need to build libuuid for uuidgen, but then delete it and let the other recipe ship it -do_install_append () { +do_install:append () { rm -rf ${D}${includedir}/uuid ${D}${libdir}/pkgconfig/uuid.pc ${D}${libdir}/libuuid* ${D}${base_libdir}/libuuid* } @@ -222,14 +222,14 @@ 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:${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:${PN}-last = "last lastb" ALTERNATIVE_LINK_NAME[last] = "${bindir}/last" ALTERNATIVE_LINK_NAME[lastb] = "${bindir}/lastb" ALTERNATIVE_LINK_NAME[logger] = "${bindir}/logger" |