From da686acb0e65d0954616523b0798699a541e3ab4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 23 Jan 2019 14:37:55 -0600 Subject: Remove _witherspoon from remaining bbappend files 9c653e0df was the first commit in this direction. 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: adfde9050096b43fe4062402dd6da8515886ea42) Change-Id: I95eb2a88f4ae49e2cf90a627d182cb9e242d8fce Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- .../meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend | 2 +- .../meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend | 2 +- .../recipes-phosphor/settings/phosphor-settings-manager_%.bbappend | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend index cad9140a0..1b099371e 100644 --- a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend_witherspoon := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://witherspoon.cfg" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend index ffe6b0c64..72d991c7e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_witherspoon := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index dfa24d8e9..71a583690 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_append_witherspoon := ":${THISDIR}/${PN}" -SRC_URI_append_witherspoon = " file://TPMEnable-default-true.override.yml" +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +SRC_URI_append = " file://TPMEnable-default-true.override.yml" -- cgit v1.2.3