From 3c24b28e3519fd03aa6248ac4b57305f084b327c Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 14 Aug 2017 14:07:28 -0700 Subject: [PATCH] Revert "update_chroot: fix SDK updates during the Perl 5.24 upgrade" This reverts commit 6508cf3faaef0643e6ece9124048591c7435de4f. All update channels are now using Perl 5.24, so workarounds are no longer required. --- update_chroot | 6 ------ 1 file changed, 6 deletions(-) diff --git a/update_chroot b/update_chroot index dd066caadf..02afc6fb21 100755 --- a/update_chroot +++ b/update_chroot @@ -197,12 +197,6 @@ if [[ "${FLAGS_jobs}" -ne -1 ]]; then REBUILD_FLAGS+=( "--jobs=${FLAGS_jobs}" ) fi -# Force rebuilding some misbehaving Perl modules for the 5.24 upgrade. -EMERGE_FLAGS+=( - --reinstall-atoms='dev-perl/File-Slurp dev-perl/Locale-gettext dev-perl/XML-Parser perl-core/File-Temp virtual/perl-File-Temp' - --usepkg-exclude='dev-perl/File-Slurp dev-perl/Locale-gettext dev-perl/XML-Parser perl-core/File-Temp virtual/perl-File-Temp' -) - # Perform an update of coreos-devel/sdk-depends and world in the chroot. EMERGE_CMD="emerge"