diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2018-03-28 21:44:15 +0200 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2020-07-02 15:10:00 +0200 |
| commit | 2ed283c3d2bb27c36215da5ae4cb6e54462a2cac (patch) | |
| tree | de01d1231de16ca55ec23f196efb877b1a1f2c6a /meta/lib | |
| parent | 1800b5b0eb5e6361d88e64c80545b3a3342fe49b (diff) | |
| download | openembedded-core-contrib-2ed283c3d2bb27c36215da5ae4cb6e54462a2cac.tar.gz | |
apt, rootfs.py: Use distinct variables for --root and --admindir options
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oe/package_manager.py | 3 |
1 files changed, 2 insertions, 1 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") |