mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

xserver-xorg: Upgrade 1.16.3 -> 1.17.1 (OELAYOUT_ABI change)

Browse Source 
* 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>
This commit is contained in:
Jussi Kukkonen
2015-05-07 13:39:19 +03:00
committed by Richard Purdie
parent 0420f7f478
commit f63e9b30ea
9 changed files with 16 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/sanity.bbclass
+6
View File
@@ -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))