Skip to contentSkip to conversation

Fix for extensible SDK build failure

PATCH New Paul Eggleton 1 participant 2 messages Jan 26, 2016

lore
Share & tools
lore
#1 lore raw

PATCH 1/1 gen-lockedsig-cache: fix bad destination path joining

In reply to Paul Eggleton

When copying the sstate-cache into the extensible SDK, if the source path had a trailing / and the destination path did not, there would be a missing / between the path and the subdirectory name, and you'd end up with subdirectories like "sstate-cacheCentOS-6.7". There are functions in os.path for this sort of thing so let's just use them and avoid the problem.

---
 scripts/gen-lockedsig-cache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/gen-lockedsig-cache +1 -1
index a4e9ded..0986a21 100755
@@ -41,7 +41,7 @@ for f in files:
         # Most likely a temp file, skip it
         print('skipping')
         continue
-    dst = f.replace(sys.argv[2], sys.argv[3])
+    dst = os.path.join(sys.argv[3], os.path.relpath(f, sys.argv[2]))
     destdir = os.path.dirname(dst)
     mkdir(destdir)
 
Signature · 1 line
2.5.0
#0 lore raw

cover Fix for extensible SDK build failure

Fixes a failure we've seen on the Yocto Project autobuilder when building the extensible SDK.

The following changes since commit fc4209baa098caebf9c4cb75f9a6f2e85f43333c:

Revert "xz: Allow to work with ASSUME_PROVIDED xz-native" (2016-01-25 10:08:25 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/extsdk-path-fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/extsdk-path-fix

Paul Eggleton (1):
gen-lockedsig-cache: fix bad destination path joining

 scripts/gen-lockedsig-cache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
2.5.0