From 294482da9a3dffbbe503e0ed281952659dea4da6 Mon Sep 17 00:00:00 2001 From: Sai Hari Chandana Kalluri Date: Tue, 2 Nov 2021 01:02:46 -0700 Subject: 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 --- meta-microblaze/recipes-core/newlib/microblaze-newlib.inc | 2 +- meta-microblaze/recipes-devtools/gcc/gcc-sanitizers.inc | 2 +- meta-microblaze/recipes-devtools/gcc/libgcc-common.inc | 4 ++-- meta-xilinx-bsp/conf/machine/include/board/ultra96.inc | 6 +++--- meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc | 2 +- meta-xilinx-pynq/classes/xilinx-pynq.bbclass | 2 +- .../recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb | 4 ++-- .../pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb | 4 ++-- .../recipes-drivers/clockps-example_git.bb | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc b/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc index bc9b389c..f3ae4975 100644 --- a/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc +++ b/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc @@ -15,6 +15,6 @@ SRC_URI:append:microblaze = " \ file://0012-libc-machine-microblaze-strcmp.c-Fix-missing-end-of-.patch \ " -EXTRA_OECONF_append_xilinx-standalone_microblaze = " \ +EXTRA_OECONF:append_xilinx-standalone:microblaze = " \ --disable-newlib-reent-check-verify \ " diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-sanitizers.inc b/meta-microblaze/recipes-devtools/gcc/gcc-sanitizers.inc index c9f12ab4..c78d5214 100644 --- a/meta-microblaze/recipes-devtools/gcc/gcc-sanitizers.inc +++ b/meta-microblaze/recipes-devtools/gcc/gcc-sanitizers.inc @@ -107,7 +107,7 @@ FILES:liblsan-dev += "\ FILES:liblsan-staticdev += "${libdir}/liblsan.a" FILES:libtsan += "${libdir}/libtsan.so.*" -FILES_libtsan-dev += "\ +FILES:libtsan-dev += "\ ${libdir}/libtsan.so \ ${libdir}/libtsan.la \ ${libdir}/libtsan_*.o \ diff --git a/meta-microblaze/recipes-devtools/gcc/libgcc-common.inc b/meta-microblaze/recipes-devtools/gcc/libgcc-common.inc index 7c8a74d7..d48dc8b8 100644 --- a/meta-microblaze/recipes-devtools/gcc/libgcc-common.inc +++ b/meta-microblaze/recipes-devtools/gcc/libgcc-common.inc @@ -98,9 +98,9 @@ fakeroot python do_multilib_install() { for ml in multilibs.split(): - tune = d.getVar('DEFAULTTUNE_virtclass-multilib-' + ml) + tune = d.getVar('DEFAULTTUNE:virtclass-multilib-' + ml) if not tune: - bb.warn('DEFAULTTUNE_virtclass-multilib-%s is not defined. Skipping...' % ml) + bb.warn('DEFAULTTUNE:virtclass-multilib-%s is not defined. Skipping...' % ml) continue tune_parameters = get_tune_parameters(tune, d) diff --git a/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc b/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc index d0ed510c..d028336a 100644 --- a/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc +++ b/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc @@ -1,7 +1,7 @@ # Ultra96 items that need to be configured from zynqmp-generic -PACKAGE_ARCH:pn-linux-xlnx_ultra96 = "${BOARDVARIANT_ARCH}" -KERNEL_DEVICETREE_ultra96 = "xilinx/zynqmp-zcu100-revC.dtb" +PACKAGE_ARCH:pn-linux-xlnx:ultra96 = "${BOARDVARIANT_ARCH}" +KERNEL_DEVICETREE:ultra96 = "xilinx/zynqmp-zcu100-revC.dtb" # Enable bluetooth and wifi module -MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append_ultra96 = " linux-firmware-wl18xx linux-firmware-ti-bt-wl180x" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append:ultra96 = " linux-firmware-wl18xx linux-firmware-ti-bt-wl180x" diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc index 5be0938e..53fe83b0 100644 --- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc +++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc @@ -51,7 +51,7 @@ KBUILD_DEFCONFIG:zynq ?= "xilinx_zynq_defconfig" KBUILD_DEFCONFIG:microblaze ?= "mmu_defconfig" KBUILD_DEFCONFIG:versal ?= "xilinx_defconfig" -KERNEL_MODULE_AUTOLOAD_k26 += "usb5744" +KERNEL_MODULE_AUTOLOAD:k26 += "usb5744" # MicroBlaze BSP fragments KERNEL_FEATURES:append_kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" diff --git a/meta-xilinx-pynq/classes/xilinx-pynq.bbclass b/meta-xilinx-pynq/classes/xilinx-pynq.bbclass index 9110037a..3b40ac3c 100644 --- a/meta-xilinx-pynq/classes/xilinx-pynq.bbclass +++ b/meta-xilinx-pynq/classes/xilinx-pynq.bbclass @@ -14,7 +14,7 @@ INSANE_SKIP:${PN} += "staticdev dev-so" inherit python3-dir # Used for setup.py on PYNQ -BOARD_NAME_ultra96 = "Ultra96" +BOARD_NAME:ultra96 = "Ultra96" BOARD_NAME_zcu104-zynqmp = "ZCU104" do_compile:prepend() { diff --git a/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb b/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb index a736d963..3fed5261 100644 --- a/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb +++ b/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb @@ -22,7 +22,7 @@ RDEPENDS:${PN}-notebooks += "\ " COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE_ultra96 = "${MACHINE}" +COMPATIBLE_MACHINE:ultra96 = "${MACHINE}" S = "${WORKDIR}/git" @@ -55,4 +55,4 @@ do_install () { cp -r ${S}/notebooks/* ${JUPYTER_NOTEBOOKS}/bnn_examples/ } -PACKAGE_ARCH_ultra96 = "${BOARD_ARCH}" +PACKAGE_ARCH:ultra96 = "${BOARD_ARCH}" diff --git a/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb b/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb index 7ed5f8a2..f6febcc8 100644 --- a/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb +++ b/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb @@ -15,7 +15,7 @@ SRC_URI = "git://github.com/Xilinx/PYNQ-HelloWorld.git;protocol=https \ " COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE_ultra96 = "${MACHINE}" +COMPATIBLE_MACHINE:ultra96 = "${MACHINE}" SRC_URI[md5sum] = "ac1bfe94a18301b26ae5110ea26ca596" SRC_URI[sha256sum] = "f522c54c9418d1b1fdb6098cd7139439d47b041900000812c51200482d423460" @@ -37,4 +37,4 @@ do_install() { } -PACKAGE_ARCH_ultra96 = "${BOARD_ARCH}" +PACKAGE_ARCH:ultra96 = "${BOARD_ARCH}" diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_git.bb index d01e5d7f..8da16452 100644 --- a/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_git.bb @@ -8,7 +8,7 @@ DEPENDS += "libxil xiltimer resetps" inherit python3native -do_configure_prepend() { +do_configure:prepend() { cd ${S} lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ @@ -36,4 +36,4 @@ do_deploy() { } addtask deploy before do_build after do_package -FILES_${PN} = "${base_libdir}/firmware/*.elf" +FILES:${PN} = "${base_libdir}/firmware/*.elf" -- cgit v1.2.3-54-g00ecf