]> code.ossystems Code Review - openembedded-core.git/commitdiff
rootfs.py: Respect OPKGLIBDIR variable
authorMartin Jansa <martin.jansa@gmail.com>
Thu, 23 Mar 2017 12:21:22 +0000 (13:21 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 23 Mar 2017 16:30:29 +0000 (16:30 +0000)
* 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: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oe/rootfs.py

index 5e1c09762ab43b966fa403b2b947dfd6c9c0244e..96591f370e63989500aba75a9c292ab00bf5bd30 100644 (file)
@@ -946,7 +946,9 @@ class OpkgRootfs(DpkgOpkgRootfs):
         if self.progress_reporter:
             self.progress_reporter.next_stage()
 
-        self._setup_dbg_rootfs(['/var/lib/opkg'])
+        opkg_lib_dir = self.d.getVar('OPKGLIBDIR')
+        opkg_dir = os.path.join(opkg_lib_dir, 'opkg')
+        self._setup_dbg_rootfs([opkg_dir])
 
         execute_pre_post_process(self.d, opkg_post_process_cmds)