From: Martin Jansa Date: Thu, 13 Oct 2011 08:54:42 +0000 (+0200) Subject: xserver-xorg: move PE to xserver-xorg-common and bump it X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bbd2fc32ed187324c356ba5f434daad31f2331f0;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc index a8c7b0ac53b..255939718eb 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" # 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 8e97888b426..0f94fe29c50 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 @@ require xserver-xorg.inc require xserver-xorg-${PV}.inc - -PE = "1"