ktap: add libelf PACKAGECONFIG also to ktap-module

* building ktap-module without elfutils fails with:
  ktap-module/0.4-r0/git/Makefile:107: No libelf found, disables symbol resolving, please install elfutils-libelf-devel/libelf-dev

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa 2015-11-09 12:26:29 +01:00
parent 220b31d536
commit 6c4cb0fb00
3 changed files with 14 additions and 13 deletions

View File

@ -9,11 +9,8 @@ inherit module
# See https://github.com/ktap/ktap/issues/80
PNBLACKLIST[ktap-module] ?= "Not compatible with 3.19 kernel"
# Available package configs: ffi (only supported on x86_64)
PACKAGECONFIG ?= ""
# Only build the module
MAKE_TARGETS = "${@base_contains('PACKAGECONFIG', 'ffi', 'FFI=1', '', d)} mod"
MAKE_TARGETS = "mod"
# Kernel module packages MUST begin with 'kernel-module-', otherwise
# multilib image generation can fail.

View File

@ -11,4 +11,16 @@ SRC_URI = "git://github.com/ktap/ktap.git"
S = "${WORKDIR}/git"
# Package config is abused as a general compile time configuration tool.
# Only supports x86_64 for now!. Needs to be enabled for ktap-module too.
PACKAGECONFIG[ffi] = ""
# Needed to resolve symbols in DSO and for sdt
PACKAGECONFIG[libelf] = ",,elfutils"
PACKAGECONFIG ?= "libelf"
EXTRA_OEMAKE = " \
${@base_contains('PACKAGECONFIG', 'libelf', '', 'NO_LIBELF=1', d)} \
${@base_contains('PACKAGECONFIG', 'ffi', 'FFI=1', '', d)} \
"

View File

@ -6,17 +6,9 @@ SUMMARY = "KTAP is a scripting dynamic tracing tool for Linux"
DEPENDS = "ktap-module"
PNBLACKLIST[ktap] ?= "Depends on blacklisted kernel-module-ktapvm"
#Available package configs:
# libelf - needed to resolve symbols in DSO and for sdt
# ffi - only supports x86_64 for now!. Needs to be enabled for ktap-module too.
PACKAGECONFIG ?= "libelf"
PACKAGECONFIG[libelf] = ",,elfutils"
# Only build the userspace app
EXTRA_OEMAKE = "${@base_contains('PACKAGECONFIG', 'libelf', '', 'NO_LIBELF=1', d)} \
${@base_contains('PACKAGECONFIG', 'ffi', 'FFI=1', '', d)} \
ktap"
EXTRA_OEMAKE += "ktap"
do_install() {
install -d ${D}${bindir}