From 6508cf3faaef0643e6ece9124048591c7435de4f Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 14 Jun 2017 16:28:55 -0700 Subject: [PATCH 1/2] update_chroot: fix SDK updates during the Perl 5.24 upgrade --- update_chroot | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/update_chroot b/update_chroot index 02afc6fb21..dd066caadf 100755 --- a/update_chroot +++ b/update_chroot @@ -197,6 +197,12 @@ 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" From 5a50abc4acbf072df706255f360b3dfbeb61247a Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 14 Jun 2017 16:29:14 -0700 Subject: [PATCH 2/2] check_root: silence the incorrect libperl warnings --- build_library/check_root | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build_library/check_root b/build_library/check_root index 4fff25a7c6..2723c8c7bd 100755 --- a/build_library/check_root +++ b/build_library/check_root @@ -28,10 +28,9 @@ IGNORE_MISSING = { "dev-lang/go-bootstrap": [SonameAtom("x86_32", "libc.so.6"), SonameAtom("x86_64", "libc.so.6")], - # RPATHs and symlinks apparently confuse the perl-5.22 package - "dev-lang/perl": [SonameAtom("arm_64", "libperl.so.5.22.3"), - SonameAtom("x86_32", "libperl.so.5.22.3"), - SonameAtom("x86_64", "libperl.so.5.22.3")], + # RPATHs and symlinks apparently confuse the perl-5.24 package + "dev-lang/perl": [SonameAtom("arm_64", "libperl.so.5.24.1"), + SonameAtom("x86_64", "libperl.so.5.24.1")], # https://bugs.gentoo.org/show_bug.cgi?id=554582 "net-firewall/ebtables": [SonameAtom("arm_64", "libebt_802_3.so"),