]> code.ossystems Code Review - openembedded-core.git/commitdiff
package_manager: use normalized path when doing the filtered copy
authorMax Krummenacher <max.oss.09@gmail.com>
Sat, 15 Sep 2018 20:01:00 +0000 (22:01 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 21 Sep 2018 15:15:19 +0000 (08:15 -0700)
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>
meta/lib/oe/package_manager.py

index 7ae5e045df8d1fdfe532060b73787bc1ec82c481..8f4b42b0daa79632a9313d1a4c532746f069a394 100644 (file)
@@ -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("/"):