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/pam/libpam_1.5.1.bb | |
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/pam/libpam_1.5.1.bb')
-rw-r--r-- | meta/recipes-extended/pam/libpam_1.5.1.bb | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/meta/recipes-extended/pam/libpam_1.5.1.bb b/meta/recipes-extended/pam/libpam_1.5.1.bb index f0c8caaac2..a349d8ac96 100644 --- a/meta/recipes-extended/pam/libpam_1.5.1.bb +++ b/meta/recipes-extended/pam/libpam_1.5.1.bb | |||
@@ -38,7 +38,7 @@ EXTRA_OECONF = "--includedir=${includedir}/security \ | |||
38 | --disable-doc \ | 38 | --disable-doc \ |
39 | --disable-prelude" | 39 | --disable-prelude" |
40 | 40 | ||
41 | CFLAGS_append = " -fPIC " | 41 | CFLAGS:append = " -fPIC " |
42 | 42 | ||
43 | S = "${WORKDIR}/Linux-PAM-${PV}" | 43 | S = "${WORKDIR}/Linux-PAM-${PV}" |
44 | 44 | ||
@@ -49,10 +49,10 @@ PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit," | |||
49 | PACKAGECONFIG[userdb] = "--enable-db=db,--enable-db=no,db," | 49 | PACKAGECONFIG[userdb] = "--enable-db=db,--enable-db=no,db," |
50 | 50 | ||
51 | PACKAGES += "${PN}-runtime ${PN}-xtests" | 51 | PACKAGES += "${PN}-runtime ${PN}-xtests" |
52 | FILES_${PN} = "${base_libdir}/lib*${SOLIBS}" | 52 | FILES:${PN} = "${base_libdir}/lib*${SOLIBS}" |
53 | FILES_${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libdir}/lib*${SOLIBSDEV}" | 53 | FILES:${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libdir}/lib*${SOLIBSDEV}" |
54 | FILES_${PN}-runtime = "${sysconfdir} ${sbindir} ${systemd_system_unitdir}" | 54 | FILES:${PN}-runtime = "${sysconfdir} ${sbindir} ${systemd_system_unitdir}" |
55 | FILES_${PN}-xtests = "${datadir}/Linux-PAM/xtests" | 55 | FILES:${PN}-xtests = "${datadir}/Linux-PAM/xtests" |
56 | 56 | ||
57 | PACKAGES_DYNAMIC += "^${MLPREFIX}pam-plugin-.*" | 57 | PACKAGES_DYNAMIC += "^${MLPREFIX}pam-plugin-.*" |
58 | 58 | ||
@@ -62,16 +62,16 @@ def get_multilib_bit(d): | |||
62 | 62 | ||
63 | libpam_suffix = "suffix${@get_multilib_bit(d)}" | 63 | libpam_suffix = "suffix${@get_multilib_bit(d)}" |
64 | 64 | ||
65 | RPROVIDES_${PN} += "${PN}-${libpam_suffix}" | 65 | RPROVIDES:${PN} += "${PN}-${libpam_suffix}" |
66 | RPROVIDES_${PN}-runtime += "${PN}-runtime-${libpam_suffix}" | 66 | RPROVIDES:${PN}-runtime += "${PN}-runtime-${libpam_suffix}" |
67 | 67 | ||
68 | RDEPENDS_${PN}-runtime = "${PN}-${libpam_suffix} \ | 68 | RDEPENDS:${PN}-runtime = "${PN}-${libpam_suffix} \ |
69 | ${MLPREFIX}pam-plugin-deny-${libpam_suffix} \ | 69 | ${MLPREFIX}pam-plugin-deny-${libpam_suffix} \ |
70 | ${MLPREFIX}pam-plugin-permit-${libpam_suffix} \ | 70 | ${MLPREFIX}pam-plugin-permit-${libpam_suffix} \ |
71 | ${MLPREFIX}pam-plugin-warn-${libpam_suffix} \ | 71 | ${MLPREFIX}pam-plugin-warn-${libpam_suffix} \ |
72 | ${MLPREFIX}pam-plugin-unix-${libpam_suffix} \ | 72 | ${MLPREFIX}pam-plugin-unix-${libpam_suffix} \ |
73 | " | 73 | " |
74 | RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} \ | 74 | RDEPENDS:${PN}-xtests = "${PN}-${libpam_suffix} \ |
75 | ${MLPREFIX}pam-plugin-access-${libpam_suffix} \ | 75 | ${MLPREFIX}pam-plugin-access-${libpam_suffix} \ |
76 | ${MLPREFIX}pam-plugin-debug-${libpam_suffix} \ | 76 | ${MLPREFIX}pam-plugin-debug-${libpam_suffix} \ |
77 | ${MLPREFIX}pam-plugin-pwhistory-${libpam_suffix} \ | 77 | ${MLPREFIX}pam-plugin-pwhistory-${libpam_suffix} \ |
@@ -80,27 +80,27 @@ RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} \ | |||
80 | bash coreutils" | 80 | bash coreutils" |
81 | 81 | ||
82 | # FIXME: Native suffix breaks here, disable it for now | 82 | # FIXME: Native suffix breaks here, disable it for now |
83 | RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}" | 83 | RRECOMMENDS:${PN} = "${PN}-runtime-${libpam_suffix}" |
84 | RRECOMMENDS_${PN}_class-native = "" | 84 | RRECOMMENDS:${PN}:class-native = "" |
85 | 85 | ||
86 | python populate_packages_prepend () { | 86 | python populate_packages:prepend () { |
87 | def pam_plugin_hook(file, pkg, pattern, format, basename): | 87 | def pam_plugin_hook(file, pkg, pattern, format, basename): |
88 | pn = d.getVar('PN') | 88 | pn = d.getVar('PN') |
89 | libpam_suffix = d.getVar('libpam_suffix') | 89 | libpam_suffix = d.getVar('libpam_suffix') |
90 | 90 | ||
91 | rdeps = d.getVar('RDEPENDS_' + pkg) | 91 | rdeps = d.getVar('RDEPENDS:' + pkg) |
92 | if rdeps: | 92 | if rdeps: |
93 | rdeps = rdeps + " " + pn + "-" + libpam_suffix | 93 | rdeps = rdeps + " " + pn + "-" + libpam_suffix |
94 | else: | 94 | else: |
95 | rdeps = pn + "-" + libpam_suffix | 95 | rdeps = pn + "-" + libpam_suffix |
96 | d.setVar('RDEPENDS_' + pkg, rdeps) | 96 | d.setVar('RDEPENDS:' + pkg, rdeps) |
97 | 97 | ||
98 | provides = d.getVar('RPROVIDES_' + pkg) | 98 | provides = d.getVar('RPROVIDES:' + pkg) |
99 | if provides: | 99 | if provides: |
100 | provides = provides + " " + pkg + "-" + libpam_suffix | 100 | provides = provides + " " + pkg + "-" + libpam_suffix |
101 | else: | 101 | else: |
102 | provides = pkg + "-" + libpam_suffix | 102 | provides = pkg + "-" + libpam_suffix |
103 | d.setVar('RPROVIDES_' + pkg, provides) | 103 | d.setVar('RPROVIDES:' + pkg, provides) |
104 | 104 | ||
105 | mlprefix = d.getVar('MLPREFIX') or '' | 105 | mlprefix = d.getVar('MLPREFIX') or '' |
106 | dvar = d.expand('${WORKDIR}/package') | 106 | dvar = d.expand('${WORKDIR}/package') |
@@ -158,7 +158,7 @@ do_install_ptest() { | |||
158 | fi | 158 | fi |
159 | } | 159 | } |
160 | 160 | ||
161 | pkg_postinst_${PN}() { | 161 | pkg_postinst:${PN}() { |
162 | if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then | 162 | if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then |
163 | /etc/init.d/populate-volatile.sh update | 163 | /etc/init.d/populate-volatile.sh update |
164 | fi | 164 | fi |
@@ -169,12 +169,12 @@ REQUIRED_DISTRO_FEATURES = "pam" | |||
169 | 169 | ||
170 | BBCLASSEXTEND = "nativesdk native" | 170 | BBCLASSEXTEND = "nativesdk native" |
171 | 171 | ||
172 | CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-session" | 172 | CONFFILES:${PN}-runtime += "${sysconfdir}/pam.d/common-session" |
173 | CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-auth" | 173 | CONFFILES:${PN}-runtime += "${sysconfdir}/pam.d/common-auth" |
174 | CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-password" | 174 | CONFFILES:${PN}-runtime += "${sysconfdir}/pam.d/common-password" |
175 | CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-session-noninteractive" | 175 | CONFFILES:${PN}-runtime += "${sysconfdir}/pam.d/common-session-noninteractive" |
176 | CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-account" | 176 | CONFFILES:${PN}-runtime += "${sysconfdir}/pam.d/common-account" |
177 | CONFFILES_${PN}-runtime += "${sysconfdir}/security/limits.conf" | 177 | CONFFILES:${PN}-runtime += "${sysconfdir}/security/limits.conf" |
178 | 178 | ||
179 | UPSTREAM_CHECK_URI = "https://github.com/linux-pam/linux-pam/releases" | 179 | UPSTREAM_CHECK_URI = "https://github.com/linux-pam/linux-pam/releases" |
180 | 180 | ||