diff options
| -rw-r--r-- | meta/lib/oe/package_manager.py | 3 | ||||
| -rw-r--r-- | meta/recipes-devtools/apt/apt/apt.conf.in | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index cfe9f5d676..97998d07f4 100644 --- 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 b8863a2b00..821afb03a2 100644 --- 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"}; |