From: Mark Hatle <[email protected]> Since each of these recipes uses MACHINE_FEATURES...
...we no longer should be using COMPATIBLE_MACHINE. ...we should be setting PACKAGE_ARCH = MACHINE_ARCH. Signed-off-by: Mark Hatle <[email protected]> --- .../vcu/libvcu-xlnx_1.0.74-xilinx-v2023.2.bb | 2 ++ .../vcu/vcu-firmware_20230530-xilinx-v2023.2.bb | 2 ++ .../recipes-multimedia/vdu/kernel-module-vdu_2023.2.bb | 6 ------ .../vdu/libvdu-ctrlsw_1.0.73-xilinx-v2023.2.bb | 6 +----- .../vdu/libvdu-omxil_1.1.2-xilinx-v2023.2.bb | 6 +----- .../vdu/vdu-firmware_20230127-xilinx-v2023.2.bb | 5 +---- 6 files changed, 7 insertions(+), 20 deletions(-) diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_1.0.74-xilinx-v2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_1.0.74-xilinx-v2023.2.bb index 0c97f637..f28bba55 100644 --- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_1.0.74-xilinx-v2023.2.bb +++ b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_1.0.74-xilinx-v2023.2.bb @@ -14,6 +14,8 @@ SRC_URI = "${REPO};${BRANCHARG}" SRC_URI += "file://0001-Support-updated-gcc-add-cstdint-where-necessary.patch" +PACKAGE_ARCH = "${MACHINE_ARCH}" + S = "${WORKDIR}/git" inherit features_check diff --git a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_20230530-xilinx-v2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_20230530-xilinx-v2023.2.bb index d511003e..e69d354e 100644 --- a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_20230530-xilinx-v2023.2.bb +++ b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_20230530-xilinx-v2023.2.bb @@ -18,6 +18,8 @@ inherit features_check REQUIRED_MACHINE_FEATURES = "vcu" +PACKAGE_ARCH = "${MACHINE_ARCH}" + do_install() { install -Dm 0644 ${S}/1.0.0/lib/firmware/al5d_b.fw ${D}${nonarch_base_libdir}/firmware/al5d_b.fw install -Dm 0644 ${S}/1.0.0/lib/firmware/al5d.fw ${D}${nonarch_base_libdir}/firmware/al5d.fw diff --git a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.2.bb index 9e80b5ec..31ee4081 100644 --- a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.2.bb +++ b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2023.2.bb @@ -26,12 +26,6 @@ EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}" RDEPENDS:${PN} = "vdu-firmware" -COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core" -COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge" - -PACKAGE_ARCH = "${SOC_FAMILY_ARCH}" - do_install:append() { install -d ${D}${sysconfdir}/udev/rules.d install -m 0644 ${WORKDIR}/99-vdu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/ diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_1.0.73-xilinx-v2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_1.0.73-xilinx-v2023.2.bb index 3f7649b5..2be171eb 100644 --- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_1.0.73-xilinx-v2023.2.bb +++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_1.0.73-xilinx-v2023.2.bb @@ -20,11 +20,7 @@ SRC_URI = "${REPO};${BRANCHARG} \ S = "${WORKDIR}/git" -COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core" -COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge" - -PACKAGE_ARCH = "${SOC_FAMILY_ARCH}" +PACKAGE_ARCH = "${MACHINE_ARCH}" RDEPENDS:${PN} = "kernel-module-vdu" diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2023.2.bb index 7a79e238..b3362417 100644 --- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2023.2.bb +++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2023.2.bb @@ -19,11 +19,7 @@ inherit autotools features_check REQUIRED_MACHINE_FEATURES = "vdu" -COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core" -COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge" - -PACKAGE_ARCH = "${SOC_FAMILY_ARCH}" +PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "libvdu-ctrlsw" RDEPENDS:${PN} = "kernel-module-vdu libvdu-ctrlsw" diff --git a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_20230127-xilinx-v2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_20230127-xilinx-v2023.2.bb index 3cbc9eef..a60d68f5 100644 --- a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_20230127-xilinx-v2023.2.bb +++ b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_20230127-xilinx-v2023.2.bb @@ -18,11 +18,8 @@ SRCREV ?= "731897772730178f6a4e77eedeb4fb53faa1ab4d" BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" SRC_URI = "${REPO};${BRANCHARG}" -COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core" -COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge" +PACKAGE_ARCH = "${MACHINE_ARCH}" -PACKAGE_ARCH = "${SOC_FAMILY_ARCH}" EXTRA_OEMAKE +="INSTALL_PATH=${D}/${nonarch_base_libdir}/firmware" do_compile[noexec] = "1" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#5345): https://lists.yoctoproject.org/g/meta-xilinx/message/5345 Mute This Topic: https://lists.yoctoproject.org/mt/106179162/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-xilinx/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
