mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-04-20 19:53:43 +00:00
ti-img-rogue-*: version bump to 23.3.6512818
Migrate to version 23.3.6512818, this includes the stability updates released in 23.2 as well as some additional modifications to help with userspace application support, namely Chromium. We're also dropping the x11 window system extensions from the Vulkan libraries for now. Ideally, both x11 and wayland extensions will be provided by mesa's vulkan-wsi-layer in the future, but currently x11 isn't supported and this just added extra complexity to the package in Yocto. Signed-off-by: Randolph Sapp <rs@ti.com> Tested-by: Darren Etheridge <detheridge@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
committed by
Ryan Eatmon
parent
5b29403de4
commit
e9ed788e18
@@ -1,35 +0,0 @@
|
||||
From 738dfc1b33a83e9995ed7f65ec41ebe2fc6a90ed Mon Sep 17 00:00:00 2001
|
||||
From: Ryan Eatmon <reatmon@ti.com>
|
||||
Date: Wed, 1 Nov 2023 10:04:29 -0500
|
||||
Subject: [PATCH] build: kbuild: Makefile.template: use SECONDARY
|
||||
|
||||
For some reason on master we are seeing an error:
|
||||
|
||||
| make[5]: *** .NOTINTERMEDIATE and .SECONDARY are mutually exclusive. Stop.
|
||||
|
||||
Flip this back to .SECONDARY to fix this build issue.
|
||||
|
||||
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
---
|
||||
build/linux/kbuild/Makefile.template | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build/linux/kbuild/Makefile.template b/build/linux/kbuild/Makefile.template
|
||||
index aa19d66..31e37fb 100644
|
||||
--- a/build/linux/kbuild/Makefile.template
|
||||
+++ b/build/linux/kbuild/Makefile.template
|
||||
@@ -54,7 +54,7 @@
|
||||
|
||||
include $(OUT)/config_kernel.mk
|
||||
|
||||
-.NOTINTERMEDIATE:
|
||||
+.SECONDARY:
|
||||
|
||||
define symlink-source-file
|
||||
@if [ ! -e $(dir $@) ]; then mkdir -p $(dir $@); fi
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -20,11 +20,9 @@ BRANCH = "linuxws/kirkstone/k6.1/${PV}"
|
||||
|
||||
SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}"
|
||||
|
||||
SRC_URI:append = " file://0001-build-kbuild-Makefile.template-use-SECONDARY.patch"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
SRCREV = "2595524729c5acbabcbdee2185de64e7fcd6b36a"
|
||||
SRCREV = "41a494accb30aa2f247e6a4e123a4954982f2a88"
|
||||
|
||||
TARGET_PRODUCT:j721e = "j721e_linux"
|
||||
TARGET_PRODUCT:j721s2 = "j721s2_linux"
|
||||
@@ -14,7 +14,7 @@ PR = "r3"
|
||||
|
||||
BRANCH = "linuxws/kirkstone/k6.1/${PV}"
|
||||
SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}"
|
||||
SRCREV = "c2671c6eaf85ec6a1183c023bbb4d6e9e288fc10"
|
||||
SRCREV = "0b9e64254269be2fa95c4f3e1dd925d6e4d58199"
|
||||
S = "${WORKDIR}/git/targetfs/${TARGET_PRODUCT}/${PVR_WS}/${PVR_BUILD}"
|
||||
|
||||
TARGET_PRODUCT:j721e = "j721e_linux"
|
||||
@@ -33,7 +33,7 @@ RDEPENDS:${PN} = " \
|
||||
"
|
||||
|
||||
PACKAGECONFIG ?= " \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'vulkan x11 wayland', 'vulkan', '', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'vulkan wayland', 'vulkan', '', d)} \
|
||||
${@bb.utils.filter('DISTRO_FEATURES', 'opengl opencl', d)} \
|
||||
"
|
||||
|
||||
@@ -121,7 +121,7 @@ RDEPENDS:libgles2-rogue += "mesa-megadriver"
|
||||
|
||||
# vulkan specific shared objects and configs
|
||||
FILES:libvk-rogue = "${libdir}/libVK_IMG.so* ${datadir}/vulkan"
|
||||
RDEPENDS:libvk-rogue += "vulkan-loader libx11-xcb wayland libdrm"
|
||||
RDEPENDS:libvk-rogue += "vulkan-loader wayland libdrm"
|
||||
|
||||
# opencl specific shared objects and configs
|
||||
FILES:libopencl-rogue = "${libdir}/libPVROCL.so* ${sysconfdir}/OpenCL"
|
||||
Reference in New Issue
Block a user