summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2018-05-16 11:13:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-16 22:34:12 +0100
commit3ce2ee20e7e256adc6527b6000936c3c4c96bb1b (patch)
treedddca0b250f30d4347f55a3af10c54971d3d2e22
parent67a0396269ebff7da2f6c5d18a0c38f767749ba8 (diff)
downloadopenembedded-core-contrib-3ce2ee20e7e256adc6527b6000936c3c4c96bb1b.tar.gz
openembedded-core-contrib-3ce2ee20e7e256adc6527b6000936c3c4c96bb1b.tar.bz2
openembedded-core-contrib-3ce2ee20e7e256adc6527b6000936c3c4c96bb1b.zip
rootfs.py: for dpkg/opkg, don't install postinsts if package management is present
If package management is present opkg/dpkg will bring the original copy of the postinsts scripts with the metadata and will be able to handle postinsts just fine. In fact, it is preferred to let package management handle the postinsts scripts in this case since it will keep the package managers database up-to-date too. The run-postinsts scripts will make sure the package manager gets invoked instead of the scripts directly. Note: Before commit 5aae19959a44 ("rootfs.py: Change logic to unistall packages") rootfs.py did not install /etc/$pm-postinsts too. It is not clear whether that change was intentionally or just a bug. This commit fixes/reverts that aspect of the commit. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/rootfs.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index c51e76ddfc..28642abbd9 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -561,6 +561,9 @@ class DpkgOpkgRootfs(Rootfs):
return pkg_list
def _save_postinsts_common(self, dst_postinst_dir, src_postinst_dir):
+ if bb.utils.contains("IMAGE_FEATURES", "package-management",
+ True, False, self.d):
+ return
num = 0
for p in self._get_delayed_postinsts():
bb.utils.mkdirhier(dst_postinst_dir)