Patchwork [dora,PATCH_V2] mesa: double check for eglplatform.h

login
register
mail settings
Submitter Valentin Popa
Date April 14, 2014, 1:58 p.m.
Message ID <1397483894-8263-1-git-send-email-valentin.popa@intel.com>
Download mbox | patch
Permalink /patch/70585/
State New
Headers show

Comments

Valentin Popa - April 14, 2014, 1:58 p.m.
Even if 'egl' is in PACKAGECONFIG, mesa egl support
can be disabled explicitly (using a .bbappend, for example).
This patch adds another check for the existence
of eglplatform.h before 'sed' can alter it.

Signed-off-by: Valentin Popa <valentin.popa@intel.com>
---
 meta/recipes-graphics/mesa/mesa_9.1.6.bb | 4 +++-
 meta/recipes-graphics/mesa/mesa_git.bb   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
Paul Eggleton - April 14, 2014, 2:02 p.m.
Hi Valentin,

On Monday 14 April 2014 16:58:14 Valentin Popa wrote:
> Even if 'egl' is in PACKAGECONFIG, mesa egl support
> can be disabled explicitly (using a .bbappend, for example).
> This patch adds another check for the existence
> of eglplatform.h before 'sed' can alter it.
> 
> Signed-off-by: Valentin Popa <valentin.popa@intel.com>

If this is dora-only, you need to mention why master isn't affected in the 
commit message. If it affects master the patch needs to go into master first and 
then dora.

Cheers,
Paul
Valentin Popa - April 14, 2014, 2:51 p.m.
On 04/14/2014 05:02 PM, Paul Eggleton wrote:
> Hi Valentin,
>
> On Monday 14 April 2014 16:58:14 Valentin Popa wrote:
>> Even if 'egl' is in PACKAGECONFIG, mesa egl support
>> can be disabled explicitly (using a .bbappend, for example).
>> This patch adds another check for the existence
>> of eglplatform.h before 'sed' can alter it.
>>
>> Signed-off-by: Valentin Popa <valentin.popa@intel.com>
> If this is dora-only, you need to mention why master isn't affected in the
> commit message. If it affects master the patch needs to go into master first and
> then dora.
>
> Cheers,
> Paul
>
It doesn't affect the master. It's just for dora. I'll submit a V3 with 
the explanations.

Patch

diff --git a/meta/recipes-graphics/mesa/mesa_9.1.6.bb b/meta/recipes-graphics/mesa/mesa_9.1.6.bb
index 6e9cd82..388cfd7 100644
--- a/meta/recipes-graphics/mesa/mesa_9.1.6.bb
+++ b/meta/recipes-graphics/mesa/mesa_9.1.6.bb
@@ -19,6 +19,8 @@  S = "${WORKDIR}/Mesa-${PV}"
 #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
 do_install_append() {
     if ${@base_contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
-        sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@base_contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
+        if [ -e "${D}${includedir}/EGL/eglplatform.h" ]; then
+            sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@base_contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
+        fi
     fi
 }
\ No newline at end of file
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
index 1babcc0..714911f 100644
--- a/meta/recipes-graphics/mesa/mesa_git.bb
+++ b/meta/recipes-graphics/mesa/mesa_git.bb
@@ -23,6 +23,8 @@  S = "${WORKDIR}/git"
 #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
 do_install_append() {
     if ${@base_contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
-        sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@base_contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
+        if [ -e "${D}${includedir}/EGL/eglplatform.h" ]; then
+            sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@base_contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
+        fi
     fi
 }