Skip to contentSkip to conversation

trace-cmd: fix QA warning

PATCH In review Dengke Du 2 participants 3 messages Nov 5, 2016 – Nov 7, 2016

lore
Share & tools
lore

Dengke Du

author
#0 lore raw

cover trace-cmd: fix QA warning

The following changes since commit c3d2df883a9d6d5036277114339673656d89a728:

oeqa/selftest/kernel.py: Add new file destined for kernel related tests (2016-11-01 10:05:46 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib dengke/fix-trace_cmd-QA-warning
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=dengke/fix-trace_cmd-QA-warning

Dengke Du (1):
trace-cmd: fix QA warning

 meta/recipes-kernel/trace-cmd/trace-cmd_git.bb | 4 ++++
 1 file changed, 4 insertions(+)
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/1 trace-cmd: fix QA warning

Add PACKAGECONFIG for audit.

Signed-off-by Dengke Du <[email protected]>
---
 meta/recipes-kernel/trace-cmd/trace-cmd_git.bb | 4 ++++
 1 file changed, 4 insertions(+)
meta/recipes-kernel/trace-cmd/trace-cmd_git.bb +4 -0
index dd9a8a0..05f5f9a 100644
@@ -9,6 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://trace-input.c;beginline=5;endline=8;md5=3ec82f43bbe0cfb5951ff414ef4d44d0 \
 "
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[audit] = ",,audit"
+
 EXTRA_OEMAKE = "\
     'prefix=${prefix}' \
     'bindir=${bindir}' \

@@ -20,6 +23,7 @@ EXTRA_OEMAKE = "\
     'libdir=${@oe.path.relative(prefix, libdir)}' \
     \
     NO_PYTHON=1 \
+    ${@bb.utils.contains('PACKAGECONFIG', 'audit', '', 'NO_AUDIT=1', d)} \
 "
 
 do_compile_prepend() {
Signature · 1 line
2.7.4
#2 lore raw
Quoted 7 lines · Dengke Du
meta/recipes-kernel/trace-cmd/trace-cmd_git.bb +3 -0
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[audit] = ",,audit"
+
 EXTRA_OEMAKE = "\
     'prefix=${prefix}' \
     'bindir=${bindir}' \

meta/recipes-kernel/trace-cmd/trace-cmd_git.bb EXTRA_OEMAKE = "\ · line 29

Quoted 7 lines
meta/recipes-kernel/trace-cmd/trace-cmd_git.bb +1 -0
@@ -20,6 +23,7 @@ EXTRA_OEMAKE = "\
     'libdir=${@oe.path.relative(prefix, libdir)}' \
     \
     NO_PYTHON=1 \
+    ${@bb.utils.contains('PACKAGECONFIG', 'audit', '', 'NO_AUDIT=1', d)}
 \
 "

A neater way of doing this would be:

PACKAGECONFIG ??= ""
PACKAGECONFIG[audit] = ',NO_AUDIT=1,audit'
EXTRA_OECMAKE = ".... ${PACKAGECONFIG_CONFARGS}"

This works as the PACKAGECONFIG expansion adds the active expressions to PACKAGECONFIG_CONFARGS, so you can add that directly to EXTRA_OEMAKE.

Ross