From 935f8c0c104c8259da610857899838f7161ec022 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Tue, 17 Nov 2020 15:38:20 +0100 Subject: [PATCH] profiles: make SDK include dev-util/dwarves To build Kernel with `CONFIG_DEBUG_INFO_BTF`, we need to make `pahole` in dwarves included in the Flatcar SDK. To do that, we need to make it accept `~amd64` keywords for dwarves and binutils. Also enable USE flag `python_single_target_python3_6` for dwarves. --- .../coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild | 1 + .../profiles/coreos/base/package.accept_keywords | 3 +++ .../coreos-overlay/profiles/coreos/base/package.use | 1 + 3 files changed, 5 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild index f66fe8c1d9..b1b86aa4c6 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild @@ -33,6 +33,7 @@ DEPEND=" dev-util/boost-build dev-util/catalyst dev-util/checkbashisms + dev-util/dwarves dev-util/patchelf dev-vcs/repo net-dns/bind-tools 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 33f05607b8..23429edecc 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 @@ -82,3 +82,6 @@ dev-util/checkbashisms =sys-fs/cryptsetup-2.0.3 ~amd64 =sys-libs/libseccomp-2.5.0 ~amd64 ~arm64 + +>=dev-util/dwarves-1.18 ~amd64 +>=dev-libs/elfutils-0.178 ~amd64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index 3decf29cb5..11bf2d85f7 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -26,6 +26,7 @@ dev-python/uritemplate -python_targets_python3_6 sys-apps/portage -python_targets_python3_6 # python3 only +dev-util/dwarves python_single_target_python3_6 dev-util/gdbus-codegen python_single_target_python3_6 dev-util/glib-utils python_single_target_python3_6 net-fs/samba python_single_target_python3_6