mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-29 06:21:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #764 from coreos/binutils

Browse Source 
Revert binutils to 2.25 again
This commit is contained in:
Benjamin Gilbert 2017-10-19 19:29:16 -07:00 committed by GitHub
commit e210eaa853
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build_library/test_image_content.sh
View File

@ -2,10 +2,13 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
GLSA_WHITELIST="201412-09" GLSA_WHITELIST=(
201412-09 # incompatible CA certificate version numbers
201709-02 # updating binutils breaks amd64 Linux uncompression
)
glsa_image() { glsa_image() {
if glsa-check-$BOARD -t all | grep -v "$GLSA_WHITELIST"; then if glsa-check-$BOARD -t all | grep -Fvx "${GLSA_WHITELIST[@]/#/-e}"; then
echo "The above GLSAs apply to $ROOT" echo "The above GLSAs apply to $ROOT"
return 1 return 1
fi fi

4
build_library/toolchain_util.sh
View File

@ -194,9 +194,7 @@ get_cross_pkgs() {
# Get portage arguments restricting toolchains to binary packages only. # Get portage arguments restricting toolchains to binary packages only.
get_binonly_args() { get_binonly_args() {
local pkgs=( "${TOOLCHAIN_PKGS[@]}" $(get_cross_pkgs "$@") ) local pkgs=( "${TOOLCHAIN_PKGS[@]}" $(get_cross_pkgs "$@") )
# XXX: Revert this binutils change after stable > 1535. echo "${pkgs[@]/#/--useoldpkg-atoms=}" "${pkgs[@]/#/--rebuild-exclude=}"
local tmppkgs=( ${pkgs[*]##*/binutils} )
echo "${tmppkgs[@]/#/--useoldpkg-atoms=}" "${pkgs[@]/#/--rebuild-exclude=}"
} }
### Toolchain building utilities ### ### Toolchain building utilities ###

3
update_chroot
View File

@ -241,9 +241,6 @@ sudo -E ${EMERGE_CMD} "${EMERGE_FLAGS[@]}" \
coreos-devel/sdk-depends world coreos-devel/sdk-depends world
info "Removing obsolete packages" info "Removing obsolete packages"
# XXX: Remove these binutils lines after stable > 1535.
cats=( '<=sys-devel' "${BOARD_CHOSTS[@]/#/<=cross-}" )
sudo -E emerge --quiet --unmerge "${cats[@]/%//binutils-2.28.0}" 2>/dev/null || :
sudo -E ${EMERGE_CMD} --quiet --depclean @unavailable sudo -E ${EMERGE_CMD} --quiet --depclean @unavailable
if portageq list_preserved_libs / >/dev/null; then if portageq list_preserved_libs / >/dev/null; then