summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2015-05-07 13:39:19 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-03 16:38:48 +0100
commitf63e9b30eaa8107b8f66e3c118bd4d24185bf662 (patch)
treea4242770122a182f599be706adc364ea1e119372 /meta/classes
parent0420f7f47818d96964d48fd1309cea5f341432ed (diff)
downloadpoky-f63e9b30eaa8107b8f66e3c118bd4d24185bf662.tar.gz
xserver-xorg: Upgrade 1.16.3 -> 1.17.1 (OELAYOUT_ABI change)
* Increase OELAYOUT_ABI: this is required because the xf86-video-modesetting package moves from its own recipe to xserver-xorg and sanity check cannot handle that currently. The upgrade will delete old xf86-video-modesetting files from sysroots. * Remove upstreamed xserver-xorg patches * Remove xf86-video-modesetting recipe: the driver is now included in xserver-xorg recipe, which now produces the xf86-video-modesetting package. The package version changes from 0.9 to 1.17.1 * Update xserver-xorg license checksum: modesetting license info (another MIT one) has been added to the file (From OE-Core rev: 950846d019ffac21909a96d90af8cf7e5bdd5738) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/sanity.bbclass6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 32e9b82ff3..698303743c 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -536,6 +536,12 @@ def sanity_handle_abichanges(status, d):
536 sstate_clean_manifest(f, d) 536 sstate_clean_manifest(f, d)
537 with open(abifile, "w") as f: 537 with open(abifile, "w") as f:
538 f.write(current_abi) 538 f.write(current_abi)
539 elif abi == "10" and current_abi == "11":
540 bb.note("Converting staging layout from version 10 to layout version 11")
541 # Files in xf86-video-modesetting moved to xserver-xorg and bitbake can't currently handle that:
542 subprocess.call(d.expand("rm ${TMPDIR}/sysroots/*/usr/lib/xorg/modules/drivers/modesetting_drv.so ${TMPDIR}/sysroots/*/pkgdata/runtime/xf86-video-modesetting* ${TMPDIR}/sysroots/*/pkgdata/runtime-reverse/xf86-video-modesetting* ${TMPDIR}/sysroots/*/pkgdata/shlibs2/xf86-video-modesetting*"), shell=True)
543 with open(abifile, "w") as f:
544 f.write(current_abi)
539 elif (abi != current_abi): 545 elif (abi != current_abi):
540 # Code to convert from one ABI to another could go here if possible. 546 # Code to convert from one ABI to another could go here if possible.
541 status.addresult("Error, TMPDIR has changed its layout version number (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi)) 547 status.addresult("Error, TMPDIR has changed its layout version number (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi))