[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5282/8267] rootfs.py: Respect OPKGLIBDIR variable

[Emmanuele Bassi <ebassi src gnome org>]

commit da8369b670f15bc74bc278e58c0090a3a477cb8e
Author: Martin Jansa <martin jansa gmail com>
Date:   Thu Mar 23 13:21:22 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
    
    (From OE-Core rev: bebdb056c8bd0efc056f07b275a154e5d5a3aa2b)
    
    Signed-off-by: Martin Jansa <Martin Jansa gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oe/rootfs.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 5e1c097..96591f3 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -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)