mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-23 06:31:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #695 from dm0-/perl

Browse Source 
Add workarounds for upgrading to Perl 5.24
This commit is contained in:
David Michael 2017-06-26 16:50:23 -07:00 committed by GitHub
commit 336ac28026
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build_library/check_root
View File

@ -28,10 +28,9 @@ IGNORE_MISSING = {
"dev-lang/go-bootstrap": [SonameAtom("x86_32", "libc.so.6"), "dev-lang/go-bootstrap": [SonameAtom("x86_32", "libc.so.6"),
SonameAtom("x86_64", "libc.so.6")], SonameAtom("x86_64", "libc.so.6")],
# RPATHs and symlinks apparently confuse the perl-5.22 package # RPATHs and symlinks apparently confuse the perl-5.24 package
"dev-lang/perl": [SonameAtom("arm_64", "libperl.so.5.22.3"), "dev-lang/perl": [SonameAtom("arm_64", "libperl.so.5.24.1"),
SonameAtom("x86_32", "libperl.so.5.22.3"), SonameAtom("x86_64", "libperl.so.5.24.1")],
SonameAtom("x86_64", "libperl.so.5.22.3")],
# https://bugs.gentoo.org/show_bug.cgi?id=554582 # https://bugs.gentoo.org/show_bug.cgi?id=554582
"net-firewall/ebtables": [SonameAtom("arm_64", "libebt_802_3.so"), "net-firewall/ebtables": [SonameAtom("arm_64", "libebt_802_3.so"),

6
update_chroot
View File

@ -197,6 +197,12 @@ if [[ "${FLAGS_jobs}" -ne -1 ]]; then
REBUILD_FLAGS+=( "--jobs=${FLAGS_jobs}" ) REBUILD_FLAGS+=( "--jobs=${FLAGS_jobs}" )
fi 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. # Perform an update of coreos-devel/sdk-depends and world in the chroot.
EMERGE_CMD="emerge" EMERGE_CMD="emerge"