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>
This commit is contained in:
parent
b472553fa3
commit
b5c49e6032
|
@ -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-*.*"
|
||||
|
|
Loading…
Reference in New Issue