Patchwork [04/10] mesa: merge mesa-git.inc to mesa_git.bb

login
register
mail settings
Submitter Martin Jansa
Date June 12, 2013, 11:19 p.m.
Message ID <c8bce9ea4e2e14776f73290909ceeddea517d93e.1371079127.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/51641/
State Accepted
Commit fb595d8a1181f30daa1c80938a335f9d249de913
Headers show

Comments

Martin Jansa - June 12, 2013, 11:19 p.m.
---
 meta/recipes-graphics/mesa/mesa-git.inc | 10 ----------
 meta/recipes-graphics/mesa/mesa_git.bb  | 13 +++++++++++--
 2 files changed, 11 insertions(+), 12 deletions(-)
 delete mode 100644 meta/recipes-graphics/mesa/mesa-git.inc

Patch

diff --git a/meta/recipes-graphics/mesa/mesa-git.inc b/meta/recipes-graphics/mesa/mesa-git.inc
deleted file mode 100644
index cf07155..0000000
--- a/meta/recipes-graphics/mesa/mesa-git.inc
+++ /dev/null
@@ -1,10 +0,0 @@ 
-# 9.1.3 commit
-SRCREV = "f32ec82a8cfcabc5b7596796f36afe7986651f02"
-PV = "9.1.3+git${SRCPV}"
-
-SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
-           file://EGL-Mutate-NativeDisplayType-depending-on-config.patch \
-           file://fix-glsl-cross.patch \
-           "
-
-S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
index 241261c..ef0bec4 100644
--- a/meta/recipes-graphics/mesa/mesa_git.bb
+++ b/meta/recipes-graphics/mesa/mesa_git.bb
@@ -1,6 +1,15 @@ 
-require mesa-git.inc
-require mesa.inc
+require ${BPN}.inc
 
 DEFAULT_PREFERENCE = "-1"
 
 PR = "${INC_PR}.0"
+# 9.1.3 commit
+SRCREV = "f32ec82a8cfcabc5b7596796f36afe7986651f02"
+PV = "9.1.3+git${SRCPV}"
+
+SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
+           file://EGL-Mutate-NativeDisplayType-depending-on-config.patch \
+           file://fix-glsl-cross.patch \
+           "
+
+S = "${WORKDIR}/git"