make_chroot: drop glibc-2.26 upgrade hack
Now that we're rolling our own SDKs, we don't need to run this all
the time as our base SDK has the fix.
BUG=chromium:834385
TEST=CQ passes
Change-Id: Ib77c31066c2ee2f774d317d0cd3222c0f3a4d97a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosutils/+/1898552
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh
index 34a44cb..d9e5994 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -347,12 +347,6 @@
sudo -u "${SUDO_USER}" -- /bin/bash "${SUDO_HOME}/.cros_chroot_init" \
"${FLAGS_chroot}"
fi
-
- # Update nsswitch.conf to make glibc-2.26 and after builds. See
- # https://wiki.gentoo.org/wiki/Project:Toolchain/nsswitch.conf_in_glibc-2.26
- if ! grep compat "${FLAGS_chroot}/etc/nsswitch.conf" | grep -q files; then
- sed -i 's/\<compat\>/compat files/g' "${FLAGS_chroot}/etc/nsswitch.conf"
- fi
}
unpack_tarball() {
