apt, rootfs.py: Use distinct variables for --root and --admindir options

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>

diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index cfe9f5d676eb28554c2b96807c19ba35359e6d60..97998d07f4133e36d0dc3f89b011ab7f83d625c9 100644 (file)
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -1700,7 +1700,8 @@ class DpkgPM(OpkgDpkgPM):
                         apt_conf.write("  Architectures {%s};\n" % architectures);
                         apt_conf.write("  Architecture \"%s\";\n" % base_archs)
                     else:
-                        line = re.sub(r"#ROOTFS#", self.target_rootfs, line)
+                        line = re.sub(r"#ROOT#", self.target_rootfs, line)
+                        line = re.sub(r"#ADMINDIR#", self.admindir, line)
                         line = re.sub(r"#APTCONF#", self.apt_conf_dir, line)
                         apt_conf.write(line + "\n")
 

diff --git a/meta/recipes-devtools/apt/apt/apt.conf.in b/meta/recipes-devtools/apt/apt/apt.conf.in
index b8863a2b004dba22d838f3b005ebf1129019d4c6..821afb03a2253d8ba9cfa4c8b46c1c01ef67c7e5 100644 (file)
--- a/meta/recipes-devtools/apt/apt/apt.conf.in
+++ b/meta/recipes-devtools/apt/apt/apt.conf.in
@@ -3,7 +3,7 @@ Dir "@STAGING_DIR_NATIVE@/"
    State "var/lib/apt/"
    {
       Lists "#APTCONF#/lists/";
-      status "#ROOTFS#/var/lib/dpkg/status";
+      status "#ADMINDIR#/status";
    };
    Cache "var/cache/apt/"
    {
@@ -39,4 +39,4 @@ APT
   };
 };
 
-DPkg::Options {"--root=#ROOTFS#";"--admindir=#ROOTFS#/var/lib/dpkg";"--force-all";"--no-force-overwrite";"--no-debsig";"--force-script-chrootless"};
+DPkg::Options {"--root=#ROOT#";"--admindir=#ADMINDIR#";"--force-all";"--no-force-overwrite";"--no-debsig";"--force-script-chrootless"};