summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2019-02-05 02:32:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-12 14:04:30 +0000
commit7676025942b5b4d1a6a059afb314b9863b10784a (patch)
treef5a830ffced8b33b8cd563096b3cf2a79ff38f09
parentdff0b49e7fccfdd1520f149cf51169431e1783ed (diff)
downloadpoky-7676025942b5b4d1a6a059afb314b9863b10784a.tar.gz
util-linux: fix packaging nativesdk-util-linux-lib*
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] (From OE-Core rev: e2a6b316651412054af1dbddfb25ab980249f85d) Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc31
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.32.1.bb9
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
43PACKAGES_DYNAMIC = "^util-linux-lib.*" 43PACKAGES_DYNAMIC = "^util-linux-lib.*"
44 44
45SHARED_EXTRA_OECONF = "--disable-use-tty-group \ 45CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms"
46 --disable-makeinstall-chown \ 46UTIL_LINUX_LIBDIR = "${libdir}"
47 --enable-kill --enable-last --enable-mesg --enable-partx \ 47UTIL_LINUX_LIBDIR_class-target = "${base_libdir}"
48 --enable-raw --enable-rfkill --disable-login \ 48EXTRA_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
56EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}"
57
58PACKAGECONFIG_class-target ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" 65PACKAGECONFIG_class-target ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
59PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," 66PACKAGECONFIG[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"
309BBCLASSEXTEND = "native nativesdk" 316BBCLASSEXTEND = "native nativesdk"
310 317
311python populate_packages_prepend() { 318python 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"
12SRC_URI[md5sum] = "9e5b1b8c1dc99455bdb6b462cf9436d9" 12SRC_URI[md5sum] = "9e5b1b8c1dc99455bdb6b462cf9436d9"
13SRC_URI[sha256sum] = "86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2" 13SRC_URI[sha256sum] = "86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2"
14
15CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms"
16
17EXTRA_OECONF_class-native = "${SHARED_EXTRA_OECONF} \
18 --disable-use-tty-group \
19"
20EXTRA_OECONF_class-nativesdk = "${SHARED_EXTRA_OECONF} \
21 --disable-use-tty-group \
22"