From: Enrico Jörns Date: Mon, 28 Oct 2024 08:29:09 +0000 (+0100) Subject: busybox: disable defconfig options from login-utilities.cfg X-Git-Tag: uninative-4.7~1044 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f58193b8ecad12945e8b06d270b04d89ecbf2cd;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git busybox: disable defconfig options from login-utilities.cfg Accidentally enabled in 4335cd24 ("busybox: refresh the defconfig from 1.33.0"). Since this would also enforce wrong ID ranges due to busbox kconfig's bad handling of 'inactive' options, manually add them to the login-utilities.cfg fragment. Signed-off-by: Enrico Jörns Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig index d2a210d535b..116286227b8 100644 --- a/meta/recipes-core/busybox/busybox/defconfig +++ b/meta/recipes-core/busybox/busybox/defconfig @@ -524,41 +524,41 @@ CONFIG_INIT_TERMINAL_TYPE="" # # Login/Password Management Utilities # -CONFIG_FEATURE_SHADOWPASSWDS=y +# CONFIG_FEATURE_SHADOWPASSWDS is not set # 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_ADD_SHELL is not set # CONFIG_REMOVE_SHELL is not set -CONFIG_ADDGROUP=y +# CONFIG_ADDGROUP is not set # CONFIG_FEATURE_ADDUSER_TO_GROUP is not set -CONFIG_ADDUSER=y +# CONFIG_ADDUSER is not set # CONFIG_FEATURE_CHECK_NAMES is not set -CONFIG_LAST_ID=60000 -CONFIG_FIRST_SYSTEM_ID=100 -CONFIG_LAST_SYSTEM_ID=999 +CONFIG_LAST_ID=0 +CONFIG_FIRST_SYSTEM_ID=0 +CONFIG_LAST_SYSTEM_ID=0 # CONFIG_CHPASSWD is not set CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="" # CONFIG_CRYPTPW is not set # CONFIG_MKPASSWD is not set -CONFIG_DELUSER=y -CONFIG_DELGROUP=y +# CONFIG_DELUSER is not set +# CONFIG_DELGROUP is not set # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set -CONFIG_GETTY=y -CONFIG_LOGIN=y +# CONFIG_GETTY is not set +# CONFIG_LOGIN is not set # CONFIG_LOGIN_SESSION_AS_CHILD is not set # CONFIG_LOGIN_SCRIPTS is not set # CONFIG_FEATURE_NOLOGIN is not set # CONFIG_FEATURE_SECURETTY is not set -CONFIG_PASSWD=y +# CONFIG_PASSWD is not set # CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set -CONFIG_SU=y +# CONFIG_SU is not set # CONFIG_FEATURE_SU_SYSLOG is not set # CONFIG_FEATURE_SU_CHECKS_SHELLS is not set # CONFIG_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY is not set -CONFIG_SULOGIN=y -CONFIG_VLOCK=y +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set # # Linux Ext2 FS Progs diff --git a/meta/recipes-core/busybox/busybox/login-utilities.cfg b/meta/recipes-core/busybox/busybox/login-utilities.cfg index cc9b2db502e..8a21e806192 100644 --- a/meta/recipes-core/busybox/busybox/login-utilities.cfg +++ b/meta/recipes-core/busybox/busybox/login-utilities.cfg @@ -1,5 +1,8 @@ CONFIG_FEATURE_SHADOWPASSWDS=y CONFIG_ADDUSER=y +CONFIG_LAST_ID=60000 +CONFIG_FIRST_SYSTEM_ID=100 +CONFIG_LAST_SYSTEM_ID=999 CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y CONFIG_ADDGROUP=y CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y