aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2017-03-23 13:16:29 +0100
committerArmin Kuster <akuster808@gmail.com>2017-04-01 09:14:57 -0400
commita759aee80011cc7f2c84e4cd5bb241ea823daa6e (patch)
tree0f8ba0111e4ab04a6a5dd5d31eb19a1b1bea7480
parent2e2f90d269eb5b67d6c6ca3e00fbd17f3ca31ea0 (diff)
downloadopenembedded-core-contrib-a759aee80011cc7f2c84e4cd5bb241ea823daa6e.tar.gz
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@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta/lib/oe/rootfs.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index ed40b23ee4..c4a5086bec 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)