diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2024-05-02 00:57:58 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2024-05-02 00:59:00 +0300 |
| commit | ba60c1d7ddcf21fa56e9bde2880ac816c1d231e0 (patch) | |
| tree | ada5cf9936ffe1194bd9e32e25af557598750ce5 | |
| parent | 062def2a24c108fe1c3b808973945336eadfefb7 (diff) | |
| download | openbmc-ba60c1d7ddcf21fa56e9bde2880ac816c1d231e0.tar.xz | |
meta-phosphor: eliminate phosphor-pkg-tweaks
Upstream now has an `inherit_defer` concept which allows PACKAGECONFIG
tweaks, for example, to be applied to `inhert` directives. Therefore,
we can use the more typical `bbappend` approach instead of this extra
include file.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ie8cad501dbed549969899012734cee94075d2f5a
3 files changed, 3 insertions, 8 deletions
diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index 7f9ec78b15..35bd8deb92 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -1,5 +1,4 @@ require conf/distro/include/phosphor-defaults.inc -require conf/distro/include/phosphor-pkg-tweaks.inc # Match the distro codename from upstream poky. DISTRO_CODENAME ?= "scarthgap" diff --git a/meta-phosphor/conf/distro/include/phosphor-pkg-tweaks.inc b/meta-phosphor/conf/distro/include/phosphor-pkg-tweaks.inc deleted file mode 100644 index a5c1df8a8a..0000000000 --- a/meta-phosphor/conf/distro/include/phosphor-pkg-tweaks.inc +++ /dev/null @@ -1,7 +0,0 @@ -## Some packages do not allow a simple bbappend to tweak the PACKAGECONFIG -## because they can end up inheriting bbclasses, which cause other -## side-effects before the bbappend is applied. Place tweaks for those -## packages in this file. - -# Disable python from btrfs-tools -PACKAGECONFIG:remove:pn-btrfs-tools = "python" diff --git a/meta-phosphor/recipes-devtools/btrfs-tools/btrfs-tools_%.bbappend b/meta-phosphor/recipes-devtools/btrfs-tools/btrfs-tools_%.bbappend new file mode 100644 index 0000000000..a5ebbcc08f --- /dev/null +++ b/meta-phosphor/recipes-devtools/btrfs-tools/btrfs-tools_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +PACKAGECONFIG:remove:class-target = "python" |