From e61a02e3e214ba503005cda46ee4d074655dfde5 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 9 Sep 2020 14:10:43 +0200
Subject: ltp: update to 20200515

---
 package/ltp/Makefile                               |  4 +-
 .../patch-testcases_kernel_syscalls_pkeys_pkey01_c | 35 --------------
 .../patch-testcases_kernel_syscalls_pkeys_pkey_h   | 53 ----------------------
 3 files changed, 2 insertions(+), 90 deletions(-)
 delete mode 100644 package/ltp/patches/patch-testcases_kernel_syscalls_pkeys_pkey01_c
 delete mode 100644 package/ltp/patches/patch-testcases_kernel_syscalls_pkeys_pkey_h

(limited to 'package')

diff --git a/package/ltp/Makefile b/package/ltp/Makefile
index f6c334012..dc515a23a 100644
--- a/package/ltp/Makefile
+++ b/package/ltp/Makefile
@@ -4,10 +4,10 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		ltp
-PKG_VERSION:=		20190930
+PKG_VERSION:=		20200515
 PKG_RELEASE:=		1
 PKG_DESCR:=		linux test project
-PKG_HASH:=		c7049590df2da3135030db5ef4c0076b76c789724a752b1102b4a01db0189f9a
+PKG_HASH:=		7ee3f36e7852814947dfd54f81c8d8810858d10667f01ca40eeac3b2a0548940
 PKG_DEPENDS:=		bash mke2fs mkfs
 PKG_NEEDS:=		threads
 PKG_SECTION:=		base/tests
diff --git a/package/ltp/patches/patch-testcases_kernel_syscalls_pkeys_pkey01_c b/package/ltp/patches/patch-testcases_kernel_syscalls_pkeys_pkey01_c
deleted file mode 100644
index 5f52235c1..000000000
--- a/package/ltp/patches/patch-testcases_kernel_syscalls_pkeys_pkey01_c
+++ /dev/null
@@ -1,35 +0,0 @@
---- ltp-full-20190930.orig/testcases/kernel/syscalls/pkeys/pkey01.c	2019-09-30 13:30:26.000000000 +0200
-+++ ltp-full-20190930/testcases/kernel/syscalls/pkeys/pkey01.c	2019-10-29 15:02:09.524423510 +0100
-@@ -157,12 +157,12 @@ static void pkey_test(struct tcase *tc,
- 
- 	buffer = SAFE_MMAP(NULL, size, mpa->prot, mpa->flags, fd, 0);
- 
--	pkey = pkey_alloc(tc->flags, tc->access_rights);
-+	pkey = ltp_pkey_alloc(tc->flags, tc->access_rights);
- 	if (pkey == -1)
- 		tst_brk(TBROK | TERRNO, "pkey_alloc failed");
- 
- 	tst_res(TINFO, "Set %s on (%s) buffer", tc->name, flag_to_str(mpa->flags));
--	if (pkey_mprotect(buffer, size, mpa->prot, pkey) == -1)
-+	if (ltp_pkey_mprotect(buffer, size, mpa->prot, pkey) == -1)
- 		tst_brk(TBROK | TERRNO, "pkey_mprotect failed");
- 
- 	pid = SAFE_FORK();
-@@ -189,7 +189,7 @@ static void pkey_test(struct tcase *tc,
-                 tst_res(TFAIL, "Child: %s", tst_strstatus(status));
- 
- 	tst_res(TINFO, "Remove %s from the buffer", tc->name);
--	if (pkey_mprotect(buffer, size, mpa->prot, 0x0) == -1)
-+	if (ltp_pkey_mprotect(buffer, size, mpa->prot, 0x0) == -1)
- 		tst_brk(TBROK | TERRNO, "pkey_mprotect failed");
- 
- 	switch (mpa->prot) {
-@@ -211,7 +211,7 @@ static void pkey_test(struct tcase *tc,
- 
- 	SAFE_MUNMAP(buffer, size);
- 
--	if (pkey_free(pkey) == -1)
-+	if (ltp_pkey_free(pkey) == -1)
- 		tst_brk(TBROK | TERRNO, "pkey_free failed");
- }
- 
diff --git a/package/ltp/patches/patch-testcases_kernel_syscalls_pkeys_pkey_h b/package/ltp/patches/patch-testcases_kernel_syscalls_pkeys_pkey_h
deleted file mode 100644
index 219cd3699..000000000
--- a/package/ltp/patches/patch-testcases_kernel_syscalls_pkeys_pkey_h
+++ /dev/null
@@ -1,53 +0,0 @@
---- ltp-full-20190930.orig/testcases/kernel/syscalls/pkeys/pkey.h	2019-09-30 13:30:26.000000000 +0200
-+++ ltp-full-20190930/testcases/kernel/syscalls/pkeys/pkey.h	2019-10-29 15:02:09.524423510 +0100
-@@ -1,6 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- /*
-  * Copyright (c) 2019 Red Hat, Inc.
-+ * Copyright (c) Linux Test Project, 2019
-  */
- 
- #ifndef PKEYS_H
-@@ -15,25 +16,29 @@
- #endif
- 
- #ifndef HAVE_PKEY_MPROTECT
--static inline int pkey_mprotect(void *addr, size_t len, int prot, int pkey)
-+inline int ltp_pkey_mprotect(void *addr, size_t len, int prot, int pkey)
- {
- 	return tst_syscall(__NR_pkey_mprotect, addr, len, prot, pkey);
- }
- 
--static inline int pkey_alloc(unsigned int flags, unsigned int access_rights)
-+inline int ltp_pkey_alloc(unsigned int flags, unsigned int access_rights)
- {
- 	return tst_syscall(__NR_pkey_alloc, flags, access_rights);
- }
- 
--static inline int pkey_free(int pkey)
-+inline int ltp_pkey_free(int pkey)
- {
- 	return tst_syscall(__NR_pkey_free, pkey);
- }
-+#else
-+#define ltp_pkey_alloc pkey_alloc
-+#define ltp_pkey_free pkey_free
-+#define ltp_pkey_mprotect pkey_mprotect
- #endif /* HAVE_PKEY_MPROTECT */
- 
- static inline void check_pkey_support(void)
- {
--	int pkey = pkey_alloc(0, 0);
-+	int pkey = ltp_pkey_alloc(0, 0);
- 
- 	if (pkey == -1) {
- 		if (errno == ENOSYS)
-@@ -44,7 +49,7 @@ static inline void check_pkey_support(vo
- 			tst_brk(TCONF, "pkeys are not available for test");
- 	}
- 
--	pkey_free(pkey);
-+	ltp_pkey_free(pkey);
- }
- 
- #endif /* PKEYS_H */
-- 
cgit v1.2.3