From patchwork Fri Aug 25 03:19:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 805726 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xdmcY2zxKz9t3m for ; Fri, 25 Aug 2017 13:19:57 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AC5418936D; Fri, 25 Aug 2017 03:19:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fFZssLqfnwtz; Fri, 25 Aug 2017 03:19:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 84E27891A4; Fri, 25 Aug 2017 03:19:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 0E9A31C1404 for ; Fri, 25 Aug 2017 03:19:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 082C22CAA0 for ; Fri, 25 Aug 2017 03:19:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3Cce3thkR+-0 for ; Fri, 25 Aug 2017 03:19:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.datacom.ind.br (mx.datacom.ind.br [177.66.5.10]) by silver.osuosl.org (Postfix) with ESMTPS id 02BEA2A313 for ; Fri, 25 Aug 2017 03:19:44 +0000 (UTC) Received: from mail.datacom.ind.br (localhost [127.0.0.1]) by mail.datacom.ind.br (Postfix) with ESMTPS id 6AE8B14C188F; Fri, 25 Aug 2017 00:16:18 -0300 (BRT) Received: from localhost (localhost [127.0.0.1]) by mail.datacom.ind.br (Postfix) with ESMTP id 5EA5A14C0A1C; Fri, 25 Aug 2017 00:16:18 -0300 (BRT) Received: from mail.datacom.ind.br ([127.0.0.1]) by localhost (mail.datacom.ind.br [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 6u053MJbnbaK; Fri, 25 Aug 2017 00:16:18 -0300 (BRT) Received: from p7-1130br.casantos.org (unknown [177.18.152.185]) by mail.datacom.ind.br (Postfix) with ESMTPSA id 075FA14C0683; Fri, 25 Aug 2017 00:16:17 -0300 (BRT) From: Carlos Santos To: buildroot@buildroot.org Date: Fri, 25 Aug 2017 00:19:31 -0300 Message-Id: <20170825031931.6768-1-casantos@datacom.ind.br> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170824232403.1a196068@windsurf> References: <20170824232403.1a196068@windsurf> Cc: Thomas Petazzoni Subject: [Buildroot] [PATCH v3] util-linux: add menu items for login utilities X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This change extends to the login utilities the current policy of having a selection item in the configuration menu for each utility that has an --enable/--disable knob in the "configure" script: - add selection items for login, runuser, su and sulogin (there was already an item for "last") - move "login utilities" to Config.in.legacy - make "login utilities" select last, login, runuser, su and sulogin Signed-off-by: Carlos Santos --- Changes v1->v2 - do not add section titles - deprecate the "login utilities" group Changes v2->v3 - improve comments - fix spelling errors - add comment to show when "login" is unavailable --- Config.in.legacy | 12 +++++++++++ package/util-linux/Config.in | 45 ++++++++++++++++++++++++++++------------ package/util-linux/util-linux.mk | 7 +++++-- 3 files changed, 49 insertions(+), 15 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 693dc95d74..49cab8bda9 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,18 @@ endif ############################################################################### comment "Legacy options removed in 2017.08" +config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS + bool "util-linux login utilities option removed" + select BR2_LEGACY + select BR2_PACKAGE_UTIL_LINUX_LAST + select BR2_PACKAGE_UTIL_LINUX_LOGIN + select BR2_PACKAGE_UTIL_LINUX_RUNUSER + select BR2_PACKAGE_UTIL_LINUX_SU + select BR2_PACKAGE_UTIL_LINUX_SULOGIN + help + Login utilities (last, login, runuser, su, sulogin) now have + their own configuration options in the util-linux menu. + config BR2_BINUTILS_VERSION_2_26_X bool "binutils version 2.26 support removed" select BR2_LEGACY diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index cba590c4f9..b3494af101 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -164,26 +164,25 @@ config BR2_PACKAGE_UTIL_LINUX_LINE help Read one line -config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS - bool "login utilities" - depends on BR2_USE_MMU # fork() (login, runuser, su, sulogin) - depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam - depends on !BR2_STATIC_LIBS +config BR2_PACKAGE_UTIL_LINUX_LOGGER + bool "logger" + help + Enter messages into the system log + +config BR2_PACKAGE_UTIL_LINUX_LOGIN + bool "login" + depends on BR2_ENABLE_LOCALE # linux-pam + depends on BR2_USE_WCHAR # linux-pam depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam - depends on BR2_USE_MMU # linux-pam + depends on BR2_USE_MMU # fork(), linux-pam select BR2_PACKAGE_LINUX_PAM help - Login utilities (last, login, runuser, su, sulogin) + Begin a session on the system -comment "login utilities needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" +comment "login needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL -config BR2_PACKAGE_UTIL_LINUX_LOGGER - bool "logger" - help - Enter messages into the system log - config BR2_PACKAGE_UTIL_LINUX_LOSETUP bool "losetup" depends on BR2_USE_MMU # libsmartcols @@ -296,6 +295,14 @@ config BR2_PACKAGE_UTIL_LINUX_RESET help Reset the terminal +config BR2_PACKAGE_UTIL_LINUX_RUNUSER + bool "runuser" + depends on BR2_USE_MMU # fork() + help + Run a command with substitute user and group ID (does not need + to ask for a password, because it may be executed by the root + user only) + config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS bool "scheduling utilities" help @@ -313,6 +320,18 @@ config BR2_PACKAGE_UTIL_LINUX_SETTERM help Set terminal attributes +config BR2_PACKAGE_UTIL_LINUX_SU + bool "su" + depends on BR2_USE_MMU # fork() + help + Run a command with substitute user and group ID + +config BR2_PACKAGE_UTIL_LINUX_SULOGIN + bool "sulogin" + depends on BR2_USE_MMU # fork() + help + Single-user login + config BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT bool "switch_root" depends on BR2_USE_MMU # fork() diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index fc32668869..179e55dddf 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -118,7 +118,7 @@ UTIL_LINUX_CONF_OPTS += \ $(if $(BR2_PACKAGE_UTIL_LINUX_LIBUUID),--enable-libuuid,--disable-libuuid) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LINE),--enable-line,--disable-line) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LOGGER),--enable-logger,--disable-logger) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),--enable-last --enable-login --enable-runuser --enable-su --enable-sulogin,--disable-last --disable-login --disable-runuser --disable-su --disable-sulogin) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN),--enable-login,--disable-login) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LOSETUP),--enable-losetup,--disable-losetup) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LSLOGINS),--enable-lslogins,--disable-lslogins) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LSMEM),--enable-lsmem,--disable-lsmem) \ @@ -136,9 +136,12 @@ UTIL_LINUX_CONF_OPTS += \ $(if $(BR2_PACKAGE_UTIL_LINUX_RAW),--enable-raw,--disable-raw) \ $(if $(BR2_PACKAGE_UTIL_LINUX_RENAME),--enable-rename,--disable-rename) \ $(if $(BR2_PACKAGE_UTIL_LINUX_RESET),--enable-reset,--disable-reset) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_RUNUSER),--enable-runuser,--disable-runuser) \ $(if $(BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS),--enable-schedutils,--disable-schedutils) \ $(if $(BR2_PACKAGE_UTIL_LINUX_SETPRIV),--enable-setpriv,--disable-setpriv) \ $(if $(BR2_PACKAGE_UTIL_LINUX_SETTERM),--enable-setterm,--disable-setterm) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_SU),--enable-su,--disable-su) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_SULOGIN),--enable-sulogin,--disable-sulogin) \ $(if $(BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT),--enable-switch_root,--disable-switch_root) \ $(if $(BR2_PACKAGE_UTIL_LINUX_TUNELP),--enable-tunelp,--disable-tunelp) \ $(if $(BR2_PACKAGE_UTIL_LINUX_UL),--enable-ul,--disable-ul) \ @@ -200,7 +203,7 @@ UTIL_LINUX_CONF_OPTS += --without-audit endif # Install PAM configuration files -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),y) +ifeq ($(BR2_PACKAGE_UTIL_LINUX_SU),y) define UTIL_LINUX_INSTALL_PAMFILES $(INSTALL) -m 0644 package/util-linux/su.pam \ $(TARGET_DIR)/etc/pam.d/su