diff options
| author | Saul Wold <sgw@linux.intel.com> | 2013-07-05 12:24:02 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-10 09:42:04 +0100 |
| commit | b5c49e6032a05f1c452010010f97b81d9100196f (patch) | |
| tree | f1e51860b1a8da89d93f02e58c839606c240a232 /meta/recipes-core/util-linux | |
| parent | b472553fa3668975f774fa88fb0da664c269f57d (diff) | |
| download | ast2050-yocto-poky-b5c49e6032a05f1c452010010f97b81d9100196f.zip ast2050-yocto-poky-b5c49e6032a05f1c452010010f97b81d9100196f.tar.gz | |
util-linux: Use PACKAGECONFIG to control pam and system config options
The PACKAGECONFIG will ensure consistent enabling and disabling of the pam and systemd related
options for configure and the correct dependencies
(From OE-Core rev: 7cde7c639c53724327d981cbc0db5e123607de1c)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux')
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 5bae370..d373cec 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -42,18 +42,17 @@ EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \ --disable-makeinstall-chown --enable-elvtune --enable-init \ --enable-kill --enable-last --enable-mesg --enable-partx \ --enable-raw --enable-rdev --enable-reset --disable-login \ - --disable-vipw --disable-newgrp --disable-chfn-chsh --disable-su \ + --disable-vipw --disable-newgrp --disable-chfn-chsh \ --enable-write --enable-arch --enable-mount --with-fsprobe=builtin \ --enable-libuuid --enable-libblkid --enable-fsck --without-udev \ - --disable-runuser \ usrsbin_execdir='${sbindir}' \ " +PACKAGECONFIG_class-target ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} " +PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, pam," # Respect the systemd feature for uuidd -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--enable-socket-activation', '--disable-socket-activation', d)}" -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" - -EXTRA_OECONF_append_class-native = " --disable-login --disable-su --disable-runuser" +PACKAGECONFIG[systemd] = "--enable-socket-activation --with-systemdsystemunitdir=${systemd_unitdir}/system/, --disable-socket-activation --without-systemdsystemunitdir" FILES_${PN}-bash-completion += "${datadir}/bash-completion" FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" |
