diff options
| -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 5bae370688..d373cecdf0 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-*.*" |