diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-extended/shadow | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/shadow')
-rw-r--r-- | meta/recipes-extended/shadow/shadow.inc | 38 | ||||
-rw-r--r-- | meta/recipes-extended/shadow/shadow_4.8.1.bb | 2 |
2 files changed, 20 insertions, 20 deletions
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 2cbdfbc1cf..a5d77ebfe2 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc | |||
@@ -16,17 +16,17 @@ SRC_URI = "https://github.com/shadow-maint/shadow/releases/download/${PV}/${BP}. | |||
16 | file://shadow-relaxed-usernames.patch \ | 16 | file://shadow-relaxed-usernames.patch \ |
17 | " | 17 | " |
18 | 18 | ||
19 | SRC_URI_append_class-target = " \ | 19 | SRC_URI:append:class-target = " \ |
20 | file://login_defs_pam.sed \ | 20 | file://login_defs_pam.sed \ |
21 | file://shadow-update-pam-conf.patch \ | 21 | file://shadow-update-pam-conf.patch \ |
22 | " | 22 | " |
23 | 23 | ||
24 | SRC_URI_append_class-native = " \ | 24 | SRC_URI:append:class-native = " \ |
25 | file://0001-Disable-use-of-syslog-for-sysroot.patch \ | 25 | file://0001-Disable-use-of-syslog-for-sysroot.patch \ |
26 | file://0002-Allow-for-setting-password-in-clear-text.patch \ | 26 | file://0002-Allow-for-setting-password-in-clear-text.patch \ |
27 | file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ | 27 | file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ |
28 | " | 28 | " |
29 | SRC_URI_append_class-nativesdk = " \ | 29 | SRC_URI:append:class-nativesdk = " \ |
30 | file://0001-Disable-use-of-syslog-for-sysroot.patch \ | 30 | file://0001-Disable-use-of-syslog-for-sysroot.patch \ |
31 | " | 31 | " |
32 | 32 | ||
@@ -55,9 +55,9 @@ EXTRA_OECONF += "--without-audit \ | |||
55 | ${NSCDOPT}" | 55 | ${NSCDOPT}" |
56 | 56 | ||
57 | NSCDOPT = "" | 57 | NSCDOPT = "" |
58 | NSCDOPT_class-native = "--without-nscd" | 58 | NSCDOPT:class-native = "--without-nscd" |
59 | NSCDOPT_class-nativesdk = "--without-nscd" | 59 | NSCDOPT:class-nativesdk = "--without-nscd" |
60 | NSCDOPT_libc-glibc = "--with-nscd" | 60 | NSCDOPT:libc-glibc = "--with-nscd" |
61 | 61 | ||
62 | PAM_PLUGINS = "libpam-runtime \ | 62 | PAM_PLUGINS = "libpam-runtime \ |
63 | pam-plugin-faildelay \ | 63 | pam-plugin-faildelay \ |
@@ -72,21 +72,21 @@ PAM_PLUGINS = "libpam-runtime \ | |||
72 | pam-plugin-shells \ | 72 | pam-plugin-shells \ |
73 | pam-plugin-rootok" | 73 | pam-plugin-rootok" |
74 | 74 | ||
75 | PAM_PLUGINS_remove_libc-musl = "pam-plugin-lastlog" | 75 | PAM_PLUGINS:remove:libc-musl = "pam-plugin-lastlog" |
76 | 76 | ||
77 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ | 77 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ |
78 | ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}" | 78 | ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}" |
79 | PACKAGECONFIG_class-native ??= "${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}" | 79 | PACKAGECONFIG:class-native ??= "${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}" |
80 | PACKAGECONFIG_class-nativesdk = "" | 80 | PACKAGECONFIG:class-nativesdk = "" |
81 | PACKAGECONFIG[pam] = "--with-libpam,--without-libpam,libpam,${PAM_PLUGINS}" | 81 | PACKAGECONFIG[pam] = "--with-libpam,--without-libpam,libpam,${PAM_PLUGINS}" |
82 | PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" | 82 | PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" |
83 | PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" | 83 | PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" |
84 | 84 | ||
85 | RDEPENDS_${PN} = "shadow-securetty \ | 85 | RDEPENDS:${PN} = "shadow-securetty \ |
86 | base-passwd \ | 86 | base-passwd \ |
87 | util-linux-sulogin" | 87 | util-linux-sulogin" |
88 | RDEPENDS_${PN}_class-native = "" | 88 | RDEPENDS:${PN}:class-native = "" |
89 | RDEPENDS_${PN}_class-nativesdk = "" | 89 | RDEPENDS:${PN}:class-nativesdk = "" |
90 | 90 | ||
91 | do_install() { | 91 | do_install() { |
92 | oe_runmake DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install | 92 | oe_runmake DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install |
@@ -123,7 +123,7 @@ do_install() { | |||
123 | sed -i 's,^GROUP=1000,GROUP=100,g' ${D}${sysconfdir}/default/useradd | 123 | sed -i 's,^GROUP=1000,GROUP=100,g' ${D}${sysconfdir}/default/useradd |
124 | } | 124 | } |
125 | 125 | ||
126 | do_install_append() { | 126 | do_install:append() { |
127 | # Ensure that the image has as a /var/spool/mail dir so shadow can | 127 | # Ensure that the image has as a /var/spool/mail dir so shadow can |
128 | # put mailboxes there if the user reconfigures shadow to its | 128 | # put mailboxes there if the user reconfigures shadow to its |
129 | # defaults (see sed below). | 129 | # defaults (see sed below). |
@@ -156,7 +156,7 @@ do_install_append() { | |||
156 | } | 156 | } |
157 | 157 | ||
158 | PACKAGES =+ "${PN}-base" | 158 | PACKAGES =+ "${PN}-base" |
159 | FILES_${PN}-base = "\ | 159 | FILES:${PN}-base = "\ |
160 | ${base_bindir}/login.shadow \ | 160 | ${base_bindir}/login.shadow \ |
161 | ${base_bindir}/su.shadow \ | 161 | ${base_bindir}/su.shadow \ |
162 | ${bindir}/sg \ | 162 | ${bindir}/sg \ |
@@ -166,13 +166,13 @@ FILES_${PN}-base = "\ | |||
166 | ${sysconfdir}/pam.d/su \ | 166 | ${sysconfdir}/pam.d/su \ |
167 | ${sysconfdir}/login.defs \ | 167 | ${sysconfdir}/login.defs \ |
168 | " | 168 | " |
169 | RDEPENDS_${PN} += "${PN}-base" | 169 | RDEPENDS:${PN} += "${PN}-base" |
170 | 170 | ||
171 | inherit update-alternatives | 171 | inherit update-alternatives |
172 | 172 | ||
173 | ALTERNATIVE_PRIORITY = "200" | 173 | ALTERNATIVE_PRIORITY = "200" |
174 | 174 | ||
175 | ALTERNATIVE_${PN} = "passwd chfn chsh chpasswd vipw vigr nologin" | 175 | ALTERNATIVE:${PN} = "passwd chfn chsh chpasswd vipw vigr nologin" |
176 | ALTERNATIVE_LINK_NAME[chfn] = "${bindir}/chfn" | 176 | ALTERNATIVE_LINK_NAME[chfn] = "${bindir}/chfn" |
177 | ALTERNATIVE_LINK_NAME[chsh] = "${bindir}/chsh" | 177 | ALTERNATIVE_LINK_NAME[chsh] = "${bindir}/chsh" |
178 | ALTERNATIVE_LINK_NAME[chpasswd] = "${sbindir}/chpasswd" | 178 | ALTERNATIVE_LINK_NAME[chpasswd] = "${sbindir}/chpasswd" |
@@ -180,11 +180,11 @@ ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw" | |||
180 | ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" | 180 | ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" |
181 | ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" | 181 | ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" |
182 | 182 | ||
183 | ALTERNATIVE_${PN}-base = "newgrp groups login su" | 183 | ALTERNATIVE:${PN}-base = "newgrp groups login su" |
184 | ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" | 184 | ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" |
185 | ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" | 185 | ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" |
186 | 186 | ||
187 | ALTERNATIVE_${PN}-doc = "passwd.5 getspnam.3 groups.1 su.1 nologin.8" | 187 | ALTERNATIVE:${PN}-doc = "passwd.5 getspnam.3 groups.1 su.1 nologin.8" |
188 | ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5" | 188 | ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5" |
189 | ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" | 189 | ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" |
190 | ALTERNATIVE_LINK_NAME[groups.1] = "${mandir}/man1/groups.1" | 190 | ALTERNATIVE_LINK_NAME[groups.1] = "${mandir}/man1/groups.1" |
@@ -192,7 +192,7 @@ ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" | |||
192 | ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" | 192 | ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" |
193 | 193 | ||
194 | PACKAGE_WRITE_DEPS += "shadow-native" | 194 | PACKAGE_WRITE_DEPS += "shadow-native" |
195 | pkg_postinst_${PN}_class-target () { | 195 | pkg_postinst:${PN}:class-target () { |
196 | if [ "x$D" != "x" ]; then | 196 | if [ "x$D" != "x" ]; then |
197 | rootarg="--root $D" | 197 | rootarg="--root $D" |
198 | else | 198 | else |
diff --git a/meta/recipes-extended/shadow/shadow_4.8.1.bb b/meta/recipes-extended/shadow/shadow_4.8.1.bb index ff4aad926f..2fbd81bf72 100644 --- a/meta/recipes-extended/shadow/shadow_4.8.1.bb +++ b/meta/recipes-extended/shadow/shadow_4.8.1.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 = " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-lcrypt', '', d)}" | 5 | BUILD_LDFLAGS:append:class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-lcrypt', '', d)}" |
6 | 6 | ||
7 | BBCLASSEXTEND = "native nativesdk" | 7 | BBCLASSEXTEND = "native nativesdk" |
8 | 8 | ||