diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-16 09:32:00 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-16 09:32:00 +0100 |
| commit | 5f254f7a424f04da9d68ed78b022dd590443cc3e (patch) | |
| tree | b74df7ff88b06bf22ee5ce3a7c91243020c0c237 | |
| parent | 74c7d672949580abed60647d9abbe70c39c516e1 (diff) | |
| parent | 927b2179e78f03a3117bd50de4ab7588103d4395 (diff) | |
| download | openembedded-5f254f7a424f04da9d68ed78b022dd590443cc3e.tar.gz | |
Merge commit 'origin/martin_jansa/srcpv' into shr/merge
Conflicts:
recipes/mesa/mesa-dri_git.bb
| -rw-r--r-- | recipes/mesa/mesa-dri_git.bb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/recipes/mesa/mesa-dri_git.bb b/recipes/mesa/mesa-dri_git.bb index ceea1227c1..001b228bfd 100644 --- a/recipes/mesa/mesa-dri_git.bb +++ b/recipes/mesa/mesa-dri_git.bb @@ -5,9 +5,8 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" -PV = "7.6.1+gitr${SRCREV}" +PV = "7.6.1+gitr${SRCPV}" PR = "${INC_PR}.3" -PE = "1" DEFAULT_PREFERENCE = "-2" DEFAULT_PREFERENCE_om-gta02 = "2" |