diff options
| author | Mark Hatle <mark.hatle@xilinx.com> | 2021-10-12 14:09:58 -0700 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@xilinx.com> | 2021-10-25 14:53:19 -0700 |
| commit | 7f12056ccc3a978e9b69c380bffc3c04ee20520e (patch) | |
| tree | 217e0f58dc68c2977291263402398ac5f71915b7 /meta-microblaze | |
| parent | 294443d89dd53435fc0ccc6113c7ec5aff326612 (diff) | |
| download | meta-xilinx-7f12056ccc3a978e9b69c380bffc3c04ee20520e.tar.gz | |
binutils: convert away from bbappend
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Diffstat (limited to 'meta-microblaze')
5 files changed, 4 insertions, 15 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 6290d5b1..32f9dce6 100644 --- a/meta-microblaze/recipes-devtools/binutils/binutils-2.35.1.inc +++ b/meta-microblaze/recipes-devtools/binutils/binutils-2.35.1.inc | |||
| @@ -46,4 +46,7 @@ SRC_URI = "\ | |||
| 46 | file://CVE-2020-35448.patch \ | 46 | file://CVE-2020-35448.patch \ |
| 47 | file://0001-gold-ensure-file_counts_lock-is-initialized-before-u.patch \ | 47 | file://0001-gold-ensure-file_counts_lock-is-initialized-before-u.patch \ |
| 48 | " | 48 | " |
| 49 | |||
| 50 | require binutils-microblaze.inc | ||
| 51 | |||
| 49 | S = "${WORKDIR}/git" | 52 | 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 deleted file mode 100644 index 3d57ddbf..00000000 --- a/meta-microblaze/recipes-devtools/binutils/binutils-cross-canadian_%.bbappend +++ /dev/null | |||
| @@ -1,4 +0,0 @@ | |||
| 1 | MICROBLAZEPATCHES = "" | ||
| 2 | MICROBLAZEPATCHES:microblaze = "binutils-microblaze.inc" | ||
| 3 | |||
| 4 | require ${MICROBLAZEPATCHES} | ||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-cross_%.bbappend b/meta-microblaze/recipes-devtools/binutils/binutils-cross_%.bbappend deleted file mode 100644 index 3d57ddbf..00000000 --- a/meta-microblaze/recipes-devtools/binutils/binutils-cross_%.bbappend +++ /dev/null | |||
| @@ -1,4 +0,0 @@ | |||
| 1 | MICROBLAZEPATCHES = "" | ||
| 2 | MICROBLAZEPATCHES:microblaze = "binutils-microblaze.inc" | ||
| 3 | |||
| 4 | require ${MICROBLAZEPATCHES} | ||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc b/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc index 44f4cc79..cbba854a 100644 --- a/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc +++ b/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | FILESEXTRAPATHS:append := ":${THISDIR}/binutils" | 1 | SRC_URI:append:microblaze = " \ |
| 2 | |||
| 3 | SRC_URI:append = " \ | ||
| 4 | file://0001-Add-wdc.ext.clear-and-wdc.ext.flush-insns.patch \ | 2 | file://0001-Add-wdc.ext.clear-and-wdc.ext.flush-insns.patch \ |
| 5 | file://0002-Add-mlittle-endian-and-mbig-endian-flags.patch \ | 3 | file://0002-Add-mlittle-endian-and-mbig-endian-flags.patch \ |
| 6 | file://0003-Disable-the-warning-message-for-eh_frame_hdr.patch \ | 4 | 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 deleted file mode 100644 index 3d57ddbf..00000000 --- a/meta-microblaze/recipes-devtools/binutils/binutils_%.bbappend +++ /dev/null | |||
| @@ -1,4 +0,0 @@ | |||
| 1 | MICROBLAZEPATCHES = "" | ||
| 2 | MICROBLAZEPATCHES:microblaze = "binutils-microblaze.inc" | ||
| 3 | |||
| 4 | require ${MICROBLAZEPATCHES} | ||