]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
shadow: use relaxed usernames for all
authorLi Zhou <li.zhou@windriver.com>
Thu, 19 Sep 2019 06:15:20 +0000 (14:15 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 2 Oct 2019 09:07:18 +0000 (10:07 +0100)
The previous commit <shadow: use relaxed usernames> works only for
target. When test with configuration:
INHERIT += 'extrausers'
EXTRA_USERS_PARAMS += "useradd -p '' aBcD; "
and run "bitbake core-image-minimal", error occurs:
NOTE: core-image-minimal: Performing useradd with [
-R .../build/tmp-glibc/work/qemux86_64-wrs-linux/core-image-minimal/1.0-r0/rootfs -p '' aBcD]
useradd: invalid user name 'aBcD'

Here move the patch for using relaxed usernames from class_target to
the source code for all.

Signed-off-by: Li Zhou <li.zhou@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-extended/shadow/shadow.inc

index 7f8ee787178f61254c715d766084e2e17d5aab06..af38b911df2efb40c1025d1acbcfc7595fb85371 100644 (file)
@@ -14,12 +14,12 @@ SRC_URI = "https://github.com/shadow-maint/shadow/releases/download/${PV}/${BP}.
            file://0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch  \
            file://0001-configure.ac-fix-configure-error-with-dash.patch \
            ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \
+           file://shadow-relaxed-usernames.patch \
            "
 
 SRC_URI_append_class-target = " \
            file://login_defs_pam.sed \
            file://shadow-update-pam-conf.patch \
-           file://shadow-relaxed-usernames.patch \
            "
 
 SRC_URI_append_class-native = " \