summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-09-06 15:25:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-09 14:27:45 +0100
commita0590d1adaaca40d69a795a889887ccff6941779 (patch)
treec35db26dc75c4d8c500ad56a77fc35783db04d6d /meta
parent697428cbbaf91f77160623814b3a4abd1f912192 (diff)
downloadpoky-a0590d1adaaca40d69a795a889887ccff6941779.tar.gz
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 (From OE-Core rev: acf90b6c299afe9e9c8fa33c3c6992bfcf40fbbf) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oe/rootfs.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 76950ec77a..692edb1e29 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -240,8 +240,7 @@ class Rootfs(object):
240 pkgs_installed = installed_pkgs.read().splitlines() 240 pkgs_installed = installed_pkgs.read().splitlines()
241 for pkg_installed in pkgs_installed[:]: 241 for pkg_installed in pkgs_installed[:]:
242 pkg = pkg_installed.split()[0] 242 pkg = pkg_installed.split()[0]
243 if pkg in ["update-rc.d", 243 if pkg in ["base-passwd",
244 "base-passwd",
245 "shadow", 244 "shadow",
246 "update-alternatives", 245 "update-alternatives",
247 self.d.getVar("ROOTFS_BOOTSTRAP_INSTALL", True) 246 self.d.getVar("ROOTFS_BOOTSTRAP_INSTALL", True)