summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Blundell <pb@pbcl.net>2014-02-02 11:38:57 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-02 22:37:42 +0000
commitcc169c91f2e888f9d12f92537c87493c1fbb894f (patch)
tree8109a55ad09794dc30669598b629b6d0a0a4b150
parent88a6b2b64b51abbe2864d32a36291c5b496fa584 (diff)
downloadpoky-cc169c91f2e888f9d12f92537c87493c1fbb894f.tar.gz
image.bbclass: Also uninstall update-alternatives and shadow for read-only-rootfs
If the rootfs is read-only then we aren't going to be updating any alternatives or modifying the password file and these binaries will be redundant. In an ideal world we would be able to stop them from being installed in the first place but this is non-trivial to arrange. As a workaround in the meantime, let's just uninstall them once image construction is finished. (From OE-Core rev: d41097a970e9bfa553cd4bc3c9fad4b9073d7bd5) Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 5049b3faa0..37b761ba44 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -536,7 +536,7 @@ rootfs_uninstall_unneeded () {
536 fi 536 fi
537 537
538 # Remove package only if it's installed 538 # Remove package only if it's installed
539 pkgs_to_remove="update-rc.d base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}" 539 pkgs_to_remove="update-rc.d base-passwd update-alternatives shadow ${ROOTFS_BOOTSTRAP_INSTALL}"
540 for pkg in $pkgs_to_remove; do 540 for pkg in $pkgs_to_remove; do
541 # regexp for pkg, to be used in grep and sed 541 # regexp for pkg, to be used in grep and sed
542 pkg_regexp="^`echo $pkg | sed 's/\./\\\./'` " 542 pkg_regexp="^`echo $pkg | sed 's/\./\\\./'` "