From 477fa84390b54a83d82a9555aaba8b467c5e6446 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sat, 23 Jan 2016 00:59:56 +1300 Subject: gen-lockedsig-cache: copy correct native sstate into ext SDK When constructing the sstate-cache directory for the extensible SDK, we were copying in any matching native sstate packages, and as the signature doesn't actually change when the distro changes (since NATIVELSBSTRING is just a path separator for the artifacts and is not part of the signature) we ended up copying duplicated packages when the distro changed e.g. upon host distro upgrade. Only search in the NATIVELSBSTRING-named subdirectory for native packages and the issue goes away. Fixes [YOCTO #8885]. (From OE-Core rev: 6c6baf6aa1823b8b20123f505e45c2768a193ad5) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- scripts/gen-lockedsig-cache | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/gen-lockedsig-cache') diff --git a/scripts/gen-lockedsig-cache b/scripts/gen-lockedsig-cache index 9c16506cd6..a4e9dede01 100755 --- a/scripts/gen-lockedsig-cache +++ b/scripts/gen-lockedsig-cache @@ -13,9 +13,9 @@ def mkdir(d): if e.errno != errno.EEXIST: raise e -if len(sys.argv) < 3: +if len(sys.argv) < 5: print("Incorrect number of arguments specified") - print("syntax: gen-lockedsig-cache ") + print("syntax: gen-lockedsig-cache ") sys.exit(1) print('Reading %s' % sys.argv[1]) @@ -30,7 +30,7 @@ files = set() for s in sigs: p = sys.argv[2] + "/" + s[:2] + "/*" + s + "*" files |= set(glob.glob(p)) - p = sys.argv[2] + "/*/" + s[:2] + "/*" + s + "*" + p = sys.argv[2] + "/%s/" % sys.argv[4] + s[:2] + "/*" + s + "*" files |= set(glob.glob(p)) print('Processing files') -- cgit v1.2.3-54-g00ecf