diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords index 028232f49a..6237d0ad1a 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords @@ -45,13 +45,12 @@ =sys-apps/smartmontools-6.4 ** =sys-block/parted-3.2-r1 ~arm64 =sys-cluster/ipvsadm-1.27-r1 ** -=sys-devel/binutils-2.28.1 ~arm64 =sys-fs/btrfs-progs-4.10.2 ~arm64 =sys-fs/cryptsetup-1.7.4 ** =sys-fs/lsscsi-0.28 ~arm64 =sys-fs/mdadm-3.4 ** =sys-fs/multipath-tools-0.6.4-r1 ~arm64 =sys-fs/quota-4.02 ** -=sys-libs/binutils-libs-2.28.1 ~arm64 +=sys-libs/binutils-libs-2.29.1-r1 ~arm64 =sys-libs/libcap-ng-0.7.8 ~arm64 =virtual/perl-File-Path-2.130.0 ~arm64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask index 9f566178fd..8e2e86bac9 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask @@ -14,9 +14,3 @@ # mask an accidental rkt major version bump to ensure it's not chosen over more # recent releases =app-emulation/rkt-13.0 - -# Block new binutils, the amd64 kernel can't uncompress when built with it. ->=sys-devel/binutils-2.26 ->=sys-libs/binutils-libs-2.26 ->=cross-aarch64-cros-linux-gnu/binutils-2.26 ->=cross-x86_64-cros-linux-gnu/binutils-2.26 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords index d18a22544a..3e36240a6c 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords @@ -7,6 +7,3 @@ dev-python/botocore ~amd64 dev-lang/rust ~amd64 dev-util/cargo ~amd64 virtual/rust ~amd64 - -# Match binutils versions with the host -=cross-aarch64-cros-linux-gnu/binutils-2.28.1 ~arm64