From ed22b945460d3644562fd035c97e10be0d7dc16a Mon Sep 17 00:00:00 2001 From: Sai Hari Chandana Kalluri Date: Fri, 5 Jun 2020 13:15:31 -0700 Subject: meson_%.bbappend: Remove bbappend from layer Meson bbappend includes a patch that adds microblaze family to the envconfig during mesonbuild.The patch is upstreamed and no longer needed in the layer. Signed-off-by: Sai Hari Chandana Kalluri --- .../0001-envconfig-Add-MicroBlaze-CPU-family.patch | 27 ---------------------- .../recipes-devtools/meson/meson_%.bbappend | 2 -- 2 files changed, 29 deletions(-) delete mode 100644 meta-xilinx-bsp/recipes-devtools/meson/files/0001-envconfig-Add-MicroBlaze-CPU-family.patch delete mode 100644 meta-xilinx-bsp/recipes-devtools/meson/meson_%.bbappend diff --git a/meta-xilinx-bsp/recipes-devtools/meson/files/0001-envconfig-Add-MicroBlaze-CPU-family.patch b/meta-xilinx-bsp/recipes-devtools/meson/files/0001-envconfig-Add-MicroBlaze-CPU-family.patch deleted file mode 100644 index 51268da3..00000000 --- a/meta-xilinx-bsp/recipes-devtools/meson/files/0001-envconfig-Add-MicroBlaze-CPU-family.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a623654f7e1d09efaa774506f190db876831990a Mon Sep 17 00:00:00 2001 -From: Nathan Rossi -Date: Thu, 19 Sep 2019 20:50:31 +1000 -Subject: [PATCH] envconfig: Add MicroBlaze CPU family - -Add the CPU family for the MicroBlaze processor. - -Signed-off-by: Nathan Rossi ---- - mesonbuild/envconfig.py | 1 + - 1 files changed, 1 insertions(+) - -diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 03c6346..fa6b8ef 100644 ---- a/mesonbuild/envconfig.py -+++ b/mesonbuild/envconfig.py -@@ -41,6 +41,7 @@ known_cpu_families = ( - 'arm', - 'e2k', - 'ia64', -+ 'microblaze', - 'mips', - 'mips64', - 'parisc', --- -2.7.4 - diff --git a/meta-xilinx-bsp/recipes-devtools/meson/meson_%.bbappend b/meta-xilinx-bsp/recipes-devtools/meson/meson_%.bbappend deleted file mode 100644 index a8bbe320..00000000 --- a/meta-xilinx-bsp/recipes-devtools/meson/meson_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI += "file://0001-envconfig-Add-MicroBlaze-CPU-family.patch" -- cgit v1.2.3-54-g00ecf