diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-05-07 13:39:19 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-03 16:36:19 +0100 |
| commit | 950846d019ffac21909a96d90af8cf7e5bdd5738 (patch) | |
| tree | fc4e7a193ec9c1717671e19ebc5743eae2d2ecc3 /meta/classes | |
| parent | 898b286b92b031db64c2143e81a79fbb20da481a (diff) | |
| download | openembedded-core-950846d019ffac21909a96d90af8cf7e5bdd5738.tar.gz openembedded-core-950846d019ffac21909a96d90af8cf7e5bdd5738.tar.bz2 openembedded-core-950846d019ffac21909a96d90af8cf7e5bdd5738.zip | |
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 <jussi.kukkonen@intel.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/sanity.bbclass | 6 |
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): 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)) |