From a1dacd52d8bad948dcea3c39278da1d87e3167af Mon Sep 17 00:00:00 2001 From: Fathi Boudra Date: Wed, 5 Nov 2014 12:03:33 +0200 Subject: ltp: update to 20140828 release bump SRCREV to 20140828 tag drop automake-foreign patch - fixed upstream (commit 18594de and edbae29) add add-know-for-tirpc patch - workaround ftbfs with libtirpc found update realtime tests fixes upstream status from submitted to backported - merged upstream Signed-off-by: Fathi Boudra Signed-off-by: Richard Purdie --- ...sts-Fix-bad-priority-inheritance-conditio.patch | 2 +- ...ltime-tests-Fix-robust-mutex-conditionals.patch | 2 +- .../ltp/ltp/add-knob-for-tirpc.patch | 37 +++++++++ .../ltp/ltp/automake-foreign.patch | 20 ----- meta/recipes-extended/ltp/ltp_20140422.bb | 91 --------------------- meta/recipes-extended/ltp/ltp_20140828.bb | 93 ++++++++++++++++++++++ 6 files changed, 132 insertions(+), 113 deletions(-) create mode 100644 meta/recipes-extended/ltp/ltp/add-knob-for-tirpc.patch delete mode 100644 meta/recipes-extended/ltp/ltp/automake-foreign.patch delete mode 100644 meta/recipes-extended/ltp/ltp_20140422.bb create mode 100644 meta/recipes-extended/ltp/ltp_20140828.bb diff --git a/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch b/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch index fa20b085f7..631f9265ec 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch @@ -9,7 +9,7 @@ both referenced a non-existent autoconf configuration setting variable. Replaced the invalid variable name with the variable actually created by autoconf. -Upstream-Status: Submitted +Upstream-Status: Backported Signed-off-by: Gary S. Robertson --- diff --git a/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-robust-mutex-conditionals.patch b/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-robust-mutex-conditionals.patch index ccdd4d0bb3..1fdd281013 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-robust-mutex-conditionals.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-robust-mutex-conditionals.patch @@ -9,7 +9,7 @@ which were not generated by autoconf in order to configure tests for robust mutexes. Changed these conditionals to use the config variables actually generated in the autoconf process. -Upstream-Status: Submitted +Upstream-Status: Backported Signed-off-by: Gary S. Robertson --- diff --git a/meta/recipes-extended/ltp/ltp/add-knob-for-tirpc.patch b/meta/recipes-extended/ltp/ltp/add-knob-for-tirpc.patch new file mode 100644 index 0000000000..36ff4c775d --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/add-knob-for-tirpc.patch @@ -0,0 +1,37 @@ +[PATCH] add knob to control whether tirpc support should be checked + +Upstream-Status: Pending + +tirpc support is broken upstream. in the meantime, allow to disable tirpc. + +Signed-off-by: Fathi Boudra +--- + configure.ac | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- a/configure.ac ++++ b/configure.ac +@@ -98,6 +98,13 @@ if test "x$with_python" = xyes; then + else + AC_SUBST([WITH_PYTHON],["no"]) + fi ++ ++# TI RPC ++AC_ARG_WITH([tirpc], ++ AC_HELP_STRING([--without-tirpc], ++ [without libtirpc support]), ++ [],[with_tirpc=yes], ++) + # END tools knobs + + # Testsuites knobs +@@ -182,7 +189,9 @@ LTP_CHECK_RENAMEAT + LTP_CHECK_FALLOCATE + LTP_CHECK_SYSCALL_FCNTL + LTP_CHECK_SYSCALL_PERF_EVENT_OPEN ++if test "x$with_tirpc" = xyes; then + LTP_CHECK_TIRPC ++fi + LTP_CHECK_TEE + LTP_CHECK_SPLICE + LTP_CHECK_VMSPLICE diff --git a/meta/recipes-extended/ltp/ltp/automake-foreign.patch b/meta/recipes-extended/ltp/ltp/automake-foreign.patch deleted file mode 100644 index c3dd891395..0000000000 --- a/meta/recipes-extended/ltp/ltp/automake-foreign.patch +++ /dev/null @@ -1,20 +0,0 @@ -Use foreign strictness to avoid automake errors. - -Upstream-Status: Submitted (https://github.com/linux-test-project/ltp/issues/16) -Signed-off-by: Ross Burton - -diff --git a/configure.ac b/configure.ac -index 9f397e7..fc57957 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4 +4 @@ --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) ---- a/utils/ffsb-6.0-rc2/configure.in -+++ b/utils/ffsb-6.0-rc2/configure.in -@@ -2,2 +2,3 @@ dnl Process this file with autoconf to produce a configure script. --AC_INIT(main.c) --AM_INIT_AUTOMAKE(ffsb, 6.0-RC2) -+AC_INIT([ffsb], [6.0-RC2]) -+AC_CONFIG_SRCDIR([main.c]) -+AM_INIT_AUTOMAKE([foreign]) diff --git a/meta/recipes-extended/ltp/ltp_20140422.bb b/meta/recipes-extended/ltp/ltp_20140422.bb deleted file mode 100644 index 5deaabf663..0000000000 --- a/meta/recipes-extended/ltp/ltp_20140422.bb +++ /dev/null @@ -1,91 +0,0 @@ -SUMMARY = "Linux Test Project" -DESCRIPTION = "The Linux Test Project is a joint project with SGI, IBM, OSDL, and Bull with a goal to deliver test suites to the open source community that validate the reliability, robustness, and stability of Linux. The Linux Test Project is a collection of tools for testing the Linux kernel and related features." -HOMEPAGE = "http://ltp.sourceforge.net" -SECTION = "console/utils" -LICENSE = "GPLv2 & GPLv2+ & LGPLv2+ & LGPLv2.1+ & BSD-2-Clause" -LIC_FILES_CHKSUM = "\ - file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ - file://testcases/kernel/controllers/freezer/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ - file://testcases/kernel/controllers/freezer/run_freezer.sh;beginline=5;endline=17;md5=86a61d2c042d59836ffb353a21456498 \ - file://testcases/kernel/hotplug/memory_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \ - file://testcases/kernel/hotplug/cpu_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \ - file://testcases/open_posix_testsuite/COPYING;md5=216e43b72efbe4ed9017cc19c4c68b01 \ - file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ - file://tools/netpipe-2.4/COPYING;md5=9e3781bb5fe787aa80e1f51f5006b6fa \ - file://tools/netpipe-2.4-ipv6/COPYING;md5=9e3781bb5fe787aa80e1f51f5006b6fa \ - file://tools/top-LTP/proc/COPYING;md5=aefc88eb8a41672fbfcfe6b69ab8c49c \ - file://tools/pounder21/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://utils/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \ -" - -DEPENDS = "attr libaio libcap acl openssl zip-native" -SRCREV = "f4c3bfe1eab51eb72caeb0f3336d2790c9a8bd1b" - -SRC_URI = "git://github.com/linux-test-project/ltp.git \ - file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \ - file://ltp-Do-not-link-against-libfl.patch \ - file://automake-foreign.patch \ - file://make-setregid02-work.patch \ - file://add-knob-for-numa.patch \ - file://0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch \ - file://0001-Realtime-tests-Fix-robust-mutex-conditionals.patch \ -" - -S = "${WORKDIR}/git" - -inherit autotools-brokensep - -TARGET_CC_ARCH += "${LDFLAGS}" - -export prefix = "/opt/ltp" -export exec_prefix = "/opt/ltp" - -PACKAGECONFIG[numa] = "--with-numa, --without-numa, numactl," -EXTRA_AUTORECONF += "-I ${S}/testcases/realtime/m4" -EXTRA_OECONF = " --with-power-management-testsuite --with-realtime-testsuite " - -# ltp doesn't regenerate ffsb-6.0-rc2 configure and hardcode configure call. -# we explicitly force regeneration of that directory and pass configure options. -do_configure_append() { - (cd utils/ffsb-6.0-rc2; autoreconf -fvi; ./configure ${CONFIGUREOPTS}) -} - -# The makefiles make excessive use of make -C and several include testcases.mk -# which triggers a build of the syscall header. To reproduce, build ltp, -# then delete the header, then "make -j XX" and watch regen.sh run multiple -# times. Its easier to generate this once here instead. -do_compile_prepend () { - ( make -C ${B}/testcases/kernel include/linux_syscall_numbers.h ) -} - -do_install(){ - install -d ${D}/opt/ltp/ - oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install - - # Copy POSIX test suite into ${D}/opt/ltp/testcases by manual - cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases - - # We need to remove all scripts which depend on /usr/bin/expect, since expect is not supported in oe-core - # We will add expect for enhancement in future - find ${D} -type f -print | xargs grep "\!.*\/usr\/bin\/expect" | awk -F":" '{print $1}' | xargs rm -f -} - -RDEPENDS_${PN} = "perl e2fsprogs-mke2fs python-core libaio bash gawk" - -FILES_${PN}-dbg += "\ - /opt/ltp/runtest/.debug \ - /opt/ltp/testcases/bin/.debug \ - /opt/ltp/testcases/bin/*/bin/.debug \ - /opt/ltp/testcases/bin/*/test/.debug \ - /opt/ltp/scenario_groups/.debug \ - /opt/ltp/testscripts/.debug \ - /opt/ltp/testscripts/open_posix_testsuite/.debug \ -" - -FILES_${PN}-staticdev += "/opt/ltp/lib/libmem.a" - -FILES_${PN} += "/opt/ltp/* /opt/ltp/runtest/* /opt/ltp/scenario_groups/* /opt/ltp/testcases/bin/* /opt/ltp/testcases/bin/*/bin/* /opt/ltp/testscripts/* /opt/ltp/testcases/open_posix_testsuite/* /opt/ltp/testcases/open_posix_testsuite/conformance/* /opt/ltp/testcases/open_posix_testsuite/Documentation/* /opt/ltp/testcases/open_posix_testsuite/functional/* /opt/ltp/testcases/open_posix_testsuite/include/* /opt/ltp/testcases/open_posix_testsuite/scripts/* /opt/ltp/testcases/open_posix_testsuite/stress/* /opt/ltp/testcases/open_posix_testsuite/tools/*" - -# Avoid generated binaries stripping. Otherwise some of the ltp tests such as ldd01 & nm01 fails -INHIBIT_PACKAGE_STRIP = "1" diff --git a/meta/recipes-extended/ltp/ltp_20140828.bb b/meta/recipes-extended/ltp/ltp_20140828.bb new file mode 100644 index 0000000000..0be18a71c3 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp_20140828.bb @@ -0,0 +1,93 @@ +SUMMARY = "Linux Test Project" +DESCRIPTION = "The Linux Test Project is a joint project with SGI, IBM, OSDL, and Bull with a goal to deliver test suites to the open source community that validate the reliability, robustness, and stability of Linux. The Linux Test Project is a collection of tools for testing the Linux kernel and related features." +HOMEPAGE = "http://ltp.sourceforge.net" +SECTION = "console/utils" +LICENSE = "GPLv2 & GPLv2+ & LGPLv2+ & LGPLv2.1+ & BSD-2-Clause" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ + file://testcases/kernel/controllers/freezer/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ + file://testcases/kernel/controllers/freezer/run_freezer.sh;beginline=5;endline=17;md5=86a61d2c042d59836ffb353a21456498 \ + file://testcases/kernel/hotplug/memory_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \ + file://testcases/kernel/hotplug/cpu_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \ + file://testcases/open_posix_testsuite/COPYING;md5=216e43b72efbe4ed9017cc19c4c68b01 \ + file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ + file://tools/netpipe-2.4/COPYING;md5=9e3781bb5fe787aa80e1f51f5006b6fa \ + file://tools/netpipe-2.4-ipv6/COPYING;md5=9e3781bb5fe787aa80e1f51f5006b6fa \ + file://tools/top-LTP/proc/COPYING;md5=aefc88eb8a41672fbfcfe6b69ab8c49c \ + file://tools/pounder21/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://utils/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \ +" + +DEPENDS = "attr libaio libcap acl openssl zip-native" +SRCREV = "2c341ad9177f36d9b953e84dee8cf88498286fe5" + +SRC_URI = "git://github.com/linux-test-project/ltp.git \ + file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \ + file://ltp-Do-not-link-against-libfl.patch \ + file://make-setregid02-work.patch \ + file://add-knob-for-numa.patch \ + file://0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch \ + file://0001-Realtime-tests-Fix-robust-mutex-conditionals.patch \ + file://add-knob-for-tirpc.patch \ +" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +TARGET_CC_ARCH += "${LDFLAGS}" + +export prefix = "/opt/ltp" +export exec_prefix = "/opt/ltp" + +PACKAGECONFIG[numa] = "--with-numa, --without-numa, numactl," +EXTRA_AUTORECONF += "-I ${S}/testcases/realtime/m4" +EXTRA_OECONF = " --with-power-management-testsuite --with-realtime-testsuite " +# ltp network/rpc test cases ftbfs when libtirpc is found +EXTRA_OECONF += " --without-tirpc " + +# ltp doesn't regenerate ffsb-6.0-rc2 configure and hardcode configure call. +# we explicitly force regeneration of that directory and pass configure options. +do_configure_append() { + (cd utils/ffsb-6.0-rc2; autoreconf -fvi; ./configure ${CONFIGUREOPTS}) +} + +# The makefiles make excessive use of make -C and several include testcases.mk +# which triggers a build of the syscall header. To reproduce, build ltp, +# then delete the header, then "make -j XX" and watch regen.sh run multiple +# times. Its easier to generate this once here instead. +do_compile_prepend () { + ( make -C ${B}/testcases/kernel include/linux_syscall_numbers.h ) +} + +do_install(){ + install -d ${D}/opt/ltp/ + oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install + + # Copy POSIX test suite into ${D}/opt/ltp/testcases by manual + cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases + + # We need to remove all scripts which depend on /usr/bin/expect, since expect is not supported in oe-core + # We will add expect for enhancement in future + find ${D} -type f -print | xargs grep "\!.*\/usr\/bin\/expect" | awk -F":" '{print $1}' | xargs rm -f +} + +RDEPENDS_${PN} = "perl e2fsprogs-mke2fs python-core libaio bash gawk" + +FILES_${PN}-dbg += "\ + /opt/ltp/runtest/.debug \ + /opt/ltp/testcases/bin/.debug \ + /opt/ltp/testcases/bin/*/bin/.debug \ + /opt/ltp/testcases/bin/*/test/.debug \ + /opt/ltp/scenario_groups/.debug \ + /opt/ltp/testscripts/.debug \ + /opt/ltp/testscripts/open_posix_testsuite/.debug \ +" + +FILES_${PN}-staticdev += "/opt/ltp/lib/libmem.a" + +FILES_${PN} += "/opt/ltp/* /opt/ltp/runtest/* /opt/ltp/scenario_groups/* /opt/ltp/testcases/bin/* /opt/ltp/testcases/bin/*/bin/* /opt/ltp/testscripts/* /opt/ltp/testcases/open_posix_testsuite/* /opt/ltp/testcases/open_posix_testsuite/conformance/* /opt/ltp/testcases/open_posix_testsuite/Documentation/* /opt/ltp/testcases/open_posix_testsuite/functional/* /opt/ltp/testcases/open_posix_testsuite/include/* /opt/ltp/testcases/open_posix_testsuite/scripts/* /opt/ltp/testcases/open_posix_testsuite/stress/* /opt/ltp/testcases/open_posix_testsuite/tools/*" + +# Avoid generated binaries stripping. Otherwise some of the ltp tests such as ldd01 & nm01 fails +INHIBIT_PACKAGE_STRIP = "1" -- cgit 1.2.3-korg