From be068fec4927666ad84f8955b8cf65e9e25e837f Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 14 Oct 2021 07:46:23 -0700 Subject: meta-xilinx-standalone: various fixes for override syntax changes Signed-off-by: Mark Hatle --- meta-xilinx-standalone/conf/distro/xilinx-standalone.inc | 4 ++-- .../recipes-bsp/device-tree/device-tree.bbappend | 16 ++++++++-------- .../recipes-core/meta/meta-toolchain.bbappend | 4 ++-- .../recipes-core/newlib/libgloss_4.%.bbappend | 4 ++-- .../recipes-core/newlib/newlib_4.%.bbappend | 6 +++--- .../packagegroups/packagegroup-cross-canadian.bbappend | 2 +- .../binutils/binutils-xilinx-standalone.inc | 10 +++++----- .../gcc/gcc-configure-xilinx-standalone.inc | 8 ++++---- .../recipes-devtools/gcc/gcc-cross-canadian_%.bbappend | 4 ++-- .../recipes-devtools/gcc/gcc-cross_%.bbappend | 2 +- .../recipes-devtools/gcc/gcc-runtime_%.bbappend | 16 ++++++++-------- .../recipes-devtools/gcc/gcc-xilinx-standalone.inc | 10 +++++----- .../recipes-devtools/gcc/libgcc_%.bbappend | 6 +++--- 13 files changed, 46 insertions(+), 46 deletions(-) diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc index 45039835..bf1698a3 100644 --- a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc +++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc @@ -29,8 +29,8 @@ COMPATOS:class-target = ".*-linux${LIBCEXTENSION}${ABIEXTENSION}" COMPATIBLE_HOST ?= "${COMPATOS}" # Clear defaults -DISTRO_FEATURES_BACKFILL_xilinx-standalone = "" -VIRTUAL-RUNTIME_init_manager_xilinx-standalone = "" +DISTRO_FEATURES_BACKFILL:xilinx-standalone = "" +VIRTUAL-RUNTIME_init_manager:xilinx-standalone = "" PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" diff --git a/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend index 013f0401..056c4edc 100644 --- a/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend +++ b/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend @@ -1,13 +1,13 @@ -COMPATIBLE_HOST_xilinx-standalone = "${HOST_SYS}" +COMPATIBLE_HOST:xilinx-standalone = "${HOST_SYS}" -COMPATIBLE_MACHINE_cortexa53-zynqmp = ".*" -COMPATIBLE_MACHINE_cortexr5-zynqmp = ".*" +COMPATIBLE_MACHINE:cortexa53-zynqmp = ".*" +COMPATIBLE_MACHINE:cortexr5-zynqmp = ".*" COMPATIBLE_MACHINE:microblaze-pmu = ".*" COMPATIBLE_MACHINE:microblaze-plm = ".*" -COMPATIBLE_MACHINE_cortexa72-versal = ".*" -COMPATIBLE_MACHINE_cortexr5-versal = ".*" -COMPATIBLE_MACHINE_cortexa9-zynq = ".*" +COMPATIBLE_MACHINE:cortexa72-versal = ".*" +COMPATIBLE_MACHINE:cortexr5-versal = ".*" +COMPATIBLE_MACHINE:cortexa9-zynq = ".*" # Enable @ flag on dtc which is required by libxil -DTC_FLAGS:append_xilinx-standalone = " -@" -DT_INCLUDE:append_xilinx-standalone = " ${WORKDIR}/git/device_tree/data/kernel_dtsi/${XILINX_RELEASE_VERSION}/include/" +DTC_FLAGS:append:xilinx-standalone = " -@" +DT_INCLUDE:append:xilinx-standalone = " ${WORKDIR}/git/device_tree/data/kernel_dtsi/${XILINX_RELEASE_VERSION}/include/" diff --git a/meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend b/meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend index ff7d2c72..2d227e3d 100644 --- a/meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend +++ b/meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend @@ -8,5 +8,5 @@ HOST_DEPENDS = " \ nativesdk-sdk-provides-dummy \ " -TOOLCHAIN_HOST_TASK_xilinx-standalone = "${HOST_DEPENDS} packagegroup-cross-canadian-${MACHINE}" -TOOLCHAIN_TARGET_TASK_xilinx-standalone = "${@multilib_pkg_extend(d, 'packagegroup-newlib-standalone-sdk-target')}" +TOOLCHAIN_HOST_TASK:xilinx-standalone = "${HOST_DEPENDS} packagegroup-cross-canadian-${MACHINE}" +TOOLCHAIN_TARGET_TASK:xilinx-standalone = "${@multilib_pkg_extend(d, 'packagegroup-newlib-standalone-sdk-target')}" diff --git a/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend b/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend index 0301c572..70a2f9da 100644 --- a/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend +++ b/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend @@ -2,9 +2,9 @@ COMPATIBLE_HOST = ".*-elf" COMPATIBLE_HOST:arm = "[^-]*-[^-]*-eabi" # When building multiple, we need to depend on the multilib newlib -DEPENDS:append_xilinx-standalone = " ${MLPREFIX}newlib" +DEPENDS:append:xilinx-standalone = " ${MLPREFIX}newlib" -EXTRA_OECONF:append_xilinx-standalone = " \ +EXTRA_OECONF:append:xilinx-standalone = " \ --enable-newlib-io-c99-formats \ --enable-newlib-io-long-long \ --enable-newlib-io-float \ diff --git a/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend b/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend index 0d958f68..71590194 100644 --- a/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend +++ b/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend @@ -1,7 +1,7 @@ COMPATIBLE_HOST = ".*-elf" COMPATIBLE_HOST:arm = "[^-]*-[^-]*-eabi" -EXTRA_OECONF:append_xilinx-standalone = " \ +EXTRA_OECONF:append:xilinx-standalone = " \ --enable-newlib-io-c99-formats \ --enable-newlib-io-long-long \ --enable-newlib-io-float \ @@ -9,12 +9,12 @@ EXTRA_OECONF:append_xilinx-standalone = " \ " # Avoid trimmping CCARGS from CC by newlib configure -do_configure:prepend_xilinx-standalone(){ +do_configure:prepend:xilinx-standalone(){ export CC_FOR_TARGET="${CC}" } # Fix for multilib newlib installations -do_install:prepend_xilinx-standalone() { +do_install:prepend:xilinx-standalone() { mkdir -p $(dirname ${D}${libdir}) mkdir -p $(dirname ${D}${includedir}) } diff --git a/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend b/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend index 1df5430f..7ef0693b 100644 --- a/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend +++ b/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend @@ -5,7 +5,7 @@ GNUTCLINKS = "gnu-toolchain-canadian-${TARGET_SYS}" # Without the := the eval during do_package is occasionally missing multilibs -RDEPENDS:${PN}_xilinx-standalone := " \ +RDEPENDS:${PN}:xilinx-standalone := " \ ${@all_multilib_tune_values(d, 'GNUTCLINKS')} \ ${BINUTILS} \ ${GCC} \ diff --git a/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc index 0d647c31..463b796a 100644 --- a/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc +++ b/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc @@ -1,7 +1,7 @@ -LDGOLD_xilinx-standalone = "" -LDGOLD_ALTS_xilinx-standalone = "" +LDGOLD:xilinx-standalone = "" +LDGOLD_ALTS:xilinx-standalone = "" -EXTRA_OECONF:append_xilinx-standalone = " \ +EXTRA_OECONF:append:xilinx-standalone = " \ --disable-gprof \ --disable-shared \ --enable-lto \ @@ -10,10 +10,10 @@ EXTRA_OECONF:append_xilinx-standalone = " \ " # CortexR5 and 32-bit arm are both "arm" -EXTRA_OECONF:append_xilinx-standalone:arm = " \ +EXTRA_OECONF:append:xilinx-standalone:arm = " \ --enable-interwork \ " -EXTRA_OECONF:append_xilinx-standalone:microblaze = " \ +EXTRA_OECONF:append:xilinx-standalone:microblaze = " \ --disable-initfini-array \ " diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-configure-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-configure-xilinx-standalone.inc index dcc82297..0320a780 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-configure-xilinx-standalone.inc +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-configure-xilinx-standalone.inc @@ -1,7 +1,7 @@ # Mimic the file gcc-configure-common from the Yocto Project -LINKER_HASH_STYLE_xilinx-standalone = "" -SYMVERS_CONF_xilinx-standalone = "" +LINKER_HASH_STYLE:xilinx-standalone = "" +SYMVERS_CONF:xilinx-standalone = "" -EXTRA_OECONF:append_xilinx-standalone:microblaze = " --disable-initfini_array" +EXTRA_OECONF:append:xilinx-standalone:microblaze = " --disable-initfini_array" -EXTRA_OECONF:append_xilinx-standalone:microblaze = " --disable-__cxa_atexit" +EXTRA_OECONF:append:xilinx-standalone:microblaze = " --disable-__cxa_atexit" diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend index 50681be2..b4fffe6a 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend @@ -2,9 +2,9 @@ require gcc-configure-xilinx-standalone.inc require gcc-xilinx-standalone.inc # We want to use the stock multilib configs, when available -EXTRACONFFUNCS_xilinx-standalone = "" +EXTRACONFFUNCS:xilinx-standalone = "" -EXTRA_OECONF:append_xilinx-standalone = " \ +EXTRA_OECONF:append:xilinx-standalone = " \ --enable-multilib \ " diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross_%.bbappend index 22a3e3a9..43d6be73 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross_%.bbappend +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross_%.bbappend @@ -2,5 +2,5 @@ require gcc-configure-xilinx-standalone.inc require gcc-xilinx-standalone.inc # We want to use the stock multilib configs, when available -EXTRACONFFUNCS_xilinx-standalone = "" +EXTRACONFFUNCS:xilinx-standalone = "" diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend index ecfb8bb3..5135fdf6 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend @@ -2,7 +2,7 @@ require gcc-configure-xilinx-standalone.inc COMPATIBLE_HOST = "${HOST_SYS}" -EXTRA_OECONF:append_xilinx-standalone:class-target = " \ +EXTRA_OECONF:append:xilinx-standalone:class-target = " \ --disable-libstdcxx-pch \ --with-newlib \ --disable-threads \ @@ -11,7 +11,7 @@ EXTRA_OECONF:append_xilinx-standalone:class-target = " \ --disable-libitm \ " -EXTRA_OECONF:append_xilinx-standalone:aarch64:class-target = " \ +EXTRA_OECONF:append:xilinx-standalone:aarch64:class-target = " \ --disable-multiarch \ --with-arch=armv8-a \ " @@ -21,16 +21,16 @@ EXTRA_OECONF:append_xilinx-standalone:aarch64:class-target = " \ ARM_PROFILE = "aprofile" ARM_PROFILE:armrm = "rmprofile" -EXTRA_OECONF:append_xilinx-standalone:arm:class-target = " \ +EXTRA_OECONF:append:xilinx-standalone:arm:class-target = " \ --with-multilib-list=${ARM_PROFILE} \ " -EXTRA_OECONF:append_xilinx-standalone:armrm:class-target = " \ +EXTRA_OECONF:append:xilinx-standalone:armrm:class-target = " \ --disable-tls \ --disable-decimal-float \ " -EXTRA_OECONF:append_xilinx-standalone:microblaze:class-target = " \ +EXTRA_OECONF:append:xilinx-standalone:microblaze:class-target = " \ --enable-target-optspace \ --without-long-double-128 \ " @@ -38,9 +38,9 @@ EXTRA_OECONF:append_xilinx-standalone:microblaze:class-target = " \ # Changes local to gcc-runtime... # Dont build libitm, etc. -RUNTIMETARGET_xilinx-standalone:class-target = "libstdc++-v3" +RUNTIMETARGET:xilinx-standalone:class-target = "libstdc++-v3" -do_install:append_xilinx-standalone:class-target() { +do_install:append:xilinx-standalone:class-target() { # Fixup what gcc-runtime normally would do, we don't want linux directories! rm -rf ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux @@ -69,6 +69,6 @@ do_install:append_xilinx-standalone:class-target() { fi } -FILES:${PN}-dbg:append_xilinx-standalone:class-target = "\ +FILES:${PN}-dbg:append:xilinx-standalone:class-target = "\ ${libdir}/libstdc++.a-gdb.py \ " diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc index ff3402a0..1262bd3c 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc @@ -1,4 +1,4 @@ -EXTRA_OECONF:append_xilinx-standalone = " \ +EXTRA_OECONF:append:xilinx-standalone = " \ --disable-libstdcxx-pch \ --with-newlib \ --disable-threads \ @@ -7,7 +7,7 @@ EXTRA_OECONF:append_xilinx-standalone = " \ --disable-libitm \ " -EXTRA_OECONF:append_xilinx-standalone:aarch64 = " \ +EXTRA_OECONF:append:xilinx-standalone:aarch64 = " \ --disable-multiarch \ --with-arch=armv8-a \ " @@ -16,16 +16,16 @@ EXTRA_OECONF:append_xilinx-standalone:aarch64 = " \ # So only set rmprofile if armrm is defined. ARM_PROFILE = "aprofile" ARM_PROFILE:armrm = "rmprofile" -EXTRA_OECONF:append_xilinx-standalone:arm = " \ +EXTRA_OECONF:append:xilinx-standalone:arm = " \ --with-multilib-list=${ARM_PROFILE} \ " -EXTRA_OECONF:append_xilinx-standalone:armrm = " \ +EXTRA_OECONF:append:xilinx-standalone:armrm = " \ --disable-tls \ --disable-decimal-float \ " -EXTRA_OECONF:append_xilinx-standalone:microblaze = " \ +EXTRA_OECONF:append:xilinx-standalone:microblaze = " \ --enable-target-optspace \ --without-long-double-128 \ " diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend index a9a389b2..861b3f9c 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend +++ b/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend @@ -2,7 +2,7 @@ require gcc-configure-xilinx-standalone.inc COMPATIBLE_HOST = "${HOST_SYS}" -python do_multilib_install_xilinx-standalone:class-target () { +python do_multilib_install:xilinx-standalone:class-target () { pass } @@ -19,11 +19,11 @@ standalone_fixup () { } FIXUP_FUNCTION = "" -FIXUP_FUNCTION_xilinx-standalone:class-target = " standalone_fixup" +FIXUP_FUNCTION:xilinx-standalone:class-target = " standalone_fixup" do_install[postfuncs] .= "${FIXUP_FUNCTION}" -FILES:${PN}-dev:append_xilinx-standalone:class-target = " \ +FILES:${PN}-dev:append:xilinx-standalone:class-target = " \ ${libdir}/*.a \ ${libdir}/*.o \ " -- cgit v1.2.3-54-g00ecf