summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/ltp/Makefile17
-rw-r--r--package/ltp/patches/patch-runtest_mm8
-rw-r--r--package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify02_c10
-rw-r--r--package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c10
-rw-r--r--target/linux/config/Config.in.kernel48
5 files changed, 54 insertions, 39 deletions
diff --git a/package/ltp/Makefile b/package/ltp/Makefile
index 39584d9af..d234f4886 100644
--- a/package/ltp/Makefile
+++ b/package/ltp/Makefile
@@ -4,11 +4,14 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= ltp
-PKG_VERSION:= 20230929
+PKG_VERSION:= 20240129
PKG_RELEASE:= 1
PKG_DESCR:= linux test project
-PKG_HASH:= eb161ff8f1966a1f3428fd4561eb20ebb9f83b7519e35cc12fc66bcfa7983b6b
-PKG_DEPENDS:= bash mke2fs mkfs
+PKG_HASH:= c302f6b2ca09cbb7835f549777bdb9233fe31f7086d7ad8e65472a0804e3e025
+PKG_DEPENDS:= bash mke2fs mkfs shadow libtirpc
+PKG_BUILDDEP+= libtirpc
+PKG_KDEPENDS:= coredump bsd-process-acct ikconfig-proc
+PKG_KDEPENDS+= user-ns net-ns time-ns bpf-syscall blk-dev-loop watch-queue
PKG_NEEDS:= threads
PKG_SECTION:= base/tests
PKG_URL:= http://linux-test-project.github.io
@@ -34,14 +37,6 @@ CONFIGURE_ARGS+= --with-open-posix-testsuite \
pre-configure:
PATH="$(HOST_PATH)" $(MAKE) -C $(WRKBUILD) autotools
-# bessel float and mallopt not implemented in uClibc-ng
-pre-build:
- -rm ${WRKBUILD}/testcases/misc/math/float/float_bessel.c
- -rm -rf ${WRKBUILD}/testcases/misc/math/float/bessel
- -rm -rf ${WRKBUILD}/testcases/network/{rpc,nfs*}
- -rm -rf ${WRKBUILD}/testcases/kernel/syscalls/profil
- -rm -rf ${WRKBUILD}/testcases/kernel/syscalls/mallopt
-
ltp-install:
$(INSTALL_DIR) $(IDIR_LTP)/opt/ltp/tmp
$(CP) $(WRKINST)/usr/* $(IDIR_LTP)/opt/ltp
diff --git a/package/ltp/patches/patch-runtest_mm b/package/ltp/patches/patch-runtest_mm
deleted file mode 100644
index 39e829377..000000000
--- a/package/ltp/patches/patch-runtest_mm
+++ /dev/null
@@ -1,8 +0,0 @@
---- ltp-full-20220121.orig/runtest/mm 2022-01-21 20:33:16.000000000 +0100
-+++ ltp-full-20220121/runtest/mm 2022-02-23 14:13:22.672798426 +0100
-@@ -101,4 +101,4 @@ overcommit_memory06 overcommit_memory -R
-
- max_map_count max_map_count -i 10
-
--min_free_kbytes min_free_kbytes
-+#min_free_kbytes min_free_kbytes
diff --git a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify02_c b/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify02_c
deleted file mode 100644
index 5befae030..000000000
--- a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify02_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- ltp-full-20220121.orig/testcases/kernel/syscalls/fanotify/fanotify02.c 2022-01-21 20:33:16.000000000 +0100
-+++ ltp-full-20220121/testcases/kernel/syscalls/fanotify/fanotify02.c 2022-02-23 14:13:22.712797424 +0100
-@@ -13,6 +13,7 @@
- #define _GNU_SOURCE
- #include "config.h"
-
-+#define _GNU_SOURCE
- #include <stdio.h>
- #include <sys/stat.h>
- #include <sys/types.h>
diff --git a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c b/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c
deleted file mode 100644
index d67ac8024..000000000
--- a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- ltp-full-20220121.orig/testcases/kernel/syscalls/fanotify/fanotify04.c 2022-01-21 20:33:16.000000000 +0100
-+++ ltp-full-20220121/testcases/kernel/syscalls/fanotify/fanotify04.c 2022-02-23 14:13:22.724797124 +0100
-@@ -13,6 +13,7 @@
- #define _GNU_SOURCE
- #include "config.h"
-
-+#define _GNU_SOURCE
- #include <stdio.h>
- #include <sys/stat.h>
- #include <sys/types.h>
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index 9d7c5da36..3a650feaa 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -263,6 +263,54 @@ config ADK_LINUX_KERNEL_CC_OPTIMIZE_FOR_SIZE
!ADK_TARGET_ARCH_KVX
default y
+config ADK_LINUX_KERNEL_IKCONFIG
+ tristate
+
+config ADK_LINUX_KERNEL_IKCONFIG_PROC
+ bool "Enable access to .config through /proc/config.gz"
+ select ADK_LINUX_KERNEL_IKCONFIG
+ default n
+
+config ADK_LINUX_KERNEL_BSD_PROCESS_ACCT
+ bool "BSD Process Accounting"
+ default n
+
+config ADK_LINUX_KERNEL_NAMESPACES
+ bool
+ default n
+
+config ADK_LINUX_KERNEL_GENERIC_VDSO_TIME_NS
+ bool
+ default n
+
+config ADK_LINUX_KERNEL_USER_NS
+ bool "User namespace"
+ select ADK_LINUX_KERNEL_NAMESPACES
+ default n
+
+config ADK_LINUX_KERNEL_NET_NS
+ bool "Network namespace"
+ select ADK_LINUX_KERNEL_NAMESPACES
+ default n
+
+config ADK_LINUX_KERNEL_TIME_NS
+ bool "Network namespace"
+ select ADK_LINUX_KERNEL_NAMESPACES
+ select ADK_LINUX_KERNEL_GENERIC_VDSO_TIME_NS
+ default n
+
+config ADK_LINUX_KERNEL_BPF
+ bool
+ default n
+
+config ADK_LINUX_KERNEL_BPF_SYSCALL
+ bool "Enable bpf() syscall"
+ select ADK_LINUX_KERNEL_BPF
+ default n
+
+config ADK_LINUX_KERNEL_WATCH_QUEUE
+ bool "General notification queue"
+ default n
choice
prompt "Page size"