summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-10 16:50:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-11 23:28:35 +0100
commit4cccac9af0d3d63c24c04639b5910c526a2d43eb (patch)
tree68f30bc21893f5ba79c5300e15e220e25a15f547 /meta/lib/oe
parentd4585fa23d56a58c583ee33db067a23177a936b1 (diff)
downloadpoky-4cccac9af0d3d63c24c04639b5910c526a2d43eb.tar.gz
Revert "rootfs: Do not uninstall update-rc.d"
This reverts commit acf90b6c299afe9e9c8fa33c3c6992bfcf40fbbf. (Reverted to apply the better v2 of the patch) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/rootfs.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index ba62273c64..2372226e78 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -240,7 +240,8 @@ 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 ["base-passwd", 243 if pkg in ["update-rc.d",
244 "base-passwd",
244 "shadow", 245 "shadow",
245 "update-alternatives", 246 "update-alternatives",
246 self.d.getVar("ROOTFS_BOOTSTRAP_INSTALL", True) 247 self.d.getVar("ROOTFS_BOOTSTRAP_INSTALL", True)