aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-23 10:02:21 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-08 09:20:38 +0000
commit67831122fce62b71263b85592c8d1de4e7deabd2 (patch)
treedb6324d8d543932383e4aad7d7bc2c506160e565
parent32e6864323cf2e4405b835cf474bcdf6fd572961 (diff)
downloadopenembedded-core-67831122fce62b71263b85592c8d1de4e7deabd2.zip
openembedded-core-67831122fce62b71263b85592c8d1de4e7deabd2.tar.gz
openembedded-core-67831122fce62b71263b85592c8d1de4e7deabd2.tar.bz2
sstate: Fix the relative symlink replacement code
ant reported on irc that the sstate absolute to relative symlink creation code wasn't working in klibc. He was correct although the level of breakage is rather surprising since it only worked for one level of symlink (usr/include) with everything else being broken. The reason is probably that nothing really uses absolute paths, we use relative paths where at all possible already. Nothing in the target sysroot should use absolute paths for a start. In this regard, the klibc-dev package is broken and needs fixing. It will currently break when building for one machine, then switching to another of the same TUNE_PKGARCH and installing from sstate but that is a separate issue. This patch fixes the symlink creation code by firstly passing in the correct value we need (where the symlink will end up) and seccondly, actually using it. I've also tweaked the debug message to contain appropriate information and got right of the double "//" value the existing code created in favour of the form './..' which looks neater. (From OE-Core rev: 9b05c65450526522d7358d0c0901b594de546748) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sstate.bbclass11
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 13abf33..8074a2c 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -431,13 +431,14 @@ def sstate_package(ss, d):
if not link.startswith(tmpdir):
return
- depth = link.rpartition(tmpdir)[2].count('/')
+ depth = outputpath.rpartition(tmpdir)[2].count('/')
base = link.partition(tmpdir)[2].strip()
while depth > 1:
- base = "../" + base
+ base = "/.." + base
depth -= 1
+ base = "." + base
- bb.debug(2, "Replacing absolute path %s with relative path %s" % (link, base))
+ bb.debug(2, "Replacing absolute path %s with relative path %s for %s" % (link, base, outputpath))
os.remove(path)
os.symlink(base, path)
@@ -455,11 +456,11 @@ def sstate_package(ss, d):
for walkroot, dirs, files in os.walk(state[1]):
for file in files:
srcpath = os.path.join(walkroot, file)
- dstpath = srcpath.replace(state[1], sstatebuild + state[0])
+ dstpath = srcpath.replace(state[1], state[2])
make_relative_symlink(srcpath, dstpath, d)
for dir in dirs:
srcpath = os.path.join(walkroot, dir)
- dstpath = srcpath.replace(state[1], sstatebuild + state[0])
+ dstpath = srcpath.replace(state[1], state[2])
make_relative_symlink(srcpath, dstpath, d)
bb.debug(2, "Preparing tree %s for packaging at %s" % (state[1], sstatebuild + state[0]))
oe.path.copyhardlinktree(state[1], sstatebuild + state[0])