summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Krummenacher <max.oss.09@gmail.com>2018-09-15 22:01:00 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-21 08:15:19 -0700
commite0ebfaa92bbfd3158b48e28dfb6435890c73bef3 (patch)
treed06dc26a09a934d4cb0af36fcb6b7e7589709b7d
parenta585c51f8107e52cf7fa16b46b889b3f81eca600 (diff)
downloadopenembedded-core-contrib-e0ebfaa92bbfd3158b48e28dfb6435890c73bef3.tar.gz
openembedded-core-contrib-e0ebfaa92bbfd3158b48e28dfb6435890c73bef3.tar.bz2
openembedded-core-contrib-e0ebfaa92bbfd3158b48e28dfb6435890c73bef3.zip
package_manager: use normalized path when doing the filtered copy
The linking/copying of the package files failes if the deploy dir is set in a non normalized way e.g. like this DEPLOY_DIR = "${TOPDIR}/../deploy" Then the simple string replacement which is used to calculated the link destination from the link source fails, as the link source is normalized but the deploydir prefix is not. Normalizing deploydir fixes this. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/lib/oe/package_manager.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 7ae5e045df..8f4b42b0da 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -689,6 +689,7 @@ def create_packages_dir(d, subrepo_dir, deploydir, taskname, filterbydependencie
with open(manifest, "r") as f:
for l in f:
l = l.strip()
+ deploydir = os.path.normpath(deploydir)
dest = l.replace(deploydir, "")
dest = subrepo_dir + dest
if l.endswith("/"):