From 618b2ce5cadcbbffa106f1b0df61414ee05a5f04 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 9 Mar 2021 14:25:42 +0000 Subject: ltp: Fix libswapon issue properly Replace the libswapon reproducibility workaround with the solution preferred by upstream. (From OE-Core rev: 5fc7d4a4c428d5be7103d8e9345d23038dae4247) Signed-off-by: Richard Purdie --- meta/recipes-extended/ltp/ltp_20210121.bb | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'meta/recipes-extended/ltp/ltp_20210121.bb') diff --git a/meta/recipes-extended/ltp/ltp_20210121.bb b/meta/recipes-extended/ltp/ltp_20210121.bb index 5fe1a4f012..f58ca2eb2c 100644 --- a/meta/recipes-extended/ltp/ltp_20210121.bb +++ b/meta/recipes-extended/ltp/ltp_20210121.bb @@ -41,6 +41,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://determinism.patch \ file://0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch \ file://0002-Makefile-Avoid-wildcard-determinism-issues.patch \ + file://0003-syscalls-swapon-swapoff-Move-common-library-to-libs.patch \ " S = "${WORKDIR}/git" @@ -58,14 +59,6 @@ EXTRA_OECONF = " --with-realtime-testsuite --with-open-posix-testsuite " # ltp network/rpc test cases ftbfs when libtirpc is found EXTRA_OECONF += " --without-tirpc " -do_compile_prepend() { - # Reported at http://lists.linux.it/pipermail/ltp/2021-March/021274.html - # Avoid a race over construction of libswapon.o which is built by swapon and swapoff - # but the object differs depending upon which one built it - # ("../swapon/libswapon.c" vs "libswapon.c" references) - make -C ${B}/testcases/kernel/syscalls/swapon/ -} - do_install(){ install -d ${D}${prefix}/ oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install -- cgit v1.2.3-54-g00ecf