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 #691 from dm0-/restore

Browse Source 
Revert Perl workarounds
This commit is contained in:
David Michael 2017-06-14 16:27:50 -07:00 committed by GitHub
commit 135f64d07a
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_library/catalyst.sh
View File

@ -120,7 +120,7 @@ cat <<EOF
target: stage1 target: stage1
# stage1 packages aren't published, save in tmp # stage1 packages aren't published, save in tmp
pkgcache_path: ${TEMPDIR}/stage1-${ARCH}-packages pkgcache_path: ${TEMPDIR}/stage1-${ARCH}-packages
#update_seed: yes update_seed: yes
EOF EOF
catalyst_stage_default catalyst_stage_default
} }

8
update_chroot
View File

@ -197,14 +197,6 @@ 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.22 upgrade.
if : || portageq has_version / '<dev-lang/perl-5.22'; then
EMERGE_FLAGS+=(
--reinstall-atoms='dev-perl/File-Slurp dev-perl/Locale-gettext perl-core/File-Temp'
--usepkg-exclude='dev-perl/File-Slurp dev-perl/Locale-gettext perl-core/File-Temp'
)
fi
# 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"