ltp-ddt: Fix build with newer kernels

Update to latest git

kernel internal headers has got resuffled so adjust to that

split modules out into packages of their own otherwise
debug split logic gets confused when packaging the kernel modules

Package debug info generated from newly added test cases

Put .a files in staticdev package

install modules in usual location

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj 2014-02-19 22:11:23 -08:00 committed by Martin Jansa
parent ffade38e6b
commit a7ee4f3b00
3 changed files with 92 additions and 4 deletions

View File

@ -0,0 +1,40 @@
From e0fc5bea466c16b9d754a8ac8d0453e396678a2c Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 19 Feb 2014 20:28:07 -0800
Subject: [PATCH] KERNEL_INC in modern kernel should point at toplevel
kerneldir
Reason is kernel headers are not only in toplevel
include/ but also in toplevel arch/ dir
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 031d8bc..73e9b3c 100644
--- a/Makefile
+++ b/Makefile
@@ -245,15 +245,15 @@ endif
modules_edma:
@echo "Going to compile edma test kernel modules for $(PLATFORM)"
- cd testcases/ddt/edma_test_suite/src/kernel; make CROSS_COMPILE=$(CROSS_COMPILE) KERNEL_DIR=$(KERNEL_INC)/.. PLATFORM=$(PLATFORM)
+ cd testcases/ddt/edma_test_suite/src/kernel; make CROSS_COMPILE=$(CROSS_COMPILE) KERNEL_DIR=$(KERNEL_INC) PLATFORM=$(PLATFORM)
modules_gpio:
@echo "Going to compile gpio test kernel modules for $(PLATFORM)"
- cd testcases/ddt/gpio_test_suite/src/kernel; make CROSS_COMPILE=$(CROSS_COMPILE) KERNEL_DIR=$(KERNEL_INC)/.. PLATFORM=$(PLATFORM)
+ cd testcases/ddt/gpio_test_suite/src/kernel; make CROSS_COMPILE=$(CROSS_COMPILE) KERNEL_DIR=$(KERNEL_INC) PLATFORM=$(PLATFORM)
modules_ipc:
@echo "Going to compile IPC test kernel modules for $(PLATFORM)"
- cd testcases/ddt/ipc_test_suite/src/kernel; make CROSS_COMPILE=$(CROSS_COMPILE) KERNEL_DIR=$(KERNEL_INC)/.. PLATFORM=$(PLATFORM)
+ cd testcases/ddt/ipc_test_suite/src/kernel; make CROSS_COMPILE=$(CROSS_COMPILE) KERNEL_DIR=$(KERNEL_INC) PLATFORM=$(PLATFORM)
modules: $(MODULES_TO_BUILD)
--
1.9.0

View File

@ -0,0 +1,34 @@
From 4a8f24892514cd5e4d11b9105c843db49eea921b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 19 Feb 2014 19:41:33 -0800
Subject: [PATCH] wdt_test_suite: Make sure to include generated headers
This makes sure that its using the generated headers
and not the raw headers from kernel, generated headers
are built for the given machine already when kernel is
built and are available in configured/compiled kernel tree
already
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
testcases/ddt/wdt_test_suite/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/testcases/ddt/wdt_test_suite/Makefile b/testcases/ddt/wdt_test_suite/Makefile
index 90a6a90..22a1cfd 100644
--- a/testcases/ddt/wdt_test_suite/Makefile
+++ b/testcases/ddt/wdt_test_suite/Makefile
@@ -20,8 +20,8 @@ INCLUDES = -I $(KERNEL_INC) -I src/interface/common -I ../utils/user
INCLUDES = -I src/parser \
-I src/interface/common \
-I ../utils/user \
- -I $(KERNEL_INC)/include \
- -I $(KERNEL_INC)/arch/arm/include
+ -I $(KERNEL_INC)/include/generated \
+ -I $(KERNEL_INC)/arch/arm/include/generated \
#List of source files- Update this on adding a new C file
SOURCES := \
--
1.9.0

View File

@ -8,14 +8,17 @@ PR = "r1"
PROVIDES += "ltp" PROVIDES += "ltp"
DEPENDS += "zip-native virtual/kernel alsa-lib" DEPENDS += "zip-native virtual/kernel alsa-lib"
inherit autotools inherit autotools module-base kernel-module-split
PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGE_ARCH = "${MACHINE_ARCH}"
SRCREV = "46e8aa7d0dd095300709309301e1c79f0003df40" SRCREV = "4f77e2e33357d2b23211ecd22f27f521aa01469a"
BRANCH ?= "master" BRANCH ?= "master"
SRC_URI = "git://arago-project.org/git/projects/test-automation/ltp-ddt.git;branch=${BRANCH}" SRC_URI = "git://arago-project.org/git/projects/test-automation/ltp-ddt.git;branch=${BRANCH} \
file://0001-wdt_test_suite-Make-sure-to-include-generated-header.patch \
file://0001-KERNEL_INC-in-modern-kernel-should-point-at-toplevel.patch \
"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
@ -25,11 +28,12 @@ EXTRA_OEMAKE_append = " \
prefix=${LTPROOT} \ prefix=${LTPROOT} \
CROSS_COMPILE=${HOST_PREFIX} \ CROSS_COMPILE=${HOST_PREFIX} \
SKIP_IDCHECK=1 \ SKIP_IDCHECK=1 \
KERNEL_INC=${STAGING_KERNEL_DIR}/include-generic \ KERNEL_INC=${STAGING_KERNEL_DIR} \
KERNEL_USR_INC=${STAGING_INCDIR} \ KERNEL_USR_INC=${STAGING_INCDIR} \
ALSA_INCPATH=${STAGING_INCDIR} \ ALSA_INCPATH=${STAGING_INCDIR} \
ALSA_LIBPATH=${STAGING_LIBDIR} \ ALSA_LIBPATH=${STAGING_LIBDIR} \
PLATFORM=${MACHINE} \ PLATFORM=${MACHINE} \
RANLIB=${RANLIB} \
" "
TARGET_CC_ARCH += "${LDFLAGS}" TARGET_CC_ARCH += "${LDFLAGS}"
@ -44,8 +48,10 @@ FILES_${PN}-dbg += " \
${LTPROOT}/testcases/bin/ddt/.debug \ ${LTPROOT}/testcases/bin/ddt/.debug \
${LTPROOT}/testcases/bin/ddt/*/bin/.debug \ ${LTPROOT}/testcases/bin/ddt/*/bin/.debug \
${LTPROOT}/testcases/bin/ddt/*/test/.debug \ ${LTPROOT}/testcases/bin/ddt/*/test/.debug \
${LTPROOT}/testcases/realtime/*/*/.debug \
" "
FILES_${PN}-staticdev += "${LTPROOT}/lib"
FILES_${PN} += "${LTPROOT}/*" FILES_${PN} += "${LTPROOT}/*"
do_configure() { do_configure() {
@ -55,9 +61,17 @@ do_configure() {
echo "${TAG}" > ${S}/ChangeLog echo "${TAG}" > ${S}/ChangeLog
} }
kmoddir = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/ddt"
do_compile_append () {
oe_runmake DESTDIR=${D} modules
}
do_install() { do_install() {
oe_runmake DESTDIR=${D} install oe_runmake DESTDIR=${D} install
install -d ${D}${datadir} install -d ${D}${datadir}
install -d ${D}${kmoddir}
cp -a ${D}${LTPROOT}/share/* ${D}${datadir} cp -a ${D}${LTPROOT}/share/* ${D}${datadir}
rm -rf ${D}${LTPROOT}/share/ rm -rf ${D}${LTPROOT}/share/
mv ${D}${LTPROOT}/testcases/bin/ddt/*.ko ${D}${kmoddir}
} }