From: Khem Raj Date: Sun, 6 Sep 2015 15:25:39 +0000 (+0000) Subject: rootfs: Do not uninstall update-rc.d X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~29034 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acf90b6c299afe9e9c8fa33c3c6992bfcf40fbbf;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git rootfs: Do not uninstall update-rc.d update-rc.d is now needed by systemd to interact with sysv scripts, so if we have a mixed system, then we can not uninstall update-rc.d as it is going to break systemd functionality Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 76950ec77a0..692edb1e291 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -240,8 +240,7 @@ class Rootfs(object): pkgs_installed = installed_pkgs.read().splitlines() for pkg_installed in pkgs_installed[:]: pkg = pkg_installed.split()[0] - if pkg in ["update-rc.d", - "base-passwd", + if pkg in ["base-passwd", "shadow", "update-alternatives", self.d.getVar("ROOTFS_BOOTSTRAP_INSTALL", True)