[oe-commits] [openembedded-core] 14/45: package_manager: use normalized path when doing the filtered copy

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit e0ebfaa92bbfd3158b48e28dfb6435890c73bef3
Author: Max Krummenacher <max.oss.09 at gmail.com>
AuthorDate: Sat Sep 15 22:01:00 2018 +0200

    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 at toradex.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/lib/oe/package_manager.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 7ae5e04..8f4b42b 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("/"):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.