diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-05 16:46:04 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-05 16:46:18 +0000 |
| commit | e5b9ac3b71b6c16fb9a629f12e4d83103db2d5b0 (patch) | |
| tree | bb6a67bb38620136eef91f5877b2d0f5da613dbf | |
| parent | ef1834ea4ce50087b0ab081d8fee6615743120b9 (diff) | |
| download | poky-e5b9ac3b71b6c16fb9a629f12e4d83103db2d5b0.tar.gz | |
mesa-xlib: Bump PR to resolve various package upgarde conflicts
(From OE-Core rev: b0cf83def3c621221a225787759ff8ca5a501a29)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-xlib_7.11.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-xlib_git.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb index 95ff5e8d69..7912287fe0 100644 --- a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb +++ b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | include mesa-common.inc | 1 | include mesa-common.inc |
| 2 | include mesa-${PV}.inc | 2 | include mesa-${PV}.inc |
| 3 | include mesa-xlib.inc | 3 | include mesa-xlib.inc |
| 4 | PR = "${INC_PR}.0" | 4 | PR = "${INC_PR}.1" |
| 5 | 5 | ||
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_git.bb b/meta/recipes-graphics/mesa/mesa-xlib_git.bb index 97cac51744..be2f5d3cfe 100644 --- a/meta/recipes-graphics/mesa/mesa-xlib_git.bb +++ b/meta/recipes-graphics/mesa/mesa-xlib_git.bb | |||
| @@ -5,4 +5,4 @@ include mesa-xlib.inc | |||
| 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" |
| 7 | 7 | ||
| 8 | PR = "${INC_PR}.0" | 8 | PR = "${INC_PR}.1" |