...that circular UTIL_LINUX_NG dependency needs to be yet solved...
---
rules/libuuid.in | 4 ++--
rules/util-linux-ng.in | 11 +++++++++++
rules/util-linux-ng.make | 5 ++++-
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/rules/libuuid.in b/rules/libuuid.in
index f14106044..022e4b39e 100644
--- a/rules/libuuid.in
+++ b/rules/libuuid.in
@@ -3,8 +3,8 @@
config LIBUUID
tristate
select VIRTUAL
- select UTIL_LINUX_NG
- select UTIL_LINUX_NG_LIBUUID
+# select UTIL_LINUX_NG
+# select UTIL_LINUX_NG_LIBUUID
help
Helper to select the target packet containing a recent libuuid.so
library and its header.
diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in
index 4f230bc60..81e11b287 100644
--- a/rules/util-linux-ng.in
+++ b/rules/util-linux-ng.in
@@ -7,6 +7,7 @@ menuconfig UTIL_LINUX_NG
select UTIL_LINUX_NG_LIBBLKID
select UTIL_LINUX_NG_LIBUUID if UTIL_LINUX_NG_MKSWAP_UUID
select NCURSES if UTIL_LINUX_NG_USES_NCURSES
+ select PAM if UTIL_LINUX_NG_LOGIN
if UTIL_LINUX_NG
@@ -441,4 +442,14 @@ config UTIL_LINUX_NG_LSCPU
help
lscpu shows information about the CPU architecture
+config UTIL_LINUX_NG_LOGIN
+ bool
+ depends on !BUSYBOX_LOGIN || ALLYES
+ prompt "login"
+ help
+ ...
+
+comment "BusyBox' login is selected!"
+ depends on BUSYBOX_LOGIN
+
endif
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index cda06a4a6..cc09e13d3 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -115,7 +115,7 @@ UTIL_LINUX_NG_CONF_OPT := \
--disable-chfn-chsh-password \
--disable-chfn-chsh \
--disable-chsh-only-listed \
- --disable-login \
+ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LOGIN)-login \
--disable-login-chown-vcs \
--disable-login-stat-mail \
--disable-nologin \
@@ -312,6 +312,9 @@ endif
ifdef PTXCONF_UTIL_LINUX_NG_LSCPU
@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/lscpu)
endif
+ifdef PTXCONF_UTIL_LINUX_NG_LOGIN
+ @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/login)
+endif
@$(call install_finish, util-linux-ng)
--
2.24.0
_______________________________________________
ptxdist mailing list
[email protected]
