From: Mark Hatle <[email protected]> There is no need for multiple version, the latest version supports many older kernels. Version is being set to 2023.2, as keeping the string at 1.0.0 is meaningless, since every version released has been 1.0.0.
Signed-off-by: Mark Hatle <[email protected]> --- meta-xilinx-core/conf/layer.conf | 3 -- .../vcu/kernel-module-vcu_2022.1.bb | 39 ------------------- .../vcu/kernel-module-vcu_2022.2.bb | 39 ------------------- .../vcu/kernel-module-vcu_2023.1.bb | 39 ------------------- .../vcu/kernel-module-vcu_2023.2.bb | 3 +- 5 files changed, 1 insertion(+), 122 deletions(-) delete mode 100644 meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.1.bb delete mode 100644 meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.2.bb delete mode 100644 meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.1.bb diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index a8347722..f202e390 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -70,9 +70,6 @@ XILINX_LINUX_VERSION[v2023.1] = "6.1.30%" XILINX_LINUX_VERSION[v2023.2] = "6.1.60%" PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" -# VCU kernel module -PREFERRED_VERSION_kernel-module-vcu = "1.0.0-xilinx-${XILINX_RELEASE_VERSION}+git%" - # VDU kernel module PREFERRED_VERSION_kernel-module-vdu = "1.0.0-xilinx-${XILINX_RELEASE_VERSION}+git%" 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 deleted file mode 100644 index 5db38840..00000000 --- a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.1.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Linux kernel module for Video Code Unit" -DESCRIPTION = "Out-of-tree VCU decoder, encoder and common kernel modules provider for MPSoC EV devices" -SECTION = "kernel/modules" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a" - -XILINX_VCU_VERSION = "1.0.0" -PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git" - -S = "${WORKDIR}/git" - -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - -BRANCH = "xlnx_rel_v2022.1" -REPO = "git://github.com/Xilinx/vcu-modules.git;protocol=https" -SRCREV = "9d2657550eccebccce08cacfcdd369367b9f6be4" - -BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" -SRC_URI = " \ - ${REPO};${BRANCHARG} \ - file://99-vcu-enc-dec.rules \ - " - -inherit module features_check - -REQUIRED_MACHINE_FEATURES = "vcu" - -EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}" - -RDEPENDS:${PN} = "vcu-firmware" - -KERNEL_MODULE_AUTOLOAD += "dmaproxy" - -do_install:append() { - install -d ${D}${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/99-vcu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/ -} - -FILES:${PN} = "${sysconfdir}/udev/rules.d/*" diff --git a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.2.bb deleted file mode 100644 index 5b39ffc7..00000000 --- a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.2.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Linux kernel module for Video Code Unit" -DESCRIPTION = "Out-of-tree VCU decoder, encoder and common kernel modules provider for MPSoC EV devices" -SECTION = "kernel/modules" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a" - -XILINX_VCU_VERSION = "1.0.0" -PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git" - -S = "${WORKDIR}/git" - -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - -BRANCH = "xlnx_rel_v2022.2" -REPO = "git://github.com/Xilinx/vcu-modules.git;protocol=https" -SRCREV = "b131e220285e06658b6ab27f9e19b1c592a55f3a" - -BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" -SRC_URI = " \ - ${REPO};${BRANCHARG} \ - file://99-vcu-enc-dec.rules \ - " - -inherit module features_check - -REQUIRED_MACHINE_FEATURES = "vcu" - -EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}" - -RDEPENDS:${PN} = "vcu-firmware" - -KERNEL_MODULE_AUTOLOAD += "dmaproxy" - -do_install:append() { - install -d ${D}${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/99-vcu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/ -} - -FILES:${PN} = "${sysconfdir}/udev/rules.d/*" diff --git a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.1.bb deleted file mode 100644 index 9b343c5b..00000000 --- a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.1.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Linux kernel module for Video Code Unit" -DESCRIPTION = "Out-of-tree VCU decoder, encoder and common kernel modules provider for MPSoC EV devices" -SECTION = "kernel/modules" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a" - -XILINX_VCU_VERSION = "1.0.0" -PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git" - -S = "${WORKDIR}/git" - -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - -BRANCH = "xlnx_rel_v2023.1" -REPO = "git://github.com/Xilinx/vcu-modules.git;protocol=https" -SRCREV = "4afe0ab4eb3b7f2d17bcb823dee0caa0f03ab7a0" - -BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" -SRC_URI = " \ - ${REPO};${BRANCHARG} \ - file://99-vcu-enc-dec.rules \ - " - -inherit module features_check - -REQUIRED_MACHINE_FEATURES = "vcu" - -EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}" - -RDEPENDS:${PN} = "vcu-firmware" - -KERNEL_MODULE_AUTOLOAD += "dmaproxy" - -do_install:append() { - install -d ${D}${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/99-vcu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/ -} - -FILES:${PN} = "${sysconfdir}/udev/rules.d/*" 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 b643535d..be959edf 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 @@ -4,8 +4,7 @@ SECTION = "kernel/modules" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a" -XILINX_VCU_VERSION = "1.0.0" -PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git" +PV .= "+git" S = "${WORKDIR}/git" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#5337): https://lists.yoctoproject.org/g/meta-xilinx/message/5337 Mute This Topic: https://lists.yoctoproject.org/mt/106179154/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-xilinx/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
