summaryrefslogtreecommitdiff
path: root/meta-phosphor/recipes-support
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2021-08-06 17:16:53 +0300
committerPatrick Williams <patrick@stwcx.xyz>2021-08-11 00:56:33 +0300
commit12fc939cde971ea2094201e48fe095c41138f4aa (patch)
tree2fc49b7224d97fc0e43011cc3d9c85eaa933d0a9 /meta-phosphor/recipes-support
parent9b3d987c3c2facf75e1039766d31fbf31508fc19 (diff)
downloadopenbmc-12fc939cde971ea2094201e48fe095c41138f4aa.tar.xz
meta-phosphor: prep for new override syntax
Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I588025b614416c43aa2d053765ab53bacf890cb5
Diffstat (limited to 'meta-phosphor/recipes-support')
-rw-r--r--meta-phosphor/recipes-support/boost-url/boost-url_%.bbappend2
-rw-r--r--meta-phosphor/recipes-support/boost/boost_%.bbappend4
-rw-r--r--meta-phosphor/recipes-support/cjson/cjson_git.bb2
-rw-r--r--meta-phosphor/recipes-support/lm_sensors/lmsensors-config_1.0.bbappend2
-rw-r--r--meta-phosphor/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb14
-rw-r--r--meta-phosphor/recipes-support/nss-pam-ldapd_fix/nss-pam-ldapd_%.bbappend2
-rw-r--r--meta-phosphor/recipes-support/rng-tools/rng-tools_%.bbappend8
7 files changed, 17 insertions, 17 deletions
diff --git a/meta-phosphor/recipes-support/boost-url/boost-url_%.bbappend b/meta-phosphor/recipes-support/boost-url/boost-url_%.bbappend
index 5ef4f9fe9..618170e93 100644
--- a/meta-phosphor/recipes-support/boost-url/boost-url_%.bbappend
+++ b/meta-phosphor/recipes-support/boost-url/boost-url_%.bbappend
@@ -1 +1 @@
-EXTRA_OECMAKE_append_openbmc-phosphor = "-DBOOST_URL_STANDALONE=ON"
+EXTRA_OECMAKE:append:openbmc-phosphor = "-DBOOST_URL_STANDALONE=ON"
diff --git a/meta-phosphor/recipes-support/boost/boost_%.bbappend b/meta-phosphor/recipes-support/boost/boost_%.bbappend
index 5166bbb67..7aaa35c69 100644
--- a/meta-phosphor/recipes-support/boost/boost_%.bbappend
+++ b/meta-phosphor/recipes-support/boost/boost_%.bbappend
@@ -1,12 +1,12 @@
#This is largely to improve our build times by not building or installing
#modules that OpenBMC does not use by our coding standard. Another thing to
#note is that for most targets, coroutine and context libraries are also added
-#with a BOOST_LIBS_append_<platform> for most targets. Chrono/Thread should not
+#with a BOOST_LIBS:append:<platform> for most targets. Chrono/Thread should not
#be relied directly, but are required dependencies of context and coroutine.
#See the relevant portion of the openbmc coding standard with regards to boost
#libraries
#
#https://github.com/openbmc/docs/blob/master/cpp-style-and-conventions.md#boost
#
-BOOST_LIBS_openbmc-phosphor = "chrono thread context coroutine"
+BOOST_LIBS:openbmc-phosphor = "chrono thread context coroutine"
diff --git a/meta-phosphor/recipes-support/cjson/cjson_git.bb b/meta-phosphor/recipes-support/cjson/cjson_git.bb
index 096e3c988..1b83dd1bc 100644
--- a/meta-phosphor/recipes-support/cjson/cjson_git.bb
+++ b/meta-phosphor/recipes-support/cjson/cjson_git.bb
@@ -10,6 +10,6 @@ S = "${WORKDIR}/git"
inherit cmake
-FILES_${PN}-dev += "${libdir}/cmake/cJSON/*"
+FILES:${PN}-dev += "${libdir}/cmake/cJSON/*"
EXTRA_OECMAKE = "-DENABLE_CUSTOM_COMPILER_FLAGS=OFF -DENABLE_TARGET_EXPORT=OFF"
diff --git a/meta-phosphor/recipes-support/lm_sensors/lmsensors-config_1.0.bbappend b/meta-phosphor/recipes-support/lm_sensors/lmsensors-config_1.0.bbappend
index 83c9ea145..f33b0ad80 100644
--- a/meta-phosphor/recipes-support/lm_sensors/lmsensors-config_1.0.bbappend
+++ b/meta-phosphor/recipes-support/lm_sensors/lmsensors-config_1.0.bbappend
@@ -1,4 +1,4 @@
# Prevent lmsensors from pulling in lighttpd as lighttpd
# uses md4 and we disable openssl md4 support.
-RRECOMMENDS_${PN}-cgi_remove = "lighttpd lighttpd-module-cgi"
+RRECOMMENDS:${PN}-cgi:remove = "lighttpd lighttpd-module-cgi"
diff --git a/meta-phosphor/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb b/meta-phosphor/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb
index 596c1824f..484541815 100644
--- a/meta-phosphor/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb
+++ b/meta-phosphor/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb
@@ -12,7 +12,7 @@ LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
SECTION = "base"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
SRC_URI = "\
http://arthurdejong.org/nss-pam-ldapd/${BPN}-${PV}.tar.gz \
@@ -27,7 +27,7 @@ SRC_URI[sha256sum] = "ef7362e7f2003da8c7beb7bcc03c30494acf712625aaac8badc6e7eb16
DEPENDS += "libpam openldap krb5"
-RDEPENDS_${PN} += "nscd"
+RDEPENDS:${PN} += "nscd"
EXTRA_OECONF = "\
--disable-pynslcd \
@@ -35,14 +35,14 @@ EXTRA_OECONF = "\
--with-pam-seclib-dir=${base_libdir}/security \
"
-CONFFILES_${PN} += "${sysconfdir}/nslcd.conf"
+CONFFILES:${PN} += "${sysconfdir}/nslcd.conf"
-FILES_${PN} += "${base_libdir}/security ${datadir}"
-FILES_${PN}-dbg += "${base_libdir}/security/.debug"
+FILES:${PN} += "${base_libdir}/security ${datadir}"
+FILES:${PN}-dbg += "${base_libdir}/security/.debug"
LDAP_DN ?= "dc=my-domain,dc=com"
-do_install_append() {
+do_install:append() {
install -D -m 0755 ${WORKDIR}/nslcd.init ${D}${sysconfdir}/init.d/nslcd
sed -i -e 's/^uid nslcd/# uid nslcd/;' ${D}${sysconfdir}/nslcd.conf
@@ -58,4 +58,4 @@ inherit update-rc.d systemd
INITSCRIPT_NAME = "nslcd"
INITSCRIPT_PARAMS = "defaults"
-SYSTEMD_SERVICE_${PN} = "nslcd.service"
+SYSTEMD_SERVICE:${PN} = "nslcd.service"
diff --git a/meta-phosphor/recipes-support/nss-pam-ldapd_fix/nss-pam-ldapd_%.bbappend b/meta-phosphor/recipes-support/nss-pam-ldapd_fix/nss-pam-ldapd_%.bbappend
index 11e8c4a75..58ab64aae 100644
--- a/meta-phosphor/recipes-support/nss-pam-ldapd_fix/nss-pam-ldapd_%.bbappend
+++ b/meta-phosphor/recipes-support/nss-pam-ldapd_fix/nss-pam-ldapd_%.bbappend
@@ -1,4 +1,4 @@
-do_install_append() {
+do_install:append() {
sed -i -e '$anss_initgroups_ignoreusers ALLLOCAL' ${D}${sysconfdir}/nslcd.conf
install -m 0644 ${D}${sysconfdir}/nslcd.conf ${D}${sysconfdir}/nslcd.conf.default
diff --git a/meta-phosphor/recipes-support/rng-tools/rng-tools_%.bbappend b/meta-phosphor/recipes-support/rng-tools/rng-tools_%.bbappend
index e9577eb5d..98e8130a4 100644
--- a/meta-phosphor/recipes-support/rng-tools/rng-tools_%.bbappend
+++ b/meta-phosphor/recipes-support/rng-tools/rng-tools_%.bbappend
@@ -1,16 +1,16 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI += "file://10-nice.conf"
-PACKAGECONFIG_remove = "\
+PACKAGECONFIG:remove = "\
${@bb.utils.contains('MACHINE_FEATURES', 'hw-rng', \
'libjitterentropy', '', d)}\
"
inherit systemd
-FILES_${PN} += "${systemd_system_unitdir}/rngd.service.d"
+FILES:${PN} += "${systemd_system_unitdir}/rngd.service.d"
-do_install_append() {
+do_install:append() {
# When using systemd and using libjitterentropy, install a config
# which runs rngd at a 'nice' priority. libjitterentropy uses a