make_chroot: drop build-docbook-catalog hack

Now that the newer build-docbook-catalog supports ROOT, we don't need
to manually run this ourselves.

BUG=chromium-os:18036
TEST=`cbuildbot chromiumos-sdk` works

Change-Id: I3a89701a49623f9e50e651af9d8d505608fdc615
Reviewed-on: https://gerrit.chromium.org/gerrit/19252
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Zdenek Behan <zbehan@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Mike Frysinger 2012-03-28 16:21:04 -04:00 committed by Gerrit
parent 7d338f501d
commit eb1a9b4e4e

View File

@ -229,16 +229,9 @@ PORTAGE_USERNAME=$USER
EOF
# TODO(zbehan): Configure stuff that is usually configured in postinst's,
# but wasn't. Fix the postinst's. crosbug.com/18036
# but wasn't. Fix the postinst's.
info "Running post-inst configuration hacks"
early_enter_chroot env-update
if [ -f ${FLAGS_chroot}/usr/bin/build-docbook-catalog ]; then
# For too ancient chroots that didn't have build-docbook-catalog, this
# is not relevant, and will get installed during update.
early_enter_chroot build-docbook-catalog
# Configure basic stuff needed.
early_enter_chroot env-update
fi
# This is basically a sanity check of our chroot. If any of these
# don't exist, then either bind mounts have failed, an invocation