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>

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index a8c7b0ac53bb86effdcda1b878a33575f5f31c77..255939718eb3eab8a2153c898b8732262088192a 100644 (file)
--- 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"
 # Other packages tend to just care that there is *an* X server:
 PROVIDES += "virtual/xserver"
 
+PE = "2"
+
 XORG_PN = "xorg-server"
 SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
 SRC_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 8e97888b42628789d27c89fd6b595e032c15f93c..0f94fe29c50b87fea2b2d030b019d3810e7fcbc0 100644 (file)
--- 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 @@
 require xserver-xorg.inc
 require xserver-xorg-${PV}.inc
-
-PE = "1"