sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

sanity: Drop obsolete TMPDIR ABI conversions 

When we get to version 12 we have a hard break as we can't convert to newer
versions. There is no point in running the old conversions on an old tmpdir
only to hit that block. Remove all the old conversions to avoid that and
make things clearer.

(From OE-Core rev: 163b27bdfe323b648929240375aaf251e8d5edf4)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2017-03-30 10:26:56 +01:00
parent 8babb56c92
commit 236a291abc
1 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
meta/classes/sanity.bbclass
View File

@ -588,48 +588,7 @@ def sanity_handle_abichanges(status, d):
if not abi.isdigit():
with open(abifile, "w") as f:
f.write(current_abi)
elif abi == "2" and current_abi == "3":
bb.note("Converting staging from layout version 2 to layout version 3")
subprocess.call(d.expand("mv ${TMPDIR}/staging ${TMPDIR}/sysroots"), shell=True)
subprocess.call(d.expand("ln -s sysroots ${TMPDIR}/staging"), shell=True)
subprocess.call(d.expand("cd ${TMPDIR}/stamps; for i in */*do_populate_staging; do new=`echo $i | sed -e 's/do_populate_staging/do_populate_sysroot/'`; mv $i $new; done"), shell=True)
with open(abifile, "w") as f:
f.write(current_abi)
elif abi == "3" and current_abi == "4":
bb.note("Converting staging layout from version 3 to layout version 4")
if os.path.exists(d.expand("${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}")):
subprocess.call(d.expand("mv ${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS} ${STAGING_BINDIR_CROSS}"), shell=True)
subprocess.call(d.expand("ln -s ${STAGING_BINDIR_CROSS} ${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}"), shell=True)
with open(abifile, "w") as f:
f.write(current_abi)
elif abi == "4":
status.addresult("Staging layout has changed. The cross directory has been deprecated and cross packages are now built under the native sysroot.\nThis requires a rebuild.\n")
elif abi == "5" and current_abi == "6":
bb.note("Converting staging layout from version 5 to layout version 6")
subprocess.call(d.expand("mv ${TMPDIR}/pstagelogs ${SSTATE_MANIFESTS}"), shell=True)
with open(abifile, "w") as f:
f.write(current_abi)
elif abi == "7" and current_abi == "8":
status.addresult("Your configuration is using stamp files including the sstate hash but your build directory was built with stamp files that do not include this.\nTo continue, either rebuild or switch back to the OEBasic signature handler with BB_SIGNATURE_HANDLER = 'OEBasic'.\n")
elif (abi != current_abi and current_abi == "9"):
status.addresult("The layout of the TMPDIR STAMPS directory has changed. Please clean out TMPDIR and rebuild (sstate will be still be valid and reused)\n")
elif (abi != current_abi and current_abi == "10" and (abi == "8" or abi == "9")):
bb.note("Converting staging layout from version 8/9 to layout version 10")
cmd = d.expand("grep -r -l sysroot-providers/virtual_kernel ${SSTATE_MANIFESTS}")
ret, result = oe.utils.getstatusoutput(cmd)
result = result.split()
for f in result:
bb.note("Uninstalling manifest file %s" % f)
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 == "11" and current_abi == "12":
elif int(abi) <= 11 and current_abi == "12":
status.addresult("The layout of TMPDIR changed for Recipe Specific Sysroots.\nConversion doesn't make sense and this change will rebuild everything so please start with a clean TMPDIR.\n")
elif (abi != current_abi):
# Code to convert from one ABI to another could go here if possible.