From 6921a88182ce51763fcf61273972df99dc2faee5 Mon Sep 17 00:00:00 2001 From: Sai Hari Chandana Kalluri Date: Tue, 28 Sep 2021 22:12:04 -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-xilinx-pynq/classes/xilinx-pynq.bbclass | 14 +++++++------- meta-xilinx-pynq/recipes-devtool/python/python-pynq.inc | 6 +++--- meta-xilinx-pynq/recipes-support/libcma/libcma_1.0.bb | 10 +++++----- .../recipes-support/pynq-overlay/pynq-overlay_1.0.bb | 12 ++++++------ .../pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb | 2 +- .../pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) (limited to 'meta-xilinx-pynq') diff --git a/meta-xilinx-pynq/classes/xilinx-pynq.bbclass b/meta-xilinx-pynq/classes/xilinx-pynq.bbclass index a183a78e..9110037a 100644 --- a/meta-xilinx-pynq/classes/xilinx-pynq.bbclass +++ b/meta-xilinx-pynq/classes/xilinx-pynq.bbclass @@ -1,36 +1,36 @@ PYNQ_NOTEBOOK_DIR ?= "${datadir}/notebooks" -PYNQ_ARCH_arm = "armv7l" -PYNQ_ARCH_aarch64 = "aarch64" +PYNQ_ARCH:arm = "armv7l" +PYNQ_ARCH:aarch64 = "aarch64" PYNQ_BUILD_ARCH="${PYNQ_ARCH_${TARGET_ARCH}}" PYNQ_BUILD_ROOT="${STAGING_DIR_TARGET}" BBCLASSEXTEND = "native nativesdk" PACKAGES += " ${PN}-notebooks" -FILES_${PN}-notebooks += "${PYNQ_NOTEBOOK_DIR}" +FILES:${PN}-notebooks += "${PYNQ_NOTEBOOK_DIR}" -INSANE_SKIP_${PN} += "staticdev dev-so" +INSANE_SKIP:${PN} += "staticdev dev-so" inherit python3-dir # Used for setup.py on PYNQ BOARD_NAME_ultra96 = "Ultra96" BOARD_NAME_zcu104-zynqmp = "ZCU104" -do_compile_prepend() { +do_compile:prepend() { export BOARD=${BOARD_NAME} export PYNQ_BUILD_ARCH=${PYNQ_BUILD_ARCH} export PYNQ_JUPYTER_NOTEBOOKS=${D}${PYNQ_NOTEBOOK_DIR} } -do_install_prepend() { +do_install:prepend() { export BOARD=${BOARD_NAME} export PYNQ_BUILD_ARCH=${PYNQ_BUILD_ARCH} export PYNQ_JUPYTER_NOTEBOOKS=${D}${PYNQ_NOTEBOOK_DIR} install -d ${PYNQ_JUPYTER_NOTEBOOKS} } -do_configure_prepend() { +do_configure:prepend() { export BOARD=${BOARD_NAME} export PYNQ_BUILD_ARCH=${PYNQ_BUILD_ARCH} export PYNQ_JUPYTER_NOTEBOOKS=${D}${PYNQ_NOTEBOOK_DIR} diff --git a/meta-xilinx-pynq/recipes-devtool/python/python-pynq.inc b/meta-xilinx-pynq/recipes-devtool/python/python-pynq.inc index 9aa55764..b35b98be 100644 --- a/meta-xilinx-pynq/recipes-devtool/python/python-pynq.inc +++ b/meta-xilinx-pynq/recipes-devtool/python/python-pynq.inc @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b42e39ad2ddbad7e8ad47f3eee6feff5" SRC_URI[md5sum] = "9950894100c20293e921090b76ca9f17" SRC_URI[sha256sum] = "4f719e2753093d1e79931755c624d160cf342c03af49e027d09abe75bdc8e8c5" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ ${PYTHON_PN}-core \ ${PYTHON_PN}-asyncio \ ${PYTHON_PN}-cffi \ @@ -37,8 +37,8 @@ SRC_URI += " \ file://0003-Use-sysroot-for-Displayport-library.patch \ " -FILESEXTRAPATHS_prepend := "${THISDIR}:" +FILESEXTRAPATHS:prepend := "${THISDIR}:" -do_install_append() { +do_install:append() { rm -rf ${D}${PYNQ_NOTEBOOK_DIR}_* } diff --git a/meta-xilinx-pynq/recipes-support/libcma/libcma_1.0.bb b/meta-xilinx-pynq/recipes-support/libcma/libcma_1.0.bb index 9d9a2b38..bd28e702 100644 --- a/meta-xilinx-pynq/recipes-support/libcma/libcma_1.0.bb +++ b/meta-xilinx-pynq/recipes-support/libcma/libcma_1.0.bb @@ -2,8 +2,8 @@ SUMMARY = "Recompile libcma against pynqlib c" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b42e39ad2ddbad7e8ad47f3eee6feff5" -CMA_ARCH_arm = "32" -CMA_ARCH_aarch64 = "64" +CMA_ARCH:arm = "32" +CMA_ARCH:aarch64 = "64" PYNQBRANCH ?= "image_v2.4" SRCBRANCHARG = "${@['nobranch=1', 'branch=${PYNQBRANCH}'][d.getVar('PYNQBRANCH', True) != '']}" @@ -15,8 +15,8 @@ SRCREV ?= "3d659d374701b7c34fa702e7aa23f71f9113f826" S="${WORKDIR}/git" -CMA_ARCH_arm = "32" -CMA_ARCH_aarch64 = "64" +CMA_ARCH:arm = "32" +CMA_ARCH:aarch64 = "64" do_install() { @@ -29,5 +29,5 @@ do_install() { SOLIBS = ".so" FILES_SOLIBSDEV = "" -FILES_${PN} += "/usr/lib/libcma.so /usr/include" +FILES:${PN} += "/usr/lib/libcma.so /usr/include" diff --git a/meta-xilinx-pynq/recipes-support/pynq-overlay/pynq-overlay_1.0.bb b/meta-xilinx-pynq/recipes-support/pynq-overlay/pynq-overlay_1.0.bb index 8f71d9ae..467414ed 100644 --- a/meta-xilinx-pynq/recipes-support/pynq-overlay/pynq-overlay_1.0.bb +++ b/meta-xilinx-pynq/recipes-support/pynq-overlay/pynq-overlay_1.0.bb @@ -19,11 +19,11 @@ SRC_URI = " \ S="${WORKDIR}" -PYNQ_DTSI ??= "pynq_zynqmp.dtsi" -PYNQ_DTSI_zynqmp ?= "pynq_zynqmp.dtsi" -PYNQ_DTSI_zynq ?= "pynq_zynq.dtsi" -PYNQ_SYMBOL_DTSI_zynqmp ?= "pynq_zynqmp_symbols.dtsi" -PYNQ_SYMBOL_DTSI_zynq ?= "pynq_zynq_symbols.dtsi" +PYNQ_DTSI ??= "pynq:zynqmp.dtsi" +PYNQ_DTSI:zynqmp ?= "pynq:zynqmp.dtsi" +PYNQ_DTSI:zynq ?= "pynq:zynq.dtsi" +PYNQ_SYMBOL_DTSI:zynqmp ?= "pynq:zynqmp_symbols.dtsi" +PYNQ_SYMBOL_DTSI:zynq ?= "pynq:zynq_symbols.dtsi" PYNQ_DTBO ?= "pynq.dtbo" PYNQ_SYMBOL_DTBO ?= "pynq-symbols.dtbo" @@ -51,4 +51,4 @@ do_install() { } -FILES_${PN} += "/lib/firmware/pynq.dtbo /lib/firmware/pynq-symbols.dtbo ${sysconfdir}/modprobe.d/generic-uio.conf" +FILES:${PN} += "/lib/firmware/pynq.dtbo /lib/firmware/pynq-symbols.dtbo ${sysconfdir}/modprobe.d/generic-uio.conf" 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 c20ac5d6..a736d963 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 @@ -13,7 +13,7 @@ SRCREV = "32eed91994228d1042a16c692047dfe81e47d498" inherit xilinx-pynq -RDEPENDS_${PN}-notebooks += "\ +RDEPENDS:${PN}-notebooks += "\ python3-pynq \ python3-pillow \ libstdc++ \ 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 d1aabb7d..7ed5f8a2 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 @@ -3,7 +3,7 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=f9990fcc34ccf1f82ccf1bc5a1cc3bfc" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ python3-pynq \ python3-pillow \ libstdc++ \ -- cgit v1.2.3-54-g00ecf