[oe-commits] [openembedded-core] 01/18: xcb-proto: solve python cache collision

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 6f6a2b5ff7ec23bd3782f0c3521f3576101cbc9d
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Fri Mar 2 14:06:49 2018 +0000

    xcb-proto: solve python cache collision
    
    Because I didn't really want python3-native to be at the bottom of the
    entire X11 stack this recipe jumps through a small hoop to use the host
    Python to run some modules it installs into the sysroot.
    
    The Makefile compiles the Python module, which is good as the cache file
    is recorded in the sstate manifest so when the package is removed from the
    sysroot all of it is removed.
    
    However in an enviroment where the sstate is shared between multiple hosts
    it is possible that a different Python is used and this will generate a
    new cache when the code is executed, which is not recorded in the manifest.
    Eventually you'll end up with ownerless cache files in a sysroot which
    conflict with the same file coming from a sstate upgrade.
    
    Solve this with a SSTATE_INST_POSTRM which is ran when sstate is removed
    to ensure that there are no Python cache files left behind.
    
    [ YOCTO #11809 ]
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb
index 712ab6c..25a8373 100644
--- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb
+++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb
@@ -34,3 +34,20 @@ RDEPENDS_${PN}-dev = ""
 RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
 
 BBCLASSEXTEND = "native nativesdk"
+
+# Need to do this dance because we're forcing the use of host Python above and
+# if xcb-proto is built with Py3.5 and then re-used from sstate on a host with
+# Py3.6 the second build will write new cache files into the sysroot which won't
+# be listed in the manifest so won't be deleted, resulting in an error on
+# rebuilds.  Solve this by deleting the entire cache directory when this package
+# is removed from the sysroot.
+SSTATEPOSTINSTFUNCS += "xcb_sstate_postinst"
+xcb_sstate_postinst() {
+	if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
+	then
+		cat <<EOF >${SSTATE_INST_POSTRM}
+#!/bin/sh
+rm -rf ${libdir}/xcb-proto/xcbgen/__pycache__
+EOF
+	fi
+}

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.