From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from eddie.linux-mips.org ([148.251.95.138] helo=cvs.linux-mips.org) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1iw0AD-0005R3-NK for ptxdist@pengutronix.de; Mon, 27 Jan 2020 09:54:34 +0100 Received: (from localhost user: 'ladis' uid#1021 fake: STDIN (ladis@eddie.linux-mips.org)) by eddie.linux-mips.org id S23992512AbgA0IydcoTYK (ORCPT ); Mon, 27 Jan 2020 09:54:33 +0100 Date: Mon, 27 Jan 2020 09:54:32 +0100 From: Ladislav Michl Message-ID: <20200127085432.GE901743@lenoch> References: <20200127085111.GA901743@lenoch> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200127085111.GA901743@lenoch> Subject: [ptxdist] [PATCH v2 4/4] util-linux: optionally build login program List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Signed-off-by: Ladislav Michl --- Changes: -v2: Avoid conflicting with Busybox and shadow. rules/util-linux-ng.in | 19 +++++++++++++++++++ rules/util-linux-ng.make | 5 ++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in index 4f230bc60..9c139be6b 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_USES_PAM if UTIL_LINUX_NG @@ -32,6 +33,9 @@ config UTIL_LINUX_NG_FDISKS config UTIL_LINUX_NG_USES_NCURSES bool +config UTIL_LINUX_NG_USES_PAM + bool + config UTIL_LINUX_NG_PARTX_TOOLS select UTIL_LINUX_NG_LIBBLKID select UTIL_LINUX_NG_LIBSMARTCOLS @@ -441,4 +445,19 @@ config UTIL_LINUX_NG_LSCPU help lscpu shows information about the CPU architecture +config UTIL_LINUX_NG_LOGIN + bool + select UTIL_LINUX_NG_USES_PAM + depends on GLOBAL_PAM && ((!BUSYBOX_LOGIN && !SHADOW) || ALLYES) + prompt "login" + help + The login program is used to establish a new session with + the system. + +comment "BusyBox' login is selected!" + depends on BUSYBOX_LOGIN + +comment "Shadow package is selected!" + depends on SHADOW + 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.25.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de