diff options
author | Denys Dmytriyenko <denys@ti.com> | 2014-08-19 21:25:33 -0400 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-23 13:18:06 +0200 |
commit | 2d6b021fcea16948dc84bb4da82a9a27b681d7a9 (patch) | |
tree | 961d9c4eb8dbe178e1310baf9505bcaa022f2c28 /meta-oe | |
parent | 8f637f9bbcdda1dc7a1998d243708c727aa6016f (diff) | |
download | meta-openembedded-2d6b021fcea16948dc84bb4da82a9a27b681d7a9.tar.gz |
ltp-ddt: update to the latest rev, bump the version
* Fix KERNEL_DIR vs. KERNEL_INC properly, drop not needed Makefile patch
* Pass CC and KERNEL_CC to preserve the necessary system flags
* Tons of other fixes and new testcases
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-devtools/ltp-ddt/ltp-ddt/0001-KERNEL_INC-in-modern-kernel-should-point-at-toplevel.patch | 40 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.5.bb (renamed from meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb) | 20 |
2 files changed, 14 insertions, 46 deletions
diff --git a/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt/0001-KERNEL_INC-in-modern-kernel-should-point-at-toplevel.patch b/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt/0001-KERNEL_INC-in-modern-kernel-should-point-at-toplevel.patch deleted file mode 100644 index 0b4ee6455..000000000 --- a/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt/0001-KERNEL_INC-in-modern-kernel-should-point-at-toplevel.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From e0fc5bea466c16b9d754a8ac8d0453e396678a2c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 19 Feb 2014 20:28:07 -0800 | ||
4 | Subject: [PATCH] KERNEL_INC in modern kernel should point at toplevel | ||
5 | kerneldir | ||
6 | |||
7 | Reason is kernel headers are not only in toplevel | ||
8 | include/ but also in toplevel arch/ dir | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | Makefile | 6 +++--- | ||
13 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
14 | |||
15 | diff --git a/Makefile b/Makefile | ||
16 | index 031d8bc..73e9b3c 100644 | ||
17 | --- a/Makefile | ||
18 | +++ b/Makefile | ||
19 | @@ -245,15 +245,15 @@ endif | ||
20 | |||
21 | modules_edma: | ||
22 | @echo "Going to compile edma test kernel modules for $(PLATFORM)" | ||
23 | - cd testcases/ddt/edma_test_suite/src/kernel; make CROSS_COMPILE=$(CROSS_COMPILE) KERNEL_DIR=$(KERNEL_INC)/.. PLATFORM=$(PLATFORM) | ||
24 | + cd testcases/ddt/edma_test_suite/src/kernel; make CROSS_COMPILE=$(CROSS_COMPILE) KERNEL_DIR=$(KERNEL_INC) PLATFORM=$(PLATFORM) | ||
25 | |||
26 | modules_gpio: | ||
27 | @echo "Going to compile gpio test kernel modules for $(PLATFORM)" | ||
28 | - cd testcases/ddt/gpio_test_suite/src/kernel; make CROSS_COMPILE=$(CROSS_COMPILE) KERNEL_DIR=$(KERNEL_INC)/.. PLATFORM=$(PLATFORM) | ||
29 | + cd testcases/ddt/gpio_test_suite/src/kernel; make CROSS_COMPILE=$(CROSS_COMPILE) KERNEL_DIR=$(KERNEL_INC) PLATFORM=$(PLATFORM) | ||
30 | |||
31 | modules_ipc: | ||
32 | @echo "Going to compile IPC test kernel modules for $(PLATFORM)" | ||
33 | - cd testcases/ddt/ipc_test_suite/src/kernel; make CROSS_COMPILE=$(CROSS_COMPILE) KERNEL_DIR=$(KERNEL_INC)/.. PLATFORM=$(PLATFORM) | ||
34 | + cd testcases/ddt/ipc_test_suite/src/kernel; make CROSS_COMPILE=$(CROSS_COMPILE) KERNEL_DIR=$(KERNEL_INC) PLATFORM=$(PLATFORM) | ||
35 | |||
36 | modules: $(MODULES_TO_BUILD) | ||
37 | |||
38 | -- | ||
39 | 1.9.0 | ||
40 | |||
diff --git a/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb b/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.5.bb index a70d5b975..d0b84ad52 100644 --- a/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb +++ b/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.5.bb | |||
@@ -3,21 +3,21 @@ HOMEPAGE = "http://arago-project.org/git/projects/test-automation/ltp-ddt.git" | |||
3 | SECTION = "console/utils" | 3 | SECTION = "console/utils" |
4 | LICENSE = "GPLv2" | 4 | LICENSE = "GPLv2" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" |
6 | PR = "r1" | ||
7 | 6 | ||
8 | PROVIDES += "ltp" | 7 | PROVIDES += "ltp" |
9 | DEPENDS += "zip-native virtual/kernel alsa-lib" | 8 | DEPENDS += "zip-native virtual/kernel alsa-lib" |
10 | 9 | ||
11 | inherit autotools module-base kernel-module-split | 10 | RDEPENDS_${PN} += "pm-qa" |
11 | |||
12 | inherit autotools-brokensep module-base kernel-module-split | ||
12 | 13 | ||
13 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 14 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
14 | 15 | ||
15 | SRCREV = "4f77e2e33357d2b23211ecd22f27f521aa01469a" | 16 | SRCREV = "088356602220dd8b48aeb138d4976c05c0879574" |
16 | BRANCH ?= "master" | 17 | BRANCH ?= "master" |
17 | 18 | ||
18 | SRC_URI = "git://arago-project.org/git/projects/test-automation/ltp-ddt.git;branch=${BRANCH} \ | 19 | SRC_URI = "git://arago-project.org/git/projects/test-automation/ltp-ddt.git;branch=${BRANCH} \ |
19 | file://0001-wdt_test_suite-Make-sure-to-include-generated-header.patch \ | 20 | file://0001-wdt_test_suite-Make-sure-to-include-generated-header.patch \ |
20 | file://0001-KERNEL_INC-in-modern-kernel-should-point-at-toplevel.patch \ | ||
21 | " | 21 | " |
22 | 22 | ||
23 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |
@@ -28,12 +28,16 @@ EXTRA_OEMAKE_append = " \ | |||
28 | prefix=${LTPROOT} \ | 28 | prefix=${LTPROOT} \ |
29 | CROSS_COMPILE=${HOST_PREFIX} \ | 29 | CROSS_COMPILE=${HOST_PREFIX} \ |
30 | SKIP_IDCHECK=1 \ | 30 | SKIP_IDCHECK=1 \ |
31 | KERNEL_PATH=${STAGING_KERNEL_DIR} \ | ||
31 | KERNEL_INC=${STAGING_KERNEL_DIR} \ | 32 | KERNEL_INC=${STAGING_KERNEL_DIR} \ |
32 | KERNEL_USR_INC=${STAGING_INCDIR} \ | 33 | KERNEL_USR_INC=${STAGING_INCDIR} \ |
33 | ALSA_INCPATH=${STAGING_INCDIR} \ | 34 | ALSA_INCPATH=${STAGING_INCDIR} \ |
34 | ALSA_LIBPATH=${STAGING_LIBDIR} \ | 35 | ALSA_LIBPATH=${STAGING_LIBDIR} \ |
35 | PLATFORM=${MACHINE} \ | 36 | PLATFORM=${MACHINE} \ |
36 | RANLIB=${RANLIB} \ | 37 | RANLIB=${RANLIB} \ |
38 | DESTDIR=${D} \ | ||
39 | CC='${CC}' \ | ||
40 | KERNEL_CC='${KERNEL_CC}' \ | ||
37 | " | 41 | " |
38 | 42 | ||
39 | TARGET_CC_ARCH += "${LDFLAGS}" | 43 | TARGET_CC_ARCH += "${LDFLAGS}" |
@@ -63,12 +67,16 @@ do_configure() { | |||
63 | 67 | ||
64 | kmoddir = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/ddt" | 68 | kmoddir = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/ddt" |
65 | 69 | ||
70 | do_compile_prepend () { | ||
71 | do_make_scripts | ||
72 | } | ||
73 | |||
66 | do_compile_append () { | 74 | do_compile_append () { |
67 | oe_runmake DESTDIR=${D} modules | 75 | oe_runmake modules |
68 | } | 76 | } |
69 | 77 | ||
70 | do_install() { | 78 | do_install() { |
71 | oe_runmake DESTDIR=${D} install | 79 | oe_runmake install |
72 | install -d ${D}${datadir} | 80 | install -d ${D}${datadir} |
73 | install -d ${D}${kmoddir} | 81 | install -d ${D}${kmoddir} |
74 | cp -a ${D}${LTPROOT}/share/* ${D}${datadir} | 82 | cp -a ${D}${LTPROOT}/share/* ${D}${datadir} |