[oe-commits] [openembedded-core] 42/53: rootfs.py: for dpkg/opkg, don't install postinsts if package management is present

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 3160cf54a2b9548cb29a3dd7c44a9be8a768bfb8
Author: Stefan Agner <stefan.agner at toradex.com>
AuthorDate: Wed May 16 11:13:52 2018 +0200

    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 at toradex.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oe/rootfs.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index c51e76d..28642ab 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)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.