From 1a5796ea4fe37d093a511ff4574402f1a5cf34b7 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Wed, 20 Apr 2022 17:59:50 +0200 Subject: [PATCH] profiles: add keywords to cross-*/binutils as well Crossdev currently uses binutils 2.36 (stable), while the SDK and sysroot both build binutils 2.37 due to keywording. Kernel modules built within the developer container fail to load due to relocation errors. Add the same keywords to cross-*/binutils packages so that the versions match. --- .../profiles/coreos/base/package.accept_keywords | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 963b4fb395..e2b1ecfb3f 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -30,6 +30,11 @@ # Upgrade to GCC 10.3.0 to support latest glibc builds =sys-devel/binutils-2.37_p1 ~amd64 ~arm64 =sys-libs/binutils-libs-2.37_p1 ~amd64 ~arm64 +# This needs to be kept in-sync otherwise dev container contains +# different binutils than was used by crossdev to build kernel +# which breaks kmod builds +=cross-x86_64-cros-linux-gnu/binutils-2.37_p1 ~amd64 +=cross-aarch64-cros-linux-gnu/binutils-2.37_p1 ~arm64 =sys-fs/cryptsetup-2.4.1-r1 ~amd64 ~arm64