summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-10-13 10:54:42 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-14 13:18:08 +0100
commitbbd2fc32ed187324c356ba5f434daad31f2331f0 (patch)
tree8cab16043857b1a02dffdf8e60e2f3f26298be92
parentab4584ab79917980a5bf7a54ec138371253dd442 (diff)
downloadpoky-bbd2fc32ed187324c356ba5f434daad31f2331f0.tar.gz
xserver-xorg: move PE to xserver-xorg-common and bump it
* to provide upgrade path for meta-oe users, where it had PE = 2 already (From OE-Core rev: c38cb00a359a0015bc485edf9632efe295c58533) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc2
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index a8c7b0ac53..255939718e 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -12,6 +12,8 @@ PROVIDES = "virtual/xserver-xf86"
12# Other packages tend to just care that there is *an* X server: 12# Other packages tend to just care that there is *an* X server:
13PROVIDES += "virtual/xserver" 13PROVIDES += "virtual/xserver"
14 14
15PE = "2"
16
15XORG_PN = "xorg-server" 17XORG_PN = "xorg-server"
16SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" 18SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
17SRC_URI += "file://macro_tweak.patch" 19SRC_URI += "file://macro_tweak.patch"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
index 8e97888b42..0f94fe29c5 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
@@ -1,4 +1,2 @@
1require xserver-xorg.inc 1require xserver-xorg.inc
2require xserver-xorg-${PV}.inc 2require xserver-xorg-${PV}.inc
3
4PE = "1"