From aa6ad74ca5bc0f5c66852d9481da3b85d432c15e Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 3 Apr 2023 20:41:54 +0000 Subject: meta-microblaze: Rename glibc,libgloss,newlib bbappends Versions of these components have changes, rename to allow a wider wild card match. Signed-off-by: Mark Hatle --- meta-microblaze/recipes-core/glibc/glibc_%.bbappend | 1 + meta-microblaze/recipes-core/glibc/glibc_2.36.bbappend | 1 - meta-microblaze/recipes-core/newlib/libgloss_%.bbappend | 13 +++++++++++++ meta-microblaze/recipes-core/newlib/libgloss_4.2.%.bbappend | 13 ------------- meta-microblaze/recipes-core/newlib/newlib_%.bbappend | 7 +++++++ meta-microblaze/recipes-core/newlib/newlib_4.2.%.bbappend | 7 ------- 6 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 meta-microblaze/recipes-core/glibc/glibc_%.bbappend delete mode 100644 meta-microblaze/recipes-core/glibc/glibc_2.36.bbappend create mode 100644 meta-microblaze/recipes-core/newlib/libgloss_%.bbappend delete mode 100644 meta-microblaze/recipes-core/newlib/libgloss_4.2.%.bbappend create mode 100644 meta-microblaze/recipes-core/newlib/newlib_%.bbappend delete mode 100644 meta-microblaze/recipes-core/newlib/newlib_4.2.%.bbappend diff --git a/meta-microblaze/recipes-core/glibc/glibc_%.bbappend b/meta-microblaze/recipes-core/glibc/glibc_%.bbappend new file mode 100644 index 00000000..d42bcca5 --- /dev/null +++ b/meta-microblaze/recipes-core/glibc/glibc_%.bbappend @@ -0,0 +1 @@ +INSANE_SKIP:${PN}:append:microblaze = " textrel" diff --git a/meta-microblaze/recipes-core/glibc/glibc_2.36.bbappend b/meta-microblaze/recipes-core/glibc/glibc_2.36.bbappend deleted file mode 100644 index d42bcca5..00000000 --- a/meta-microblaze/recipes-core/glibc/glibc_2.36.bbappend +++ /dev/null @@ -1 +0,0 @@ -INSANE_SKIP:${PN}:append:microblaze = " textrel" diff --git a/meta-microblaze/recipes-core/newlib/libgloss_%.bbappend b/meta-microblaze/recipes-core/newlib/libgloss_%.bbappend new file mode 100644 index 00000000..15be1732 --- /dev/null +++ b/meta-microblaze/recipes-core/newlib/libgloss_%.bbappend @@ -0,0 +1,13 @@ +require microblaze-newlib.inc + +do_configure:prepend:microblaze() { + # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC) + export CC="${CC} -L${S}/libgloss/microblaze" +} + +# Libgloss provides various .o files in libdir +# These must NOT be stripped, but for some reason they are installed +x +# which triggers them to be stripped. +do_install:append:microblaze() { + chmod 0644 ${D}${libdir}/*.o +} diff --git a/meta-microblaze/recipes-core/newlib/libgloss_4.2.%.bbappend b/meta-microblaze/recipes-core/newlib/libgloss_4.2.%.bbappend deleted file mode 100644 index 15be1732..00000000 --- a/meta-microblaze/recipes-core/newlib/libgloss_4.2.%.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -require microblaze-newlib.inc - -do_configure:prepend:microblaze() { - # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC) - export CC="${CC} -L${S}/libgloss/microblaze" -} - -# Libgloss provides various .o files in libdir -# These must NOT be stripped, but for some reason they are installed +x -# which triggers them to be stripped. -do_install:append:microblaze() { - chmod 0644 ${D}${libdir}/*.o -} diff --git a/meta-microblaze/recipes-core/newlib/newlib_%.bbappend b/meta-microblaze/recipes-core/newlib/newlib_%.bbappend new file mode 100644 index 00000000..d30e61ec --- /dev/null +++ b/meta-microblaze/recipes-core/newlib/newlib_%.bbappend @@ -0,0 +1,7 @@ +require microblaze-newlib.inc + +do_configure:prepend:microblaze() { + # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC) + export CC="${CC} -L${S}/libgloss/microblaze" +} + diff --git a/meta-microblaze/recipes-core/newlib/newlib_4.2.%.bbappend b/meta-microblaze/recipes-core/newlib/newlib_4.2.%.bbappend deleted file mode 100644 index d30e61ec..00000000 --- a/meta-microblaze/recipes-core/newlib/newlib_4.2.%.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -require microblaze-newlib.inc - -do_configure:prepend:microblaze() { - # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC) - export CC="${CC} -L${S}/libgloss/microblaze" -} - -- cgit v1.2.3-54-g00ecf