From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io0-f180.google.com (mail-io0-f180.google.com [209.85.223.180]) by mail.openembedded.org (Postfix) with ESMTP id BEBE676420 for ; Tue, 28 Jul 2015 23:21:21 +0000 (UTC) Received: by ioea135 with SMTP id a135so3811700ioe.1 for ; Tue, 28 Jul 2015 16:21:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=29svm5whMIuPvGWsqDp2YmsPwZSCszc6hlu9T05pAl4=; b=xFmQ/YsTFArX7lOBP9i5brKhYNaDsTq09CycYi3OjOTOZ3FNrOqrL6+a610as7rigM WaoWTsxbhME7REWbyYUnQRfXYsTJKODNMcFnp0Q1LjEvrbQ24JgVv2LcfF/+QbyF0c5/ MaOX19p9VDDEvuOP4mPkM2SSfStWHMtxuz+6idNmRVxy1sxusFoAkXDaaomSHUbQL2aR 11dG6IEziTE8wCA/9odNIuqyckAk40F8zHSvCGnSmqfgfPoKQ0aEr3M1pOjEBTJYavYW kBAQm3VpMGmiS23NflcpuE7fkmEBUEMK2a14BWzOjiRTa9cShbCu4vHSuXCVmrt3YRpr orKw== X-Received: by 10.107.132.15 with SMTP id g15mr56081188iod.134.1438125681311; Tue, 28 Jul 2015 16:21:21 -0700 (PDT) Received: from e6520.cablelabs.com (50-204-102-64-static.hfc.comcastbusiness.net. [50.204.102.64]) by smtp.gmail.com with ESMTPSA id i7sm9668533igt.18.2015.07.28.16.21.20 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jul 2015 16:21:20 -0700 (PDT) From: Andre McCurdy To: openembedded-core@lists.openembedded.org Date: Tue, 28 Jul 2015 16:20:58 -0700 Message-Id: <1438125665-14966-2-git-send-email-armccurdy@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1438125665-14966-1-git-send-email-armccurdy@gmail.com> References: <1438125665-14966-1-git-send-email-armccurdy@gmail.com> Subject: [PATCH 1/8] busybox: merge login-utilities.cfg into defconfig X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jul 2015 23:21:23 -0000 The login-utilities.cfg busybox config fragment was added during the transition of the default login manager from tinylogin to busybox [1]. The tinylogin recipe was removed from oe-core prior to the 1.5 (dora) release [2]. Merging the config fragment into defconfig simplifies the process of keeping the oe-core busybox defconfig aligned with new releases of busybox. [1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=4207 [2] http://git.openembedded.org/openembedded-core/commit/?id=2762ff976a3473be4259889029e048ab8b3be5ab Signed-off-by: Andre McCurdy --- meta/recipes-core/busybox/busybox/defconfig | 26 +++++++++++----------- .../busybox/busybox/login-utilities.cfg | 13 ----------- meta/recipes-core/busybox/busybox_1.23.2.bb | 1 - meta/recipes-core/busybox/busybox_git.bb | 1 - 4 files changed, 13 insertions(+), 28 deletions(-) delete mode 100644 meta/recipes-core/busybox/busybox/login-utilities.cfg diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig index 468c40e..2a1706b 100644 --- a/meta/recipes-core/busybox/busybox/defconfig +++ b/meta/recipes-core/busybox/busybox/defconfig @@ -449,39 +449,39 @@ CONFIG_MESG=y # # CONFIG_ADD_SHELL is not set # CONFIG_REMOVE_SHELL is not set -# CONFIG_FEATURE_SHADOWPASSWDS is not set +CONFIG_FEATURE_SHADOWPASSWDS=y # CONFIG_USE_BB_PWD_GRP is not set # CONFIG_USE_BB_SHADOW is not set CONFIG_USE_BB_CRYPT=y # CONFIG_USE_BB_CRYPT_SHA is not set -# CONFIG_ADDUSER is not set -# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set +CONFIG_ADDUSER=y +CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y # CONFIG_FEATURE_CHECK_NAMES is not set CONFIG_FIRST_SYSTEM_ID=100 CONFIG_LAST_SYSTEM_ID=999 -# CONFIG_ADDGROUP is not set -# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set +CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y # CONFIG_FEATURE_ADDUSER_TO_GROUP is not set -# CONFIG_DELUSER is not set -# CONFIG_DELGROUP is not set +CONFIG_DELUSER=y +CONFIG_DELGROUP=y # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set -# CONFIG_GETTY is not set -# CONFIG_LOGIN is not set +CONFIG_GETTY=y +CONFIG_LOGIN=y # CONFIG_LOGIN_SESSION_AS_CHILD is not set # CONFIG_PAM is not set # CONFIG_LOGIN_SCRIPTS is not set # CONFIG_FEATURE_NOLOGIN is not set # CONFIG_FEATURE_SECURETTY is not set -# CONFIG_PASSWD is not set +CONFIG_PASSWD=y # CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set # CONFIG_CRYPTPW is not set # CONFIG_CHPASSWD is not set CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="" -# CONFIG_SU is not set +CONFIG_SU=y # CONFIG_FEATURE_SU_SYSLOG is not set # CONFIG_FEATURE_SU_CHECKS_SHELLS is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set +CONFIG_SULOGIN=y +CONFIG_VLOCK=y # # Linux Ext2 FS Progs diff --git a/meta/recipes-core/busybox/busybox/login-utilities.cfg b/meta/recipes-core/busybox/busybox/login-utilities.cfg deleted file mode 100644 index cc9b2db..0000000 --- a/meta/recipes-core/busybox/busybox/login-utilities.cfg +++ /dev/null @@ -1,13 +0,0 @@ -CONFIG_FEATURE_SHADOWPASSWDS=y -CONFIG_ADDUSER=y -CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y -CONFIG_ADDGROUP=y -CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y -CONFIG_DELUSER=y -CONFIG_DELGROUP=y -CONFIG_GETTY=y -CONFIG_LOGIN=y -CONFIG_PASSWD=y -CONFIG_SU=y -CONFIG_SULOGIN=y -CONFIG_VLOCK=y diff --git a/meta/recipes-core/busybox/busybox_1.23.2.bb b/meta/recipes-core/busybox/busybox_1.23.2.bb index 85e462e..f698c34 100644 --- a/meta/recipes-core/busybox/busybox_1.23.2.bb +++ b/meta/recipes-core/busybox/busybox_1.23.2.bb @@ -27,7 +27,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://run-ptest \ file://inetd.conf \ file://inetd \ - file://login-utilities.cfg \ file://recognize_connmand.patch \ file://busybox-cross-menuconfig.patch \ file://0001-ifconfig-fix-double-free-fatal-error-in-INET_sprint.patch \ diff --git a/meta/recipes-core/busybox/busybox_git.bb b/meta/recipes-core/busybox/busybox_git.bb index c5596d8..ce70e8a 100644 --- a/meta/recipes-core/busybox/busybox_git.bb +++ b/meta/recipes-core/busybox/busybox_git.bb @@ -33,7 +33,6 @@ SRC_URI = "git://busybox.net/busybox.git \ file://run-ptest \ file://inetd.conf \ file://inetd \ - file://login-utilities.cfg \ file://recognize_connmand.patch \ file://busybox-cross-menuconfig.patch \ file://0001-ifconfig-fix-double-free-fatal-error-in-INET_sprint.patch \ -- 1.9.1