From 950846d019ffac21909a96d90af8cf7e5bdd5738 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Thu, 7 May 2015 13:39:19 +0300 Subject: 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 Signed-off-by: Jussi Kukkonen --- meta/classes/sanity.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'meta/classes/sanity.bbclass') 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): sstate_clean_manifest(f, d) with open(abifile, "w") as f: f.write(current_abi) + elif abi == "10" and current_abi == "11": + bb.note("Converting staging layout from version 10 to layout version 11") + # Files in xf86-video-modesetting moved to xserver-xorg and bitbake can't currently handle that: + 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) + with open(abifile, "w") as f: + f.write(current_abi) elif (abi != current_abi): # Code to convert from one ABI to another could go here if possible. 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)) -- cgit 1.2.3-korg