18 files changed, 38 insertions, 38 deletions

diff --git a/meta-microblaze/conf/layer.conf b/meta-microblaze/conf/layer.conf
index c2f7b4b0..678c5de0 100644
--- a/meta-microblaze/conf/layer.conf
+++ b/meta-microblaze/conf/layer.conf
@@ -12,5 +12,5 @@ BBFILE_PRIORITY_xilinx-microblaze = "5"
 LAYERDEPENDS_xilinx-microblaze = "core"
 
 # Until we've moved to a newer version, we need to stick on 9.2
-GDBVERSION_microblaze = "9.2"
+GDBVERSION:microblaze = "9.2"
 LAYERSERIES_COMPAT_xilinx-microblaze = "gatesgarth honister hardknott"
diff --git a/meta-microblaze/recipes-core/newlib/libgloss_4.1.%.bbappend b/meta-microblaze/recipes-core/newlib/libgloss_4.1.%.bbappend
index e7f0a9a3..15be1732 100644
--- a/meta-microblaze/recipes-core/newlib/libgloss_4.1.%.bbappend
+++ b/meta-microblaze/recipes-core/newlib/libgloss_4.1.%.bbappend
@@ -1,6 +1,6 @@
 require microblaze-newlib.inc
 
-do_configure_prepend_microblaze() {
+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"
 }
@@ -8,6 +8,6 @@ do_configure_prepend_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() {
+do_install:append:microblaze() {
     chmod 0644 ${D}${libdir}/*.o
 }
diff --git a/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc b/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc
index 1a4a90ad..c9589bfe 100644
--- a/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc
+++ b/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc
@@ -1,6 +1,6 @@
 # Add MicroBlaze Patches
-FILESEXTRAPATHS_append_microblaze := ":${THISDIR}/files"
-SRC_URI_append_microblaze = " \
+FILESEXTRAPATHS:append:microblaze := ":${THISDIR}/files"
+SRC_URI:append:microblaze = " \
     file://0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch \
     file://0002-Patch-microblaze-Modified-_exceptional_handler.patch \
     file://0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch \
diff --git a/meta-microblaze/recipes-core/newlib/newlib_4.1.%.bbappend b/meta-microblaze/recipes-core/newlib/newlib_4.1.%.bbappend
index d459bf19..d30e61ec 100644
--- a/meta-microblaze/recipes-core/newlib/newlib_4.1.%.bbappend
+++ b/meta-microblaze/recipes-core/newlib/newlib_4.1.%.bbappend
@@ -1,6 +1,6 @@
 require microblaze-newlib.inc
 
-do_configure_prepend_microblaze() {
+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-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 @@
 MICROBLAZEPATCHES = ""
-MICROBLAZEPATCHES_microblaze = "binutils-microblaze.inc"
+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
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 @@
 MICROBLAZEPATCHES = ""
-MICROBLAZEPATCHES_microblaze = "binutils-microblaze.inc"
+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 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 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/binutils"
+FILESEXTRAPATHS:append := ":${THISDIR}/binutils"
 
-SRC_URI_append = " \
+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
index e439cae7..3d57ddbf 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils_%.bbappend
+++ b/meta-microblaze/recipes-devtools/binutils/binutils_%.bbappend
@@ -1,4 +1,4 @@
 MICROBLAZEPATCHES = ""
-MICROBLAZEPATCHES_microblaze = "binutils-microblaze.inc"
+MICROBLAZEPATCHES:microblaze = "binutils-microblaze.inc"
 
 require ${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 @@
 # Add MicroBlaze Patches (only when using MicroBlaze)
-FILESEXTRAPATHS_append_microblaze := ":${THISDIR}/gcc-10"
+FILESEXTRAPATHS:append:microblaze := ":${THISDIR}/gcc-10"
 
-SRC_URI_append_microblaze = " \
+SRC_URI:append:microblaze = " \
     file://0001-LOCAL-Testsuite-builtins-tests-require-fpic.patch \
     file://0002-LOCAL-Quick-fail-g-.dg-opt-memcpy1.C.patch \
     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"
 DEPENDS = "expat zlib ncurses virtual/libiconv ${LTTNGUST} bison-native"
 
 LTTNGUST = "lttng-ust"
-LTTNGUST_arc = ""
-LTTNGUST_aarch64 = ""
-LTTNGUST_mipsarch = ""
-LTTNGUST_sh4 = ""
+LTTNGUST:arc = ""
+LTTNGUST:aarch64 = ""
+LTTNGUST:mipsarch = ""
+LTTNGUST:sh4 = ""
 
 inherit autotools texinfo
 
@@ -49,14 +49,14 @@ do_configure () {
 
 # we don't want gdb to provide bfd/iberty/opcodes, which instead will override the
 # right bits installed by binutils.  Same for bfd.info -- also from binutils.
-do_install_append() {
+do_install:append() {
         rm -rf ${D}${libdir}
         rm -rf ${D}${includedir}
         rm -rf ${D}${datadir}/locale
         rm -f ${D}${infodir}/bfd.info
 }
 
-RRECOMMENDS_gdb_append_linux = " glibc-thread-db "
-RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db "
-RRECOMMENDS_gdbserver_append_linux = " glibc-thread-db "
-RRECOMMENDS_gdbserver_append_linux-gnueabi = " glibc-thread-db "
+RRECOMMENDS:gdb:append_linux = " glibc-thread-db "
+RRECOMMENDS:gdb:append:linux-gnueabi = " glibc-thread-db "
+RRECOMMENDS:gdbserver:append_linux = " glibc-thread-db "
+RRECOMMENDS: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
 
 SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb"
 
-do_configure_prepend() {
+do_configure:prepend() {
 cat > ${WORKDIR}/python << EOF
 #! /bin/sh
 case "\$2" in
@@ -36,7 +36,7 @@ EOF
 
 # we don't want gdb to provide bfd/iberty/opcodes, which instead will override the
 # right bits installed by binutils.
-do_install_append() {
+do_install:append() {
         rm -rf ${D}${exec_prefix}/lib
         cross_canadian_bindirlinks
 }
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 @@
 MICROBLAZEPATCHES = ""
-MICROBLAZEPATCHES_microblaze = "gdb-microblaze.inc"
+MICROBLAZEPATCHES:microblaze = "gdb-microblaze.inc"
 
 require ${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"
 PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3-native"
 PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline-native"
 
-do_compile_prepend() {
+do_compile:prepend() {
     export STAGING_LIBDIR="${STAGING_LIBDIR_NATIVE}"
     export STAGING_INCDIR="${STAGING_INCDIR_NATIVE}"
 }
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 @@
 MICROBLAZEPATCHES = ""
-MICROBLAZEPATCHES_microblaze = "gdb-microblaze.inc"
+MICROBLAZEPATCHES:microblaze = "gdb-microblaze.inc"
 
 require ${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 @@
 # MicroBlaze does not support LTTng UST
-LTTNGUST_microblaze = ""
+LTTNGUST:microblaze = ""
 
 # Add MicroBlaze patches
-FILESEXTRAPATHS_append := ":${THISDIR}/gdb"
+FILESEXTRAPATHS:append := ":${THISDIR}/gdb"
 
-SRC_URI_append_microblaze = " \
+SRC_URI:append:microblaze = " \
      file://0001-Add-wdc.ext.clear-and-wdc.ext.flush-insns.patch \
      file://0003-Disable-the-warning-message-for-eh_frame_hdr.patch \
      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
 
 inherit gettext
 
-#LDFLAGS_append = " -s"
-#export CFLAGS_append=" -L${STAGING_LIBDIR}"
+#LDFLAGS:append = " -s"
+#export CFLAGS:append=" -L${STAGING_LIBDIR}"
 
 # cross-canadian must not see this
 PACKAGES =+ "gdbserver"
-FILES_gdbserver = "${bindir}/gdbserver"
+FILES:gdbserver = "${bindir}/gdbserver"
 
-ALLOW_EMPTY_gdbserver_riscv64 = "1"
-ALLOW_EMPTY_gdbserver_riscv32 = "1"
+ALLOW_EMPTY:gdbserver:riscv64 = "1"
+ALLOW_EMPTY:gdbserver:riscv32 = "1"
 
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 @@
 MICROBLAZEPATCHES = ""
-MICROBLAZEPATCHES_microblaze = "gdb-microblaze.inc"
+MICROBLAZEPATCHES:microblaze = "gdb-microblaze.inc"
 
 require ${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
 
 inherit python3-dir
 
-EXTRA_OEMAKE_append_libc-musl = "\
+EXTRA_OEMAKE:append:libc-musl = "\
                                  gt_cv_func_gnugettext1_libc=yes \
                                  gt_cv_func_gnugettext2_libc=yes \
                                  gl_cv_func_working_strerror=yes \
@@ -11,7 +11,7 @@ EXTRA_OEMAKE_append_libc-musl = "\
                                  gl_cv_func_gettimeofday_clobber=no \
                                 "
 
-do_configure_prepend() {
+do_configure:prepend() {
         if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then
                 cat > ${WORKDIR}/python << EOF
 #!/bin/sh