make_chroot: handle openrc->baselayout transition
Since openrc provides /etc/init.d/functions.sh, unmerging it will break
packages. Install our version of baselayout first.
BUG=chromium:267982
TEST=`cbuildbot chromiumos-sdk` still works
TEST=`cbuildbot chromiumos-sdk` works with CL:46225
Change-Id: I7291e8f24ee3f506ae799473716b5bc15a179c5c
Reviewed-on: https://chromium-review.googlesource.com/174781
Reviewed-by: David James <davidjames@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh
index 7e6be50..66fc4de 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -436,6 +436,9 @@
if [[ -e ${FLAGS_chroot}/usr/share/openrc ]]; then
info "Uninstalling openrc"
early_enter_chroot env CLEAN_DELAY=0 emerge -qC sys-apps/openrc
+ # Now update baselayout to get our functions.sh. The unmerge
+ # above removed our copy in the process.
+ early_enter_chroot emerge -uNvq sys-apps/baselayout
fi
# The stage3 contains an old version of Python. Upgrade it first so that