vcu/vdu: Sync VCU and VDU to make mainenance easier

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

7 files changed, 23 insertions, 23 deletions

diff --git a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.2.bb
index be959edf..ba4b9479 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.2.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
 PV .= "+git"
 
 S = "${WORKDIR}/git"
-
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 BRANCH = "xlnx_rel_v2023.2"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-ctrlsw_1.0.79-xilinx-v2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-ctrlsw_1.0.79-xilinx-v2023.2.bb
index 081398cc..7b320c6a 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-ctrlsw_1.0.79-xilinx-v2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-ctrlsw_1.0.79-xilinx-v2023.2.bb
@@ -25,6 +25,8 @@ inherit features_check
 
 REQUIRED_MACHINE_FEATURES = "vcu"
 
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 RDEPENDS:${PN} = "kernel-module-vcu"
 
 EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
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 e69d354e..ccd58f31 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
@@ -20,6 +20,8 @@ REQUIRED_MACHINE_FEATURES = "vcu"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
+do_compile[noexec] = "1"
+
 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 31ee4081..8b20baba 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
@@ -9,13 +9,14 @@ PV .= "+git"
 S = "${WORKDIR}/git"
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-BRANCH ?= "xlnx_rel_v2023.2"
-REPO ?= "git://github.com/Xilinx/vdu-modules.git;protocol=https"
-SRCREV ?= "4d5134f54006f904f0b28f00e05dd3febd5fcfd3"
+BRANCH = "xlnx_rel_v2023.2"
+REPO = "git://github.com/Xilinx/vdu-modules.git;protocol=https"
+SRCREV = "4d5134f54006f904f0b28f00e05dd3febd5fcfd3"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG} \
-        file://99-vdu-enc-dec.rules \
+SRC_URI = " \
+    ${REPO};${BRANCHARG} \
+    file://99-vdu-enc-dec.rules \
 "
 
 inherit module features_check
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 2be171eb..a3c1fc4d 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
@@ -5,10 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=aaf483d309243c4596f6373eb9c8325f"
 
 PV .= "+git"
 
-inherit autotools features_check
-
-REQUIRED_MACHINE_FEATURES = "vdu"
-
 BRANCH ?= "xlnx_rel_v2023.2"
 REPO   ?= "git://github.com/Xilinx/vdu-ctrl-sw.git;protocol=https"
 SRCREV ?= "1beb8f247d01b1a728faea36ce8f7847c895482f"
@@ -20,13 +16,14 @@ SRC_URI = "${REPO};${BRANCHARG} \
 
 S  = "${WORKDIR}/git"
 
+inherit autotools features_check
+
+REQUIRED_MACHINE_FEATURES = "vdu"
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 RDEPENDS:${PN} = "kernel-module-vdu"
 
-do_compile[dirs] = "${S}"
-do_install[dirs] = "${S}"
-
 EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
 EXTRA_OEMAKE +=" INSTALL_HDR_PATH=${D}${includedir}/vdu-ctrl-sw/include INSTALL_PATH=${D}${bindir}"
 
@@ -39,3 +36,6 @@ do_install:append() {
 # explicitly depends upon them.
 
 EXCLUDE_FROM_WORLD = "1"
+
+# Disable buildpaths QA check warnings.
+INSANE_SKIP:${PN} += "buildpaths"
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 b3362417..df39c41f 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
@@ -26,9 +26,6 @@ RDEPENDS:${PN} = "kernel-module-vdu libvdu-ctrlsw"
 
 EXTERNAL_INCLUDE="${STAGING_INCDIR}/vdu-ctrl-sw/include"
 
-do_compile[dirs] = "${S}"
-do_install[dirs] = "${S}"
-
 EXTRA_OEMAKE = " \
     CC='${CC}' CXX='${CXX} ${CXXFLAGS}' \
     EXTERNAL_INCLUDE='${EXTERNAL_INCLUDE}' \
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 a60d68f5..ddc8d9dc 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
@@ -7,10 +7,6 @@ PV .= "+git"
 
 S  = "${WORKDIR}/git"
 
-inherit autotools features_check
-
-REQUIRED_MACHINE_FEATURES = "vdu"
-
 BRANCH ?= "xlnx_rel_v2023.2"
 REPO ?= "git://github.com/Xilinx/vdu-firmware.git;protocol=https"
 SRCREV ?= "731897772730178f6a4e77eedeb4fb53faa1ab4d"
@@ -18,12 +14,15 @@ SRCREV ?= "731897772730178f6a4e77eedeb4fb53faa1ab4d"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI   = "${REPO};${BRANCHARG}"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+inherit autotools features_check
 
-EXTRA_OEMAKE +="INSTALL_PATH=${D}/${nonarch_base_libdir}/firmware"
+REQUIRED_MACHINE_FEATURES = "vdu"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 do_compile[noexec] = "1"
-do_install[dirs] = "${S}"
+
+EXTRA_OEMAKE +="INSTALL_PATH=${D}/${nonarch_base_libdir}/firmware"
 
 # Inhibit warnings about files being stripped
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"