diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2019-01-18 19:01:53 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-23 20:49:38 +0300 |
commit | 0ec686bbf6fa50f40498cb6e81e371f41d943926 (patch) | |
tree | 981a5b8bd45670dd5b87f0962e54b3ff755b29a3 /meta-ibm | |
parent | 810c28bfdd21c666b4afdea68140724bf93ff483 (diff) | |
download | openbmc-0ec686bbf6fa50f40498cb6e81e371f41d943926.tar.xz |
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 <geissonator@yahoo.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ibm')
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend | 2 | ||||
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend | 6 |
2 files changed, 4 insertions, 4 deletions
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 \ " |