summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-12-24 13:28:39 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-31 09:43:25 +0000
commit5be92d4f0677c9191159fee541990e1bf77823f9 (patch)
treea8e5966e7b473e2a2e9ab93da8d53893ed43b839
parent1674541ed83fa4645f2e078f65fe0f878527ee6e (diff)
downloadpoky-5be92d4f0677c9191159fee541990e1bf77823f9.tar.gz
xserver-xorg: enable multilib
[YOCTO #3438] (From OE-Core rev: 4c49e76b793bd80422d7b9566d218ca7d087905b) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 7331cf64dd..5d5443c7db 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -13,7 +13,7 @@ PROVIDES = "virtual/xserver-xf86"
13PROVIDES += "virtual/xserver" 13PROVIDES += "virtual/xserver"
14 14
15PE = "2" 15PE = "2"
16INC_PR = "r7" 16INC_PR = "r8"
17 17
18XORG_PN = "xorg-server" 18XORG_PN = "xorg-server"
19SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" 19SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
@@ -151,7 +151,8 @@ python populate_packages_prepend() {
151 p = subprocess.Popen(args="pkg-config --variable=%s xorg-server" % abis[name], 151 p = subprocess.Popen(args="pkg-config --variable=%s xorg-server" % abis[name],
152 shell=True, env=newenv, stdout=subprocess.PIPE) 152 shell=True, env=newenv, stdout=subprocess.PIPE)
153 output = p.communicate()[0] 153 output = p.communicate()[0]
154 return "xorg-abi-%s-%s" % (name, output.split(".")[0]) 154 mlprefix = d.getVar('MLPREFIX', True) or ''
155 return "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0])
155 156
156 pn = d.getVar("PN", True) 157 pn = d.getVar("PN", True)
157 d.appendVar("RPROVIDES_" + pn, " " + get_abi("input")) 158 d.appendVar("RPROVIDES_" + pn, " " + get_abi("input"))