From: Denys Dmytriyenko <[email protected]> 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
Sync up with oe-core on DEPENDS/RDEPENDS/SKIP_* Disable TI RPC (Transport-Independent RPC) due to missing dependency Signed-off-by: Denys Dmytriyenko <[email protected]> --- v2 - disable TI RPC dependency .../0003-Add-knob-to-control-tirpc-support.patch | 45 ++++++++++++++++++ .../{ltp-ddt_20170116.bb => ltp-ddt_20170929.bb} | 54 ++++++++++++++++------ 2 files changed, 85 insertions(+), 14 deletions(-) create mode 100644 meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt/0003-Add-knob-to-control-tirpc-support.patch rename meta-arago-extras/recipes-devtools/ltp-ddt/{ltp-ddt_20170116.bb => ltp-ddt_20170929.bb} (55%) diff --git a/meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt/0003-Add-knob-to-control-tirpc-support.patch b/meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt/0003-Add-knob-to-control-tirpc-support.patch new file mode 100644 index 0000000..bf1176f --- /dev/null +++ b/meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt/0003-Add-knob-to-control-tirpc-support.patch @@ -0,0 +1,45 @@ +From b193011da301b3d944e8fddcf4817513c31c5b88 Mon Sep 17 00:00:00 2001 +From: Fathi Boudra <[email protected]> +Date: Thu, 7 Jan 2016 17:36:19 +0000 +Subject: [PATCH 03/32] Add knob to control tirpc support + +allow to disable tirpc. Helps to disable it at top level for eg. musl it +does not yet work. + +Signed-off-by: Fathi Boudra <[email protected]> +Signed-off-by: Khem Raj <[email protected]> +--- + configure.ac | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/configure.ac b/configure.ac +index cc50397..9e2936b 100644 +--- 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 +@@ -169,7 +176,9 @@ LTP_CHECK_RENAMEAT2 + 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 +-- +2.7.0 + diff --git a/meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt_20170116.bb b/meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt_20170929.bb similarity index 55% rename from meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt_20170116.bb rename to meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt_20170929.bb index 245645d..6bf701b 100644 --- a/meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt_20170116.bb +++ b/meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt_20170929.bb @@ -4,25 +4,53 @@ SECTION = "console/utils" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -PR = "r29" +PR = "r0" PV_append = "+git${SRCPV}" PROVIDES += "ltp" -DEPENDS += "zip-native alsa-lib libaio" +DEPENDS = "alsa-lib attr libaio libcap acl openssl zip-native" -RDEPENDS_${PN} += "pm-qa serialcheck gawk perl python3-core" +RDEPENDS_${PN} = "\ + acl \ + at \ + attr \ + bash \ + cpio \ + cronie \ + curl \ + e2fsprogs-mke2fs \ + expect \ + gawk \ + gzip \ + iproute2 \ + ldd \ + libaio \ + logrotate \ + perl \ + pm-qa \ + python-core \ + serialcheck \ + unzip \ + util-linux \ + which \ +" inherit autotools-brokensep -SRCREV = "ea64df36bc1f411bdcd20bf4057206f9e0cb7e52" +SRCREV = "feec63612a16bb48cd1da698ca794d25ff03bedc" 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://0003-Add-knob-to-control-tirpc-support.patch \ +" S = "${WORKDIR}/git" LTPROOT = "/opt/ltp" +# disable TI RPC (Transport-Independent RPC) due to missing dependency +EXTRA_OECONF += " --without-tirpc" + EXTRA_OEMAKE_append = " \ prefix=${LTPROOT} \ CROSS_COMPILE=${HOST_PREFIX} \ @@ -50,17 +78,15 @@ FILES_${PN}-dbg += " \ ${LTPROOT}/testcases/realtime/*/*/.debug \ " -FILES_${PN}-staticdev += "${LTPROOT}/lib" +FILES_${PN}-staticdev += "${LTPROOT}/lib ${LTPROOT}/lib/libmem.a ${LTPROOT}/testcases/data/nm01/lib.a" FILES_${PN} += "${LTPROOT}/*" -# 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() { oe_runmake install } + +# Avoid file dependency scans, as LTP checks for things that may or may not +# exist on the running system. For instance it has specific checks for +# csh and ksh which are not typically part of OpenEmbedded systems (but +# can be added via additional layers.) +SKIP_FILEDEPS_${PN} = '1' -- 2.7.4 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
