diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2012-08-02 17:49:01 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-06 15:18:52 +0100 |
| commit | 2a88d4df8eb35b67cf0bdb2573abc7fbb5a7d108 (patch) | |
| tree | 57b3c803c996aae50a3c5612f5ce3bacad035c46 | |
| parent | c5084487eb7526323684e5389d28352c5787ebd2 (diff) | |
| download | poky-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.bb | 6 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-dri_git.bb | 6 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb | 6 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-xlib_git.bb | 6 |
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 219e55517c..bd62c98ce4 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 @@ | |||
| 1 | include mesa-common.inc | 1 | require mesa-common.inc |
| 2 | include mesa-${PV}.inc | 2 | require mesa-${PV}.inc |
| 3 | include mesa-dri.inc | 3 | require mesa-dri.inc |
| 4 | PR = "${INC_PR}.1" | 4 | PR = "${INC_PR}.1" |
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb index a0e19459f1..4b36f20beb 100644 --- a/meta/recipes-graphics/mesa/mesa-dri_git.bb +++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | include mesa-common.inc | 1 | require mesa-common.inc |
| 2 | include mesa-git.inc | 2 | require mesa-git.inc |
| 3 | include mesa-dri.inc | 3 | require 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 |
| 6 | DEFAULT_PREFERENCE = "-2" | 6 | DEFAULT_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 7547b22cc7..a89640e444 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 @@ | |||
| 1 | include mesa-common.inc | 1 | require mesa-common.inc |
| 2 | include mesa-${PV}.inc | 2 | require mesa-${PV}.inc |
| 3 | include mesa-xlib.inc | 3 | require mesa-xlib.inc |
| 4 | PR = "${INC_PR}.2" | 4 | PR = "${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 be2f5d3cfe..66471201f6 100644 --- a/meta/recipes-graphics/mesa/mesa-xlib_git.bb +++ b/meta/recipes-graphics/mesa/mesa-xlib_git.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | include mesa-common.inc | 1 | require mesa-common.inc |
| 2 | include mesa-git.inc | 2 | require mesa-git.inc |
| 3 | include mesa-xlib.inc | 3 | require 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 |
| 6 | DEFAULT_PREFERENCE = "-2" | 6 | DEFAULT_PREFERENCE = "-2" |