[oe-commits] [openembedded-core] 20/48: rootfs.py: Respect OPKGLIBDIR variable

[git at git.openembedded.org]

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

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

commit 0554537271f56d95cb43e09bb831f57f82e8f3ac
Author: Martin Jansa <martin.jansa at gmail.com>
AuthorDate: Thu Mar 23 13:16:29 2017 +0100

    rootfs.py: Respect OPKGLIBDIR variable
    
    * when OPKGLIBDIR doesn't have the default /var/lib value it will
      silently fail to copy package database from normal rootfs to debugfs
      rootfs and then when trying to install *-dbg complimentary packages
      it won't install anything, because installed_pkgs.txt file generated
      from debugfs is empty
    
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/lib/oe/rootfs.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index ed40b23..c4a5086 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -949,7 +949,9 @@ class OpkgRootfs(DpkgOpkgRootfs):
         if self.progress_reporter:
             self.progress_reporter.next_stage()
 
-        self._setup_dbg_rootfs(['/etc', '/var/lib/opkg', '/usr/lib/ssl'])
+        opkg_lib_dir = self.d.getVar('OPKGLIBDIR', True)
+        opkg_dir = os.path.join(opkg_lib_dir, 'opkg')
+        self._setup_dbg_rootfs(['/etc', opkg_dir, '/usr/lib/ssl'])
 
         execute_pre_post_process(self.d, opkg_post_process_cmds)
 

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