From d2f2e11225fa23d74134437551ccca5efd46f10f Mon Sep 17 00:00:00 2001
From: David Michael <david.michael@coreos.com>
Date: Fri, 6 Apr 2018 18:30:38 -0400
Subject: [PATCH] update_chroot: Allow upgrading glibc

---
 build_library/toolchain_util.sh | 4 ++--
 update_chroot                   | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/build_library/toolchain_util.sh b/build_library/toolchain_util.sh
index d926251fda..e765b343cc 100644
--- a/build_library/toolchain_util.sh
+++ b/build_library/toolchain_util.sh
@@ -194,8 +194,8 @@ get_cross_pkgs() {
 # Get portage arguments restricting toolchains to binary packages only.
 get_binonly_args() {
     local pkgs=( "${TOOLCHAIN_PKGS[@]}" $(get_cross_pkgs "$@") )
-    # XXX: Revert this after stable > 1632.
-    local tmppkgs=( ${pkgs[*]##*/binutils} ) ; tmppkgs=( ${tmppkgs[*]##*/gcc} )
+    # XXX: Drop this exception after stable > 1729.
+    local tmppkgs=( ${pkgs[*]##*/glibc} )
     echo "${tmppkgs[@]/#/--useoldpkg-atoms=}" "${pkgs[@]/#/--rebuild-exclude=}"
 }
 
diff --git a/update_chroot b/update_chroot
index 10738f9f75..85b703d3bd 100755
--- a/update_chroot
+++ b/update_chroot
@@ -241,9 +241,6 @@ sudo -E ${EMERGE_CMD} "${EMERGE_FLAGS[@]}" \
     coreos-devel/sdk-depends world
 
 info "Removing obsolete packages"
-# XXX: Remove these next two lines after stable > 1632.
-cats=( '<=sys-devel' "${BOARD_CHOSTS[@]/#/<=cross-}" )
-sudo -E emerge --quiet --unmerge "${cats[@]/%//binutils-2.29.0}" "${cats[@]/%//gcc-7.2.0}" 2>/dev/null || :
 sudo -E ${EMERGE_CMD} --quiet --depclean @unavailable
 
 if portageq list_preserved_libs / >/dev/null; then