diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-09 16:31:22 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-16 23:32:39 +0100 |
commit | 1fc840ffc0267ecf3a15c4a59ab44869ef1d6339 (patch) | |
tree | b2932a0d0d7146bde799db47497236063050fc84 /meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |
parent | 22c8ed6484e0ee9328e3844c9e794f3d89ebb9f7 (diff) | |
download | poky-1fc840ffc0267ecf3a15c4a59ab44869ef1d6339.tar.gz |
meta: python3 megapatch
This needs splutting into smaller units, WIP atm.
(From OE-Core rev: 21529228a7dca96a6a1b44ed9380c523efdeeb3e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg.inc')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 5 |
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 30307bc86d..fda3c93972 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |||
@@ -168,9 +168,10 @@ python populate_packages_prepend() { | |||
168 | } | 168 | } |
169 | p = subprocess.Popen(args="pkg-config --variable=%s xorg-server" % abis[name], | 169 | p = subprocess.Popen(args="pkg-config --variable=%s xorg-server" % abis[name], |
170 | shell=True, env=newenv, stdout=subprocess.PIPE) | 170 | shell=True, env=newenv, stdout=subprocess.PIPE) |
171 | output = p.communicate()[0] | 171 | stdout, stderr = p.communicate() |
172 | output = stdout.decode("latin-1").split(".")[0] | ||
172 | mlprefix = d.getVar('MLPREFIX', True) or '' | 173 | mlprefix = d.getVar('MLPREFIX', True) or '' |
173 | return "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0]) | 174 | return "%sxorg-abi-%s-%s" % (mlprefix, name, output) |
174 | 175 | ||
175 | pn = d.getVar("PN", True) | 176 | pn = d.getVar("PN", True) |
176 | d.appendVar("RPROVIDES_" + pn, " " + get_abi("input")) | 177 | d.appendVar("RPROVIDES_" + pn, " " + get_abi("input")) |