diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 31 | ||||
-rw-r--r-- | meta/recipes-core/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 | |||
42 | 42 | ||
43 | PACKAGES_DYNAMIC = "^util-linux-lib.*" | 43 | PACKAGES_DYNAMIC = "^util-linux-lib.*" |
44 | 44 | ||
45 | SHARED_EXTRA_OECONF = "--disable-use-tty-group \ | 45 | CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" |
46 | --disable-makeinstall-chown \ | 46 | UTIL_LINUX_LIBDIR = "${libdir}" |
47 | --enable-kill --enable-last --enable-mesg --enable-partx \ | 47 | UTIL_LINUX_LIBDIR_class-target = "${base_libdir}" |
48 | --enable-raw --enable-rfkill --disable-login \ | 48 | EXTRA_OECONF = "\ |
49 | --disable-vipw --disable-newgrp --disable-chfn-chsh \ | 49 | --enable-libuuid --enable-libblkid \ |
50 | --enable-write --enable-mount --enable-unshare \ | 50 | \ |
51 | --enable-libuuid --enable-libblkid --enable-fsck \ | 51 | --enable-fsck --enable-kill --enable-last --enable-mesg \ |
52 | --disable-minix --disable-bfs --without-udev \ | 52 | --enable-mount --enable-partx --enable-raw --enable-rfkill \ |
53 | usrsbin_execdir='${sbindir}' \ | 53 | --enable-unshare --enable-write \ |
54 | \ | ||
55 | --disable-bfs --disable-chfn-chsh --disable-login \ | ||
56 | --disable-makeinstall-chown --disable-minix --disable-newgrp \ | ||
57 | --disable-use-tty-group --disable-vipw \ | ||
58 | \ | ||
59 | --without-udev \ | ||
60 | \ | ||
61 | usrsbin_execdir='${sbindir}' \ | ||
62 | --libdir='${UTIL_LINUX_LIBDIR}' \ | ||
54 | " | 63 | " |
55 | 64 | ||
56 | EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}" | ||
57 | |||
58 | PACKAGECONFIG_class-target ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" | 65 | PACKAGECONFIG_class-target ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" |
59 | PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," | 66 | PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," |
60 | 67 | ||
@@ -309,7 +316,7 @@ ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" | |||
309 | BBCLASSEXTEND = "native nativesdk" | 316 | BBCLASSEXTEND = "native nativesdk" |
310 | 317 | ||
311 | python populate_packages_prepend() { | 318 | python populate_packages_prepend() { |
312 | do_split_packages(d, '${base_libdir}', r'^lib(.*)\.so\..*$', | 319 | do_split_packages(d, d.getVar('UTIL_LINUX_LIBDIR'), r'^lib(.*)\.so\..*$', |
313 | output_pattern='util-linux-lib%s', | 320 | output_pattern='util-linux-lib%s', |
314 | description='util-linux lib%s', | 321 | description='util-linux lib%s', |
315 | extra_depends='', prepend=True, allow_links=True) | 322 | 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 \ | |||
11 | " | 11 | " |
12 | SRC_URI[md5sum] = "9e5b1b8c1dc99455bdb6b462cf9436d9" | 12 | SRC_URI[md5sum] = "9e5b1b8c1dc99455bdb6b462cf9436d9" |
13 | SRC_URI[sha256sum] = "86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2" | 13 | SRC_URI[sha256sum] = "86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2" |
14 | |||
15 | CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" | ||
16 | |||
17 | EXTRA_OECONF_class-native = "${SHARED_EXTRA_OECONF} \ | ||
18 | --disable-use-tty-group \ | ||
19 | " | ||
20 | EXTRA_OECONF_class-nativesdk = "${SHARED_EXTRA_OECONF} \ | ||
21 | --disable-use-tty-group \ | ||
22 | " | ||