diff options
Diffstat (limited to 'meta/recipes-extended/shadow')
-rw-r--r-- | meta/recipes-extended/shadow/shadow.inc | 4 | ||||
-rw-r--r-- | meta/recipes-extended/shadow/shadow_4.1.4.3.bb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index a4e9634a56..6848e054b3 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc | |||
@@ -15,7 +15,7 @@ SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ | |||
15 | file://shadow_fix_for_automake-1.12.patch \ | 15 | file://shadow_fix_for_automake-1.12.patch \ |
16 | file://shadow-4.1.3-dots-in-usernames.patch \ | 16 | file://shadow-4.1.3-dots-in-usernames.patch \ |
17 | file://shadow-4.1.4.2-env-reset-keep-locale.patch \ | 17 | file://shadow-4.1.4.2-env-reset-keep-locale.patch \ |
18 | ${@base_contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ | 18 | ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ |
19 | " | 19 | " |
20 | 20 | ||
21 | SRC_URI_append_class-target = " \ | 21 | SRC_URI_append_class-target = " \ |
@@ -81,7 +81,7 @@ PAM_PLUGINS = "libpam-runtime \ | |||
81 | pam-plugin-shells \ | 81 | pam-plugin-shells \ |
82 | pam-plugin-rootok" | 82 | pam-plugin-rootok" |
83 | 83 | ||
84 | PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" | 84 | PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" |
85 | PACKAGECONFIG_class-native = "" | 85 | PACKAGECONFIG_class-native = "" |
86 | PACKAGECONFIG_class-nativesdk = "" | 86 | PACKAGECONFIG_class-nativesdk = "" |
87 | PACKAGECONFIG[pam] = "--with-libpam,--without-libpam,libpam,${PAM_PLUGINS}" | 87 | PACKAGECONFIG[pam] = "--with-libpam,--without-libpam,libpam,${PAM_PLUGINS}" |
diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb index 43e578fe4f..5675cb8cc9 100644 --- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb +++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb | |||
@@ -2,7 +2,7 @@ require shadow.inc | |||
2 | 2 | ||
3 | # Build falsely assumes that if --enable-libpam is set, we don't need to link against | 3 | # Build falsely assumes that if --enable-libpam is set, we don't need to link against |
4 | # libcrypt. This breaks chsh. | 4 | # libcrypt. This breaks chsh. |
5 | BUILD_LDFLAGS_append_class-target = " ${@base_contains('DISTRO_FEATURES', 'pam', base_contains('DISTRO_FEATURES', 'libc-crypt', '-lcrypt', '', d), '', d)}" | 5 | BUILD_LDFLAGS_append_class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', bb.utils.contains('DISTRO_FEATURES', 'libc-crypt', '-lcrypt', '', d), '', d)}" |
6 | 6 | ||
7 | BBCLASSEXTEND = "native nativesdk" | 7 | BBCLASSEXTEND = "native nativesdk" |
8 | 8 | ||