From 0ec686bbf6fa50f40498cb6e81e371f41d943926 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 18 Jan 2019 10:01:53 -0600 Subject: Remove _witherspoon from bbappend files These files are already in the meta-witherspoon subdirectory, it's redundant to have the _witherspoon append in the bbappend files. This allows off-shoots of the witherspoon system to easily include this meta layer and get the witherspoon default files. (From meta-ibm rev: 9c653e0df630e00ddc8dca36ea53713192616eab) Change-Id: I2f942408571b2215f06ee6b18c05ca122f99cad4 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- .../recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend | 2 +- .../recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 8445c835a..3256e834a 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend_witherspoon := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" # Calculate the auxiliary firmware revision to be updated in the dev_id.json # file. It is calculated from the VERSION_ID field which currently has two diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index a314d163b..e1798ad4b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_append_witherspoon := ":${THISDIR}/${PN}" -SRC_URI_append_witherspoon = " \ +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +SRC_URI_append = " \ file://occ_sensors.hardcoded.yaml \ file://hwmon_sensors.hardcoded.yaml \ file://channel.yaml \ " -EXTRA_OECONF_append_witherspoon = " \ +EXTRA_OECONF_append = " \ CHANNEL_YAML_GEN=${WORKDIR}/channel.yaml \ " -- cgit v1.2.3