Add missing pahole dependencies

pahole is a build-time dependency of our kernel build, due to us setting
CONFIG_BTF_DEBUG_INFO. If pahole is missing, a `make modules_prepare` with our
kernel config results in symbols in the config changing. This will affect
people building kernel modules against coreos-sources in the developer
container, but not the SDK because pahole is already in sdk-depends.

pahole is now an (explicit) BDEPEND of all the coreos-kernel/coreos-modules
packages, and we'll make it an RDEPEND of coreos-sources so that it is pulled
in whenever it might be necessary.  Also add it to the coreos-dev package so
that it is included in developer container by default, uncompressed size
increase is <1MB.
This commit is contained in:
Jeremi Piotrowski 2022-04-22 16:49:58 +02:00
parent b9f2da8566
commit c5e7ff8c9e
4 changed files with 6 additions and 0 deletions

View File

@ -0,0 +1 @@
- Added pahole to developer container, without it kernel modules built against /usr/src/linux may fail to probe with an 'invalid relocation target' error ([PR#1839](https://github.com/flatcar-linux/coreos-overlay/pull/1839))

View File

@ -21,6 +21,7 @@ RDEPEND="
coreos-base/emerge-gitclone coreos-base/emerge-gitclone
dev-lang/python dev-lang/python
dev-util/strace dev-util/strace
dev-util/pahole
dev-vcs/repo dev-vcs/repo
net-analyzer/netperf net-analyzer/netperf
net-dialup/minicom net-dialup/minicom

View File

@ -35,6 +35,7 @@ SLOT="0/${PVR}"
SRC_URI="" SRC_URI=""
IUSE="" IUSE=""
BDEPEND="dev-util/pahole"
DEPEND="=sys-kernel/coreos-sources-${COREOS_SOURCE_VERSION}" DEPEND="=sys-kernel/coreos-sources-${COREOS_SOURCE_VERSION}"
# Do not analyze or strip installed files # Do not analyze or strip installed files

View File

@ -24,6 +24,9 @@ else
PATCH_DIR="${FILESDIR}/${KV_MAJOR}.${KV_MINOR}" PATCH_DIR="${FILESDIR}/${KV_MAJOR}.${KV_MINOR}"
fi fi
# make modules_prepare depends on pahole
RDEPEND="dev-util/pahole"
KEYWORDS="amd64 arm64" KEYWORDS="amd64 arm64"
IUSE="" IUSE=""