Merge pull request #845 from dm0-/profiles

update_chroot: Allow upgrading glibc and binutils
This commit is contained in:
David Michael 2018-10-15 18:08:58 -04:00 committed by GitHub
commit eba8219a3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions

View File

@ -190,8 +190,8 @@ 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: Drop this exception after stable > 1729. # XXX: Drop this exception after stable > 1925.
local tmppkgs=( ${pkgs[*]##*/glibc} ) local tmppkgs=( ${pkgs[*]##*/glibc} ) ; tmppkgs=( ${tmppkgs[*]##*/binutils} )
echo "${tmppkgs[@]/#/--useoldpkg-atoms=}" "${pkgs[@]/#/--rebuild-exclude=}" echo "${tmppkgs[@]/#/--useoldpkg-atoms=}" "${pkgs[@]/#/--rebuild-exclude=}"
} }

View File

@ -14,7 +14,6 @@ gpg --import "${GPG_SECRET_KEY_FILE}"
sudo rm -rf src/build sudo rm -rf src/build
S=/mnt/host/source/src/scripts S=/mnt/host/source/src/scripts
enter ${S}/update_chroot
enter sudo emerge -uv --jobs=2 catalyst enter sudo emerge -uv --jobs=2 catalyst
enter sudo ${S}/bootstrap_sdk \ enter sudo ${S}/bootstrap_sdk \
--sign="${SIGNING_USER}" \ --sign="${SIGNING_USER}" \