diff options
author | Saul Wold <sgw@linux.intel.com> | 2013-07-03 11:14:50 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-05 15:44:11 +0100 |
commit | c81855b79f3ea53cd736490ef309e0a69d920f7b (patch) | |
tree | a6336ff7891b78f2fff318fc61ffb186024837b0 | |
parent | 8846267bfbcf4158bc4b3fce0d8809913ce4f703 (diff) | |
download | poky-c81855b79f3ea53cd736490ef309e0a69d920f7b.tar.gz |
util-linux: disable runuser by default since it depends on PAM
util-linux's configure checks for pam_misc.h and if it finds it will
enable runuser, there was a case where it was found via shared state
and then got rebuilt. This makes the build more deterministic.
(From OE-Core rev: df801d65e5b55542d6bd94a179becd79d010b32a)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 0ada1a5ade..5bae370688 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -45,6 +45,7 @@ EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \ | |||
45 | --disable-vipw --disable-newgrp --disable-chfn-chsh --disable-su \ | 45 | --disable-vipw --disable-newgrp --disable-chfn-chsh --disable-su \ |
46 | --enable-write --enable-arch --enable-mount --with-fsprobe=builtin \ | 46 | --enable-write --enable-arch --enable-mount --with-fsprobe=builtin \ |
47 | --enable-libuuid --enable-libblkid --enable-fsck --without-udev \ | 47 | --enable-libuuid --enable-libblkid --enable-fsck --without-udev \ |
48 | --disable-runuser \ | ||
48 | usrsbin_execdir='${sbindir}' \ | 49 | usrsbin_execdir='${sbindir}' \ |
49 | " | 50 | " |
50 | 51 | ||
@@ -52,7 +53,7 @@ EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \ | |||
52 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--enable-socket-activation', '--disable-socket-activation', d)}" | 53 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--enable-socket-activation', '--disable-socket-activation', d)}" |
53 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" | 54 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" |
54 | 55 | ||
55 | EXTRA_OECONF_append_class-native = " --disable-login --disable-su" | 56 | EXTRA_OECONF_append_class-native = " --disable-login --disable-su --disable-runuser" |
56 | 57 | ||
57 | FILES_${PN}-bash-completion += "${datadir}/bash-completion" | 58 | FILES_${PN}-bash-completion += "${datadir}/bash-completion" |
58 | FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" | 59 | FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" |