diff options
author | Dengke Du <dengke.du@windriver.com> | 2017-08-11 03:38:57 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-16 00:03:14 +0100 |
commit | b3ca36e7d1fa00d5c441ebbc89d719dfea56eb1d (patch) | |
tree | 353d2d35277961f61aab95838c16ef57b4de49e1 /meta/recipes-extended/ltp/ltp_20170516.bb | |
parent | 54cdf84d42d30f0656d3fd538a739237c715d257 (diff) | |
download | poky-b3ca36e7d1fa00d5c441ebbc89d719dfea56eb1d.tar.gz |
ltp: upgrade to upstream latest commit on 20170804
1. Drop 4 patches because the upstream already contains them:
0001-dirtyc0w-Include-stdint.h.patch
0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch
0037-faccessat-and-fchmodat-Fix-build-warnings.patch
0038-syscalls-add_key02-update-to-test-fix-for-nonempty-N.patch
2. Drop the do_compile_prepend function, because the upstream already fix
the parallel make race, we can check it here:
https://github.com/linux-test-project/ltp/commit/3f385652efe811fe7491474f8513baf44cf0a12d
3. Fix PAGE_SIZE redefinition and O_CREAT undeclear build failures when using musl
4. Fix runtime failed case file01
(From OE-Core rev: 46feafdc13b8c3c4b03d44a4a95a87d4ee25300c)
Signed-off-by: Dengke Du <dengke.du@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/ltp/ltp_20170516.bb')
-rw-r--r-- | meta/recipes-extended/ltp/ltp_20170516.bb | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/meta/recipes-extended/ltp/ltp_20170516.bb b/meta/recipes-extended/ltp/ltp_20170516.bb index 86b801288d..665e08f204 100644 --- a/meta/recipes-extended/ltp/ltp_20170516.bb +++ b/meta/recipes-extended/ltp/ltp_20170516.bb | |||
@@ -21,7 +21,7 @@ DEPENDS_append_libc-musl = " fts " | |||
21 | EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " | 21 | EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " |
22 | CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" | 22 | CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" |
23 | CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" | 23 | CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" |
24 | SRCREV = "6c6c6ca40afb3611e52486f670085762ff451e91" | 24 | SRCREV = "18916a2e6d8c997b7b29dcfa9550d5a15b22ed22" |
25 | 25 | ||
26 | SRC_URI = "git://github.com/linux-test-project/ltp.git \ | 26 | SRC_URI = "git://github.com/linux-test-project/ltp.git \ |
27 | file://0001-add-_GNU_SOURCE-to-pec_listener.c.patch \ | 27 | file://0001-add-_GNU_SOURCE-to-pec_listener.c.patch \ |
@@ -29,7 +29,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ | |||
29 | file://0003-Add-knob-to-control-tirpc-support.patch \ | 29 | file://0003-Add-knob-to-control-tirpc-support.patch \ |
30 | file://0004-build-Add-option-to-select-libc-implementation.patch \ | 30 | file://0004-build-Add-option-to-select-libc-implementation.patch \ |
31 | file://0005-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ | 31 | file://0005-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ |
32 | file://0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch \ | ||
33 | file://0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch \ | 32 | file://0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch \ |
34 | file://0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \ | 33 | file://0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \ |
35 | file://0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch \ | 34 | file://0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch \ |
@@ -49,9 +48,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ | |||
49 | file://0034-periodic_output.patch \ | 48 | file://0034-periodic_output.patch \ |
50 | file://0035-fix-test_proc_kill-hang.patch \ | 49 | file://0035-fix-test_proc_kill-hang.patch \ |
51 | file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ | 50 | file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ |
52 | file://0001-dirtyc0w-Include-stdint.h.patch \ | 51 | file://0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch \ |
53 | file://0037-faccessat-and-fchmodat-Fix-build-warnings.patch \ | ||
54 | file://0038-syscalls-add_key02-update-to-test-fix-for-nonempty-N.patch \ | ||
55 | " | 52 | " |
56 | 53 | ||
57 | S = "${WORKDIR}/git" | 54 | S = "${WORKDIR}/git" |
@@ -69,14 +66,6 @@ EXTRA_OECONF = " --with-power-management-testsuite --with-realtime-testsuite " | |||
69 | # ltp network/rpc test cases ftbfs when libtirpc is found | 66 | # ltp network/rpc test cases ftbfs when libtirpc is found |
70 | EXTRA_OECONF += " --without-tirpc " | 67 | EXTRA_OECONF += " --without-tirpc " |
71 | 68 | ||
72 | # The makefiles make excessive use of make -C and several include testcases.mk | ||
73 | # which triggers a build of the syscall header. To reproduce, build ltp, | ||
74 | # then delete the header, then "make -j XX" and watch regen.sh run multiple | ||
75 | # times. Its easier to generate this once here instead. | ||
76 | do_compile_prepend () { | ||
77 | ( make -C ${B}/testcases/kernel include/linux_syscall_numbers.h ) | ||
78 | } | ||
79 | |||
80 | do_install(){ | 69 | do_install(){ |
81 | install -d ${D}/opt/ltp/ | 70 | install -d ${D}/opt/ltp/ |
82 | oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install | 71 | oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install |
@@ -89,9 +78,6 @@ do_install(){ | |||
89 | # OSDL's Scaleable Test Platform, but now http://khack.osdl.org unaccessible | 78 | # OSDL's Scaleable Test Platform, but now http://khack.osdl.org unaccessible |
90 | rm -rf ${D}/opt/ltp/bin/STPfailure_report.pl | 79 | rm -rf ${D}/opt/ltp/bin/STPfailure_report.pl |
91 | 80 | ||
92 | # In oe-core, we doesn't support ksh and csh now, so remove in.csh and in.ksh. | ||
93 | rm ${D}/opt/ltp/testcases/data/file01/in.csh | ||
94 | rm ${D}/opt/ltp/testcases/data/file01/in.ksh | ||
95 | # Copy POSIX test suite into ${D}/opt/ltp/testcases by manual | 81 | # Copy POSIX test suite into ${D}/opt/ltp/testcases by manual |
96 | cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases | 82 | cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases |
97 | } | 83 | } |