summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2017-03-23 13:21:22 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-24 23:43:32 +0000
commitda8369b670f15bc74bc278e58c0090a3a477cb8e (patch)
tree14bddd2024ef8ea16431627eef8ab1225a83e02f /meta
parent3f46689cf13893f65bc7e1ccc422c6ae07d31ef0 (diff)
downloadpoky-da8369b670f15bc74bc278e58c0090a3a477cb8e.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: bebdb056c8bd0efc056f07b275a154e5d5a3aa2b) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 5e1c09762a..96591f370e 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -946,7 +946,9 @@ class OpkgRootfs(DpkgOpkgRootfs):
946 if self.progress_reporter: 946 if self.progress_reporter:
947 self.progress_reporter.next_stage() 947 self.progress_reporter.next_stage()
948 948
949 self._setup_dbg_rootfs(['/var/lib/opkg']) 949 opkg_lib_dir = self.d.getVar('OPKGLIBDIR')
950 opkg_dir = os.path.join(opkg_lib_dir, 'opkg')
951 self._setup_dbg_rootfs([opkg_dir])
950 952
951 execute_pre_post_process(self.d, opkg_post_process_cmds) 953 execute_pre_post_process(self.d, opkg_post_process_cmds)
952 954