vcu: Move vcu recipes to trigger off MACHINE_FEATURES vcu

Side effect of this change, all vcu recipes are now package arch of machine.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

7 files changed, 24 insertions, 17 deletions

diff --git a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.1.bb
index 0cb0c0ef..e585725c 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.1.bb
@@ -21,7 +21,9 @@ SRC_URI = " \
     file://99-vcu-enc-dec.rules \
     "
 
-inherit module
+inherit module features_check
+
+REQUIRED_MACHINE_FEATURES = "vcu"
 
 EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
 
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.1.bb
index b4460a38..47c521c4 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.1.bb
@@ -15,10 +15,11 @@ SRC_URI = "${REPO};${BRANCHARG}"
 
 S  = "${WORKDIR}/git"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+inherit features_check
 
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
+REQUIRED_MACHINE_FEATURES = "vcu"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS = "libvcu-xlnx"
 RDEPENDS:${PN} = "kernel-module-vcu libvcu-xlnx"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.2.bb
index 5b958bee..c5b956bc 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.2.bb
@@ -18,7 +18,7 @@ S  = "${WORKDIR}/git"
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS = "libvcu-xlnx"
 RDEPENDS:${PN} = "kernel-module-vcu libvcu-xlnx"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.1.bb
index 91f15cc2..48fd5fcb 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.1.bb
@@ -15,10 +15,11 @@ SRC_URI = "${REPO};${BRANCHARG}"
 
 S  = "${WORKDIR}/git"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+inherit features_check
 
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
+REQUIRED_MACHINE_FEATURES = "vcu"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 RDEPENDS:${PN} = "kernel-module-vcu"
 
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.2.bb
index 24be1173..b288ecb3 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.2.bb
@@ -15,10 +15,11 @@ SRC_URI = "${REPO};${BRANCHARG}"
 
 S  = "${WORKDIR}/git"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+inherit features_check
 
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
+REQUIRED_MACHINE_FEATURES = "vcu"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 RDEPENDS:${PN} = "kernel-module-vcu"
 
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.1.bb
index fc9f34ca..c5c2b045 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.1.bb
@@ -15,10 +15,11 @@ SRCREV = "569f980527fd58f43baf16bd0b294bf8c7cdf963"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI   = "${REPO};${BRANCHARG}"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+inherit features_check
 
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
+REQUIRED_MACHINE_FEATURES = "vcu"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 do_install() {
     install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d_b.fw ${D}/lib/firmware/al5d_b.fw
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.2.bb
index 6be9fe54..594a94c3 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.2.bb
@@ -15,10 +15,11 @@ SRCREV = "3980c778d71fa51a15e89bf70fd8fb28d5cb12e0"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI   = "${REPO};${BRANCHARG}"
 
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+inherit features_check
 
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
+REQUIRED_MACHINE_FEATURES = "vcu"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 do_install() {
     install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d_b.fw ${D}/lib/firmware/al5d_b.fw