summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/package_manager.py
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 18:45:46 -0700
commit8c0a33f326e99a84485634104fc29c1dde881c7d (patch)
treee2bfc5f8855471f900cdc3eaf8612e9d37dd6e7e /meta/lib/oe/package_manager.py
parent9045673b7877160189babbdb4c28825cd6d57992 (diff)
downloadpoky-8c0a33f326e99a84485634104fc29c1dde881c7d.tar.gz
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. (From OE-Core rev: e0ebfaa92bbfd3158b48e28dfb6435890c73bef3) Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/package_manager.py')
-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
689 with open(manifest, "r") as f: 689 with open(manifest, "r") as f:
690 for l in f: 690 for l in f:
691 l = l.strip() 691 l = l.strip()
692 deploydir = os.path.normpath(deploydir)
692 dest = l.replace(deploydir, "") 693 dest = l.replace(deploydir, "")
693 dest = subrepo_dir + dest 694 dest = subrepo_dir + dest
694 if l.endswith("/"): 695 if l.endswith("/"):