summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2025-09-04 16:03:35 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-09-11 11:31:56 +0100
commit1c8510c2427cf12e69e554ac1cbba8004abc3fda (patch)
tree9dc21f6fbbb2775ce8fb1375a0938152bd578acd
parent06b876d916f0ab75372758bfccf502bf6e069e70 (diff)
downloadpoky-1c8510c2427cf12e69e554ac1cbba8004abc3fda.tar.gz
mesa: assign S in include file
Anything including mesa.inc will have the sources extracted in ${UNPACKDIR}/mesa-${PV}. The default for S is ${UNPACKDIR}/${BP}. ${BP} is ${BPN}-${PV}. Because mesa.bb is named mesa, BPN will be mesa and thus S wasn't required for mesa.bb but only for mesa-gl.bb. This also explains why this change is fine for mesa.bb as the value of S won't have changed, the ${BPN} part is now just hardcoded to "mesa" for mesa.bb instead. No intended change in behavior. (From OE-Core rev: a77c0f5919fbef6e076d2b085f71c8bbbfc9188a) Signed-off-by: Ross Burton <ross.burton@arm.com> [added commit log and title] Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Tested-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl.bb2
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-gl.bb b/meta/recipes-graphics/mesa/mesa-gl.bb
index 4d71406b6d..7b283415dd 100644
--- a/meta/recipes-graphics/mesa/mesa-gl.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl.bb
@@ -4,8 +4,6 @@ SUMMARY += " (OpenGL only, no EGL/GLES)"
4 4
5PROVIDES = "virtual/libgl virtual/mesa" 5PROVIDES = "virtual/libgl virtual/mesa"
6 6
7S = "${UNPACKDIR}/mesa-${PV}"
8
9TARGET_CFLAGS = "-I${STAGING_INCDIR}/drm" 7TARGET_CFLAGS = "-I${STAGING_INCDIR}/drm"
10 8
11# At least one DRI rendering engine is required to build mesa. 9# At least one DRI rendering engine is required to build mesa.
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 4c079fe0ab..45499f6c42 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -24,6 +24,8 @@ PV = "25.2.0"
24 24
25UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" 25UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
26 26
27S = "${UNPACKDIR}/mesa-${PV}"
28
27#because we cannot rely on the fact that all apps will use pkgconfig, 29#because we cannot rely on the fact that all apps will use pkgconfig,
28#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER 30#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
29do_install:append() { 31do_install:append() {