diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2021-08-06 17:16:53 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2021-08-11 00:56:33 +0300 |
commit | 12fc939cde971ea2094201e48fe095c41138f4aa (patch) | |
tree | 2fc49b7224d97fc0e43011cc3d9c85eaa933d0a9 /poky/meta | |
parent | 9b3d987c3c2facf75e1039766d31fbf31508fc19 (diff) | |
download | openbmc-12fc939cde971ea2094201e48fe095c41138f4aa.tar.xz |
meta-phosphor: prep for new override syntax
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I588025b614416c43aa2d053765ab53bacf890cb5
Diffstat (limited to 'poky/meta')
-rw-r--r-- | poky/meta/recipes-extended/pam/libpam_1.3.1.bb | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/poky/meta/recipes-extended/pam/libpam_1.3.1.bb b/poky/meta/recipes-extended/pam/libpam_1.3.1.bb index 6741934830..43db08e7e6 100644 --- a/poky/meta/recipes-extended/pam/libpam_1.3.1.bb +++ b/poky/meta/recipes-extended/pam/libpam_1.3.1.bb @@ -38,7 +38,7 @@ EXTRA_OECONF = "--includedir=${includedir}/security \ --disable-regenerate-docu \ --disable-prelude" -CFLAGS_append = " -fPIC " +CFLAGS:append = " -fPIC " S = "${WORKDIR}/Linux-PAM-${PV}" @@ -49,10 +49,10 @@ PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit," PACKAGECONFIG[userdb] = "--enable-db=db,--enable-db=no,db," PACKAGES += "${PN}-runtime ${PN}-xtests" -FILES_${PN} = "${base_libdir}/lib*${SOLIBS}" -FILES_${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libdir}/lib*${SOLIBSDEV}" -FILES_${PN}-runtime = "${sysconfdir}" -FILES_${PN}-xtests = "${datadir}/Linux-PAM/xtests" +FILES:${PN} = "${base_libdir}/lib*${SOLIBS}" +FILES:${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libdir}/lib*${SOLIBSDEV}" +FILES:${PN}-runtime = "${sysconfdir}" +FILES:${PN}-xtests = "${datadir}/Linux-PAM/xtests" PACKAGES_DYNAMIC += "^${MLPREFIX}pam-plugin-.*" @@ -62,16 +62,16 @@ def get_multilib_bit(d): libpam_suffix = "suffix${@get_multilib_bit(d)}" -RPROVIDES_${PN} += "${PN}-${libpam_suffix}" -RPROVIDES_${PN}-runtime += "${PN}-runtime-${libpam_suffix}" +RPROVIDES:${PN} += "${PN}-${libpam_suffix}" +RPROVIDES:${PN}-runtime += "${PN}-runtime-${libpam_suffix}" -RDEPENDS_${PN}-runtime = "${PN}-${libpam_suffix} \ +RDEPENDS:${PN}-runtime = "${PN}-${libpam_suffix} \ ${MLPREFIX}pam-plugin-deny-${libpam_suffix} \ ${MLPREFIX}pam-plugin-permit-${libpam_suffix} \ ${MLPREFIX}pam-plugin-warn-${libpam_suffix} \ ${MLPREFIX}pam-plugin-unix-${libpam_suffix} \ " -RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} \ +RDEPENDS:${PN}-xtests = "${PN}-${libpam_suffix} \ ${MLPREFIX}pam-plugin-access-${libpam_suffix} \ ${MLPREFIX}pam-plugin-debug-${libpam_suffix} \ ${MLPREFIX}pam-plugin-cracklib-${libpam_suffix} \ @@ -81,10 +81,10 @@ RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} \ coreutils" # FIXME: Native suffix breaks here, disable it for now -RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}" -RRECOMMENDS_${PN}_class-native = "" +RRECOMMENDS:${PN} = "${PN}-runtime-${libpam_suffix}" +RRECOMMENDS:${PN}_class-native = "" -python populate_packages_prepend () { +python populate_packages:prepend () { def pam_plugin_append_file(pn, dir, file): nf = os.path.join(dir, file) of = d.getVar('FILES_' + pn) @@ -96,19 +96,19 @@ python populate_packages_prepend () { pn = d.getVar('PN') libpam_suffix = d.getVar('libpam_suffix') - rdeps = d.getVar('RDEPENDS_' + pkg) + rdeps = d.getVar('RDEPENDS:' + pkg) if rdeps: rdeps = rdeps + " " + pn + "-" + libpam_suffix else: rdeps = pn + "-" + libpam_suffix - d.setVar('RDEPENDS_' + pkg, rdeps) + d.setVar('RDEPENDS:' + pkg, rdeps) - provides = d.getVar('RPROVIDES_' + pkg) + provides = d.getVar('RPROVIDES:' + pkg) if provides: provides = provides + " " + pkg + "-" + libpam_suffix else: provides = pkg + "-" + libpam_suffix - d.setVar('RPROVIDES_' + pkg, provides) + d.setVar('RPROVIDES:' + pkg, provides) mlprefix = d.getVar('MLPREFIX') or '' dvar = d.expand('${WORKDIR}/package') @@ -184,12 +184,12 @@ REQUIRED_DISTRO_FEATURES = "pam" BBCLASSEXTEND = "nativesdk native" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-session" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-auth" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-password" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-session-noninteractive" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-account" -CONFFILES_${PN}-runtime += "${sysconfdir}/security/limits.conf" +CONFFILES:${PN}-runtime += "${sysconfdir}/pam.d/common-session" +CONFFILES:${PN}-runtime += "${sysconfdir}/pam.d/common-auth" +CONFFILES:${PN}-runtime += "${sysconfdir}/pam.d/common-password" +CONFFILES:${PN}-runtime += "${sysconfdir}/pam.d/common-session-noninteractive" +CONFFILES:${PN}-runtime += "${sysconfdir}/pam.d/common-account" +CONFFILES:${PN}-runtime += "${sysconfdir}/security/limits.conf" UPSTREAM_CHECK_URI = "https://github.com/linux-pam/linux-pam/releases" |