summaryrefslogtreecommitdiffstats
path: root/meta-microblaze/recipes-devtools
diff options
context:
space:
mode:
authorSai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>2021-09-28 22:12:04 -0700
committerSai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>2021-09-28 22:12:06 -0700
commit6921a88182ce51763fcf61273972df99dc2faee5 (patch)
tree6505b60113f6192f347991a3a82b8bc6fb02b8d9 /meta-microblaze/recipes-devtools
parent1d2c0f073d3102c3f8ff043d2c3039e6d360118f (diff)
downloadmeta-xilinx-6921a88182ce51763fcf61273972df99dc2faee5.tar.gz
Convert to new override syntax
This is the result of automated script (0.9.0) conversion: oe-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
Diffstat (limited to 'meta-microblaze/recipes-devtools')
-rw-r--r--meta-microblaze/recipes-devtools/binutils/binutils-cross-canadian_%.bbappend2
-rw-r--r--meta-microblaze/recipes-devtools/binutils/binutils-cross_%.bbappend2
-rw-r--r--meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc4
-rw-r--r--meta-microblaze/recipes-devtools/binutils/binutils_%.bbappend2
-rw-r--r--meta-microblaze/recipes-devtools/gcc/gcc-source_11.%.bbappend4
-rw-r--r--meta-microblaze/recipes-devtools/gdb/gdb-common.inc18
-rw-r--r--meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian.inc4
-rw-r--r--meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend2
-rw-r--r--meta-microblaze/recipes-devtools/gdb/gdb-cross.inc2
-rw-r--r--meta-microblaze/recipes-devtools/gdb/gdb-cross_%.bbappend2
-rw-r--r--meta-microblaze/recipes-devtools/gdb/gdb-microblaze.inc6
-rw-r--r--meta-microblaze/recipes-devtools/gdb/gdb.inc10
-rw-r--r--meta-microblaze/recipes-devtools/gdb/gdb_%.bbappend2
-rw-r--r--meta-microblaze/recipes-devtools/gdb/gdb_9.2.bb4
14 files changed, 32 insertions, 32 deletions
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-cross-canadian_%.bbappend b/meta-microblaze/recipes-devtools/binutils/binutils-cross-canadian_%.bbappend
index e439cae7..3d57ddbf 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils-cross-canadian_%.bbappend
+++ b/meta-microblaze/recipes-devtools/binutils/binutils-cross-canadian_%.bbappend
@@ -1,4 +1,4 @@
1MICROBLAZEPATCHES = "" 1MICROBLAZEPATCHES = ""
2MICROBLAZEPATCHES_microblaze = "binutils-microblaze.inc" 2MICROBLAZEPATCHES:microblaze = "binutils-microblaze.inc"
3 3
4require ${MICROBLAZEPATCHES} 4require ${MICROBLAZEPATCHES}
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-cross_%.bbappend b/meta-microblaze/recipes-devtools/binutils/binutils-cross_%.bbappend
index e439cae7..3d57ddbf 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils-cross_%.bbappend
+++ b/meta-microblaze/recipes-devtools/binutils/binutils-cross_%.bbappend
@@ -1,4 +1,4 @@
1MICROBLAZEPATCHES = "" 1MICROBLAZEPATCHES = ""
2MICROBLAZEPATCHES_microblaze = "binutils-microblaze.inc" 2MICROBLAZEPATCHES:microblaze = "binutils-microblaze.inc"
3 3
4require ${MICROBLAZEPATCHES} 4require ${MICROBLAZEPATCHES}
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc b/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc
index 96ffb289..44f4cc79 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc
+++ b/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc
@@ -1,6 +1,6 @@
1FILESEXTRAPATHS_append := ":${THISDIR}/binutils" 1FILESEXTRAPATHS:append := ":${THISDIR}/binutils"
2 2
3SRC_URI_append = " \ 3SRC_URI:append = " \
4 file://0001-Add-wdc.ext.clear-and-wdc.ext.flush-insns.patch \ 4 file://0001-Add-wdc.ext.clear-and-wdc.ext.flush-insns.patch \
5 file://0002-Add-mlittle-endian-and-mbig-endian-flags.patch \ 5 file://0002-Add-mlittle-endian-and-mbig-endian-flags.patch \
6 file://0003-Disable-the-warning-message-for-eh_frame_hdr.patch \ 6 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
index e439cae7..3d57ddbf 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils_%.bbappend
+++ b/meta-microblaze/recipes-devtools/binutils/binutils_%.bbappend
@@ -1,4 +1,4 @@
1MICROBLAZEPATCHES = "" 1MICROBLAZEPATCHES = ""
2MICROBLAZEPATCHES_microblaze = "binutils-microblaze.inc" 2MICROBLAZEPATCHES:microblaze = "binutils-microblaze.inc"
3 3
4require ${MICROBLAZEPATCHES} 4require ${MICROBLAZEPATCHES}
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-source_11.%.bbappend b/meta-microblaze/recipes-devtools/gcc/gcc-source_11.%.bbappend
index a0805425..c0ad2e66 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-source_11.%.bbappend
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-source_11.%.bbappend
@@ -1,7 +1,7 @@
1# Add MicroBlaze Patches (only when using MicroBlaze) 1# Add MicroBlaze Patches (only when using MicroBlaze)
2FILESEXTRAPATHS_append_microblaze := ":${THISDIR}/gcc-10" 2FILESEXTRAPATHS:append:microblaze := ":${THISDIR}/gcc-10"
3 3
4SRC_URI_append_microblaze = " \ 4SRC_URI:append:microblaze = " \
5 file://0001-LOCAL-Testsuite-builtins-tests-require-fpic.patch \ 5 file://0001-LOCAL-Testsuite-builtins-tests-require-fpic.patch \
6 file://0002-LOCAL-Quick-fail-g-.dg-opt-memcpy1.C.patch \ 6 file://0002-LOCAL-Quick-fail-g-.dg-opt-memcpy1.C.patch \
7 file://0003-LOCAL-For-dejagnu-static-testing-on-qemu-suppress-wa.patch \ 7 file://0003-LOCAL-For-dejagnu-static-testing-on-qemu-suppress-wa.patch \
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb-common.inc b/meta-microblaze/recipes-devtools/gdb/gdb-common.inc
index 08f615ad..72ede01e 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb-common.inc
+++ b/meta-microblaze/recipes-devtools/gdb/gdb-common.inc
@@ -4,10 +4,10 @@ SECTION = "devel"
4DEPENDS = "expat zlib ncurses virtual/libiconv ${LTTNGUST} bison-native" 4DEPENDS = "expat zlib ncurses virtual/libiconv ${LTTNGUST} bison-native"
5 5
6LTTNGUST = "lttng-ust" 6LTTNGUST = "lttng-ust"
7LTTNGUST_arc = "" 7LTTNGUST:arc = ""
8LTTNGUST_aarch64 = "" 8LTTNGUST:aarch64 = ""
9LTTNGUST_mipsarch = "" 9LTTNGUST:mipsarch = ""
10LTTNGUST_sh4 = "" 10LTTNGUST:sh4 = ""
11 11
12inherit autotools texinfo 12inherit autotools texinfo
13 13
@@ -49,14 +49,14 @@ do_configure () {
49 49
50# we don't want gdb to provide bfd/iberty/opcodes, which instead will override the 50# we don't want gdb to provide bfd/iberty/opcodes, which instead will override the
51# right bits installed by binutils. Same for bfd.info -- also from binutils. 51# right bits installed by binutils. Same for bfd.info -- also from binutils.
52do_install_append() { 52do_install:append() {
53 rm -rf ${D}${libdir} 53 rm -rf ${D}${libdir}
54 rm -rf ${D}${includedir} 54 rm -rf ${D}${includedir}
55 rm -rf ${D}${datadir}/locale 55 rm -rf ${D}${datadir}/locale
56 rm -f ${D}${infodir}/bfd.info 56 rm -f ${D}${infodir}/bfd.info
57} 57}
58 58
59RRECOMMENDS_gdb_append_linux = " glibc-thread-db " 59RRECOMMENDS:gdb:append_linux = " glibc-thread-db "
60RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db " 60RRECOMMENDS:gdb:append:linux-gnueabi = " glibc-thread-db "
61RRECOMMENDS_gdbserver_append_linux = " glibc-thread-db " 61RRECOMMENDS:gdbserver:append_linux = " glibc-thread-db "
62RRECOMMENDS_gdbserver_append_linux-gnueabi = " glibc-thread-db " 62RRECOMMENDS:gdbserver:append:linux-gnueabi = " glibc-thread-db "
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian.inc
index c9daf25a..92bff6fc 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian.inc
+++ b/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian.inc
@@ -20,7 +20,7 @@ PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,nati
20 20
21SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb" 21SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb"
22 22
23do_configure_prepend() { 23do_configure:prepend() {
24cat > ${WORKDIR}/python << EOF 24cat > ${WORKDIR}/python << EOF
25#! /bin/sh 25#! /bin/sh
26case "\$2" in 26case "\$2" in
@@ -36,7 +36,7 @@ EOF
36 36
37# we don't want gdb to provide bfd/iberty/opcodes, which instead will override the 37# we don't want gdb to provide bfd/iberty/opcodes, which instead will override the
38# right bits installed by binutils. 38# right bits installed by binutils.
39do_install_append() { 39do_install:append() {
40 rm -rf ${D}${exec_prefix}/lib 40 rm -rf ${D}${exec_prefix}/lib
41 cross_canadian_bindirlinks 41 cross_canadian_bindirlinks
42} 42}
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend b/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend
index ceb7b02b..33fbe158 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend
+++ b/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend
@@ -1,4 +1,4 @@
1MICROBLAZEPATCHES = "" 1MICROBLAZEPATCHES = ""
2MICROBLAZEPATCHES_microblaze = "gdb-microblaze.inc" 2MICROBLAZEPATCHES:microblaze = "gdb-microblaze.inc"
3 3
4require ${MICROBLAZEPATCHES} 4require ${MICROBLAZEPATCHES}
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb-cross.inc b/meta-microblaze/recipes-devtools/gdb/gdb-cross.inc
index ebe329f6..56b8726f 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb-cross.inc
+++ b/meta-microblaze/recipes-devtools/gdb/gdb-cross.inc
@@ -9,7 +9,7 @@ PACKAGECONFIG ??= "python readline"
9PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3-native" 9PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3-native"
10PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline-native" 10PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline-native"
11 11
12do_compile_prepend() { 12do_compile:prepend() {
13 export STAGING_LIBDIR="${STAGING_LIBDIR_NATIVE}" 13 export STAGING_LIBDIR="${STAGING_LIBDIR_NATIVE}"
14 export STAGING_INCDIR="${STAGING_INCDIR_NATIVE}" 14 export STAGING_INCDIR="${STAGING_INCDIR_NATIVE}"
15} 15}
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb-cross_%.bbappend b/meta-microblaze/recipes-devtools/gdb/gdb-cross_%.bbappend
index ceb7b02b..33fbe158 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb-cross_%.bbappend
+++ b/meta-microblaze/recipes-devtools/gdb/gdb-cross_%.bbappend
@@ -1,4 +1,4 @@
1MICROBLAZEPATCHES = "" 1MICROBLAZEPATCHES = ""
2MICROBLAZEPATCHES_microblaze = "gdb-microblaze.inc" 2MICROBLAZEPATCHES:microblaze = "gdb-microblaze.inc"
3 3
4require ${MICROBLAZEPATCHES} 4require ${MICROBLAZEPATCHES}
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb-microblaze.inc b/meta-microblaze/recipes-devtools/gdb/gdb-microblaze.inc
index 006b135d..b202b114 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb-microblaze.inc
+++ b/meta-microblaze/recipes-devtools/gdb/gdb-microblaze.inc
@@ -1,10 +1,10 @@
1# MicroBlaze does not support LTTng UST 1# MicroBlaze does not support LTTng UST
2LTTNGUST_microblaze = "" 2LTTNGUST:microblaze = ""
3 3
4# Add MicroBlaze patches 4# Add MicroBlaze patches
5FILESEXTRAPATHS_append := ":${THISDIR}/gdb" 5FILESEXTRAPATHS:append := ":${THISDIR}/gdb"
6 6
7SRC_URI_append_microblaze = " \ 7SRC_URI:append:microblaze = " \
8 file://0001-Add-wdc.ext.clear-and-wdc.ext.flush-insns.patch \ 8 file://0001-Add-wdc.ext.clear-and-wdc.ext.flush-insns.patch \
9 file://0003-Disable-the-warning-message-for-eh_frame_hdr.patch \ 9 file://0003-Disable-the-warning-message-for-eh_frame_hdr.patch \
10 file://0004-LOCAL-Fix-relaxation-of-assembler-resolved-reference.patch \ 10 file://0004-LOCAL-Fix-relaxation-of-assembler-resolved-reference.patch \
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb.inc b/meta-microblaze/recipes-devtools/gdb/gdb.inc
index 249e24dc..49870fbd 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb.inc
+++ b/meta-microblaze/recipes-devtools/gdb/gdb.inc
@@ -2,13 +2,13 @@ require gdb-common.inc
2 2
3inherit gettext 3inherit gettext
4 4
5#LDFLAGS_append = " -s" 5#LDFLAGS:append = " -s"
6#export CFLAGS_append=" -L${STAGING_LIBDIR}" 6#export CFLAGS:append=" -L${STAGING_LIBDIR}"
7 7
8# cross-canadian must not see this 8# cross-canadian must not see this
9PACKAGES =+ "gdbserver" 9PACKAGES =+ "gdbserver"
10FILES_gdbserver = "${bindir}/gdbserver" 10FILES:gdbserver = "${bindir}/gdbserver"
11 11
12ALLOW_EMPTY_gdbserver_riscv64 = "1" 12ALLOW_EMPTY:gdbserver:riscv64 = "1"
13ALLOW_EMPTY_gdbserver_riscv32 = "1" 13ALLOW_EMPTY:gdbserver:riscv32 = "1"
14 14
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb_%.bbappend b/meta-microblaze/recipes-devtools/gdb/gdb_%.bbappend
index ceb7b02b..33fbe158 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb_%.bbappend
+++ b/meta-microblaze/recipes-devtools/gdb/gdb_%.bbappend
@@ -1,4 +1,4 @@
1MICROBLAZEPATCHES = "" 1MICROBLAZEPATCHES = ""
2MICROBLAZEPATCHES_microblaze = "gdb-microblaze.inc" 2MICROBLAZEPATCHES:microblaze = "gdb-microblaze.inc"
3 3
4require ${MICROBLAZEPATCHES} 4require ${MICROBLAZEPATCHES}
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb_9.2.bb b/meta-microblaze/recipes-devtools/gdb/gdb_9.2.bb
index d70757a1..e73e3a2c 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb_9.2.bb
+++ b/meta-microblaze/recipes-devtools/gdb/gdb_9.2.bb
@@ -3,7 +3,7 @@ require gdb-${PV}.inc
3 3
4inherit python3-dir 4inherit python3-dir
5 5
6EXTRA_OEMAKE_append_libc-musl = "\ 6EXTRA_OEMAKE:append:libc-musl = "\
7 gt_cv_func_gnugettext1_libc=yes \ 7 gt_cv_func_gnugettext1_libc=yes \
8 gt_cv_func_gnugettext2_libc=yes \ 8 gt_cv_func_gnugettext2_libc=yes \
9 gl_cv_func_working_strerror=yes \ 9 gl_cv_func_working_strerror=yes \
@@ -11,7 +11,7 @@ EXTRA_OEMAKE_append_libc-musl = "\
11 gl_cv_func_gettimeofday_clobber=no \ 11 gl_cv_func_gettimeofday_clobber=no \
12 " 12 "
13 13
14do_configure_prepend() { 14do_configure:prepend() {
15 if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then 15 if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then
16 cat > ${WORKDIR}/python << EOF 16 cat > ${WORKDIR}/python << EOF
17#!/bin/sh 17#!/bin/sh