summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-04-28 00:37:45 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-09 10:47:51 +0100
commit8af23ef768a4942e39778c63e6827145942fad70 (patch)
tree0ba99da6389bce46898d95757a40e24d396cd58e
parent668aba5a363bf382b20cc069278c0b7a17268612 (diff)
downloadpoky-8af23ef768a4942e39778c63e6827145942fad70.tar.gz
ltp: Fix build after removing rpc and libnsl in glibc
(From OE-Core rev: 269d285f57886df8985cb730a11561c74d642ff8) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-Disable-rpc01-on-glibc-and-musl.patch29
-rw-r--r--meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch14
-rw-r--r--meta/recipes-extended/ltp/ltp_20180118.bb1
3 files changed, 30 insertions, 14 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-Disable-rpc01-on-glibc-and-musl.patch b/meta/recipes-extended/ltp/ltp/0001-Disable-rpc01-on-glibc-and-musl.patch
new file mode 100644
index 0000000000..78c6dfb2b1
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-Disable-rpc01-on-glibc-and-musl.patch
@@ -0,0 +1,29 @@
1From ff39e6b69f0b26dad8ab685ee6116ff92bc363db Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 28 Apr 2018 00:08:55 -0700
4Subject: [PATCH] Disable rpc01 on glibc and musl
5
6It is not buildable with libtirpc
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10Upstream-Status: Pending
11
12 testcases/network/rpc/basic_tests/Makefile | 3 +++
13 1 file changed, 3 insertions(+)
14
15diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile
16index 66e9d5675..16a64e7da 100644
17--- a/testcases/network/rpc/basic_tests/Makefile
18+++ b/testcases/network/rpc/basic_tests/Makefile
19@@ -23,4 +23,7 @@
20 top_srcdir ?= ../../../..
21
22 include $(top_srcdir)/include/mk/env_pre.mk
23+
24+FILTER_OUT_DIRS += rpc01
25+
26 include $(top_srcdir)/include/mk/generic_trunk_target.mk
27--
282.17.0
29
diff --git a/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch
index 84ab37ea39..0781ba1743 100644
--- a/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch
+++ b/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch
@@ -102,20 +102,6 @@ Index: git/testcases/network/nfsv4/acl/Makefile
102+endif 102+endif
103+ 103+
104 include $(top_srcdir)/include/mk/generic_leaf_target.mk 104 include $(top_srcdir)/include/mk/generic_leaf_target.mk
105Index: git/testcases/network/rpc/basic_tests/Makefile
106===================================================================
107--- git.orig/testcases/network/rpc/basic_tests/Makefile
108+++ git/testcases/network/rpc/basic_tests/Makefile
109@@ -23,4 +23,9 @@
110 top_srcdir ?= ../../../..
111
112 include $(top_srcdir)/include/mk/env_pre.mk
113+
114+ifeq ($(LIBC),musl)
115+FILTER_OUT_DIRS += rpc01
116+endif
117+
118 include $(top_srcdir)/include/mk/generic_trunk_target.mk
119Index: git/testcases/realtime/func/pi-tests/Makefile 105Index: git/testcases/realtime/func/pi-tests/Makefile
120=================================================================== 106===================================================================
121--- git.orig/testcases/realtime/func/pi-tests/Makefile 107--- git.orig/testcases/realtime/func/pi-tests/Makefile
diff --git a/meta/recipes-extended/ltp/ltp_20180118.bb b/meta/recipes-extended/ltp/ltp_20180118.bb
index 14fb41b3bd..8992f1b0f2 100644
--- a/meta/recipes-extended/ltp/ltp_20180118.bb
+++ b/meta/recipes-extended/ltp/ltp_20180118.bb
@@ -45,6 +45,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
45 file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ 45 file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
46 file://0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch \ 46 file://0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch \
47 file://0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch \ 47 file://0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch \
48 file://0001-Disable-rpc01-on-glibc-and-musl.patch \
48 " 49 "
49 50
50S = "${WORKDIR}/git" 51S = "${WORKDIR}/git"