summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2012-08-02 16:49:01 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-06 14:18:52 (GMT)
commit2a88d4df8eb35b67cf0bdb2573abc7fbb5a7d108 (patch)
tree57b3c803c996aae50a3c5612f5ce3bacad035c46
parentc5084487eb7526323684e5389d28352c5787ebd2 (diff)
downloadpoky-2a88d4df8eb35b67cf0bdb2573abc7fbb5a7d108.tar.gz
mesa: Use 'require' instead of 'include'
These include files are really required, not optional. (From OE-Core rev: 1aa6c4a083e406de0119f92e9654068d6cc2e4de) Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb6
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_git.bb6
-rw-r--r--meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb6
-rw-r--r--meta/recipes-graphics/mesa/mesa-xlib_git.bb6
4 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb b/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb
index 219e555..bd62c98 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb
@@ -1,4 +1,4 @@
1include mesa-common.inc 1require mesa-common.inc
2include mesa-${PV}.inc 2require mesa-${PV}.inc
3include mesa-dri.inc 3require mesa-dri.inc
4PR = "${INC_PR}.1" 4PR = "${INC_PR}.1"
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
index a0e1945..4b36f20 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
@@ -1,6 +1,6 @@
1include mesa-common.inc 1require mesa-common.inc
2include mesa-git.inc 2require mesa-git.inc
3include mesa-dri.inc 3require mesa-dri.inc
4 4
5# this needs to be lower than -1 because all mesa-dri have -1 and git version has highest PV, but shouldn't be default 5# this needs to be lower than -1 because all mesa-dri have -1 and git version has highest PV, but shouldn't be default
6DEFAULT_PREFERENCE = "-2" 6DEFAULT_PREFERENCE = "-2"
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb b/meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb
index 7547b22..a89640e 100644
--- a/meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb
+++ b/meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb
@@ -1,5 +1,5 @@
1include mesa-common.inc 1require mesa-common.inc
2include mesa-${PV}.inc 2require mesa-${PV}.inc
3include mesa-xlib.inc 3require mesa-xlib.inc
4PR = "${INC_PR}.2" 4PR = "${INC_PR}.2"
5 5
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_git.bb b/meta/recipes-graphics/mesa/mesa-xlib_git.bb
index be2f5d3..6647120 100644
--- a/meta/recipes-graphics/mesa/mesa-xlib_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-xlib_git.bb
@@ -1,6 +1,6 @@
1include mesa-common.inc 1require mesa-common.inc
2include mesa-git.inc 2require mesa-git.inc
3include mesa-xlib.inc 3require mesa-xlib.inc
4 4
5# this needs to be lower than -1 because all mesa-dri have -1 and git version has highest PV, but shouldn't be default 5# this needs to be lower than -1 because all mesa-dri have -1 and git version has highest PV, but shouldn't be default
6DEFAULT_PREFERENCE = "-2" 6DEFAULT_PREFERENCE = "-2"