Revert "binutils: convert away from bbappend"

This reverts commit 7f12056ccc3a978e9b69c380bffc3c04ee20520e.

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

5 files changed, 15 insertions, 4 deletions

diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-2.35.1.inc b/meta-microblaze/recipes-devtools/binutils/binutils-2.35.1.inc
index 32f9dce6..6290d5b1 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils-2.35.1.inc
+++ b/meta-microblaze/recipes-devtools/binutils/binutils-2.35.1.inc
@@ -46,7 +46,4 @@ SRC_URI = "\
      file://CVE-2020-35448.patch \
      file://0001-gold-ensure-file_counts_lock-is-initialized-before-u.patch \
 "
-
-require binutils-microblaze.inc
-
 S  = "${WORKDIR}/git"
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-cross-canadian_%.bbappend b/meta-microblaze/recipes-devtools/binutils/binutils-cross-canadian_%.bbappend
new file mode 100644
index 00000000..3d57ddbf
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/binutils/binutils-cross-canadian_%.bbappend
@@ -0,0 +1,4 @@
+MICROBLAZEPATCHES = ""
+MICROBLAZEPATCHES:microblaze = "binutils-microblaze.inc"
+
+require ${MICROBLAZEPATCHES}
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-cross_%.bbappend b/meta-microblaze/recipes-devtools/binutils/binutils-cross_%.bbappend
new file mode 100644
index 00000000..3d57ddbf
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/binutils/binutils-cross_%.bbappend
@@ -0,0 +1,4 @@
+MICROBLAZEPATCHES = ""
+MICROBLAZEPATCHES:microblaze = "binutils-microblaze.inc"
+
+require ${MICROBLAZEPATCHES}
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc b/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc
index cbba854a..44f4cc79 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc
+++ b/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc
@@ -1,4 +1,6 @@
-SRC_URI:append:microblaze = " \
+FILESEXTRAPATHS:append := ":${THISDIR}/binutils"
+
+SRC_URI:append = " \
      file://0001-Add-wdc.ext.clear-and-wdc.ext.flush-insns.patch \
      file://0002-Add-mlittle-endian-and-mbig-endian-flags.patch \
      file://0003-Disable-the-warning-message-for-eh_frame_hdr.patch \
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils_%.bbappend b/meta-microblaze/recipes-devtools/binutils/binutils_%.bbappend
new file mode 100644
index 00000000..3d57ddbf
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/binutils/binutils_%.bbappend
@@ -0,0 +1,4 @@
+MICROBLAZEPATCHES = ""
+MICROBLAZEPATCHES:microblaze = "binutils-microblaze.inc"
+
+require ${MICROBLAZEPATCHES}