summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2017-03-23 13:16:29 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-18 13:07:33 +0100
commita8500d9c75d25a6c2f3de1f0e58c6192debe07b5 (patch)
tree1ab61192adfa83ae60ccf0636c471c587c6f59c7 /meta/lib/oe
parent46b3cc9d8d9edf74a28207aaf2c399357fc56111 (diff)
downloadpoky-a8500d9c75d25a6c2f3de1f0e58c6192debe07b5.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 (From OE-Core rev: 0554537271f56d95cb43e09bb831f57f82e8f3ac) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-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):
949 if self.progress_reporter: 949 if self.progress_reporter:
950 self.progress_reporter.next_stage() 950 self.progress_reporter.next_stage()
951 951
952 self._setup_dbg_rootfs(['/etc', '/var/lib/opkg', '/usr/lib/ssl']) 952 opkg_lib_dir = self.d.getVar('OPKGLIBDIR', True)
953 opkg_dir = os.path.join(opkg_lib_dir, 'opkg')
954 self._setup_dbg_rootfs(['/etc', opkg_dir, '/usr/lib/ssl'])
953 955
954 execute_pre_post_process(self.d, opkg_post_process_cmds) 956 execute_pre_post_process(self.d, opkg_post_process_cmds)
955 957