ltp: upgrade 20240129 -> 20240524

ChangeLog:
https://github.com/linux-test-project/ltp/releases/tag/20240524

Drop backport patches.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

4 files changed, 4 insertions, 97 deletions

diff --git a/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch b/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
index cc98079651..5b6c780bec 100644
--- a/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
+++ b/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
@@ -1,4 +1,4 @@
-From e87c2ad1e16cdbd62ba71b2ace3270503decaa56 Mon Sep 17 00:00:00 2001
+From 768159aa53257d247645a12518778f50b8fdf578 Mon Sep 17 00:00:00 2001
 From: "Mingde (Matthew) Zeng" <matthewzmd@gmail.com>
 Date: Wed, 29 Jul 2020 08:47:09 -0400
 Subject: [PATCH] Remove OOM tests from runtest/mm
@@ -14,10 +14,10 @@ Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
  1 file changed, 6 deletions(-)
 
 diff --git a/runtest/mm b/runtest/mm
-index d859b331c..3c2962f44 100644
+index 6a8cd0b9d..8ce3f4416 100644
 --- a/runtest/mm
 +++ b/runtest/mm
-@@ -74,12 +74,6 @@ ksm07 ksm07
+@@ -76,12 +76,6 @@ ksm07 ksm07
  
  cpuset01 cpuset01
  
@@ -30,6 +30,3 @@ index d859b331c..3c2962f44 100644
  swapping01 swapping01 -i 5
  
  thp01 thp01 -I 120
--- 
-2.43.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0001-scenario_groups-default-remove-connectors.patch b/meta/recipes-extended/ltp/ltp/0001-scenario_groups-default-remove-connectors.patch
deleted file mode 100644
index 4a50d1ae38..0000000000
--- a/meta/recipes-extended/ltp/ltp/0001-scenario_groups-default-remove-connectors.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 14c710cae38aa96bd8d681e891b6a1d691f99988 Mon Sep 17 00:00:00 2001
-From: Xiangyu Chen <xiangyu.chen@windriver.com>
-Date: Thu, 14 Mar 2024 09:47:10 +0800
-Subject: [PATCH] scenario_groups/default: remove connectors
-
-runtest/connectors was removed in 9b642d89c, thus update scenario_groups/default.
-
-Fixes: 9b642d89c ("runtest: Merge runtest/connectors to kernel_misc")
-Closes: https://github.com/linux-test-project/ltp/pull/1144
-
-Upstream-Status: Backport from
-[https://github.com/linux-test-project/ltp/commit/14c710ca]
-
-Reviewed-by: Petr Vorel <pvorel@suse.cz>
-Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
----
- scenario_groups/default | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/scenario_groups/default b/scenario_groups/default
-index f17b2061a..ec77d8fb8 100644
---- a/scenario_groups/default
-+++ b/scenario_groups/default
-@@ -16,7 +16,6 @@ controllers
- filecaps
- cap_bounds
- fcntl-locktests
--connectors
- power_management_tests
- hugetlb
- commands
--- 
-2.34.1
-
diff --git a/meta/recipes-extended/ltp/ltp/0001-sched_stress-Use-time_t-instead-of-long-for-type.patch b/meta/recipes-extended/ltp/ltp/0001-sched_stress-Use-time_t-instead-of-long-for-type.patch
deleted file mode 100644
index ae8dc8706e..0000000000
--- a/meta/recipes-extended/ltp/ltp/0001-sched_stress-Use-time_t-instead-of-long-for-type.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 74074f9a71c876d6e95c2d72702888dd2fabc761 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 6 May 2024 11:43:20 -0700
-Subject: [PATCH] sched_stress: Use time_t instead of long for type
-
-This ensures it works across different architectures
-Fixes
-
-| sched_driver.c:744:43: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types]
-|   744 |         printf("\nend time = %s\n", ctime(&end_time));
-|       |                                           ^~~~~~~~~
-
-With gcc-14
-
-Upstream-Status: Backport [https://github.com/linux-test-project/ltp/commit/0a682f1af42d8d261202821be580fe26d17ee9b7]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/sched/sched_stress/sched_driver.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/testcases/kernel/sched/sched_stress/sched_driver.c b/testcases/kernel/sched/sched_stress/sched_driver.c
-index 61573d788..5b8c187fe 100644
---- a/testcases/kernel/sched/sched_stress/sched_driver.c
-+++ b/testcases/kernel/sched/sched_stress/sched_driver.c
-@@ -136,7 +136,7 @@ int debug = 0;
- /*
-  * Function prototypes
-  */
--void startup(long);
-+void startup(time_t);
- int start_testcase(char *, char *, char *, char *, char *, char *);
- int process_slots_in_use();
- int available_user_process_slots();
-@@ -251,7 +251,7 @@ int main(int argc, char **argv)
-  * information to the screen and .  It also initializes the	 *
-  * process id list and other global variables.	 			 *
-  *-----------------------------------------------------------------------*/
--void startup(long start_time)
-+void startup(time_t start_time)
- {
- 	char tempbuffer[50];	/* temporary buffer to hold names */
- 
-@@ -734,7 +734,7 @@ void kill_short_term_testcases()
- void finishup(start_time)
- long start_time;		/* starting time to calculate elapsed time */
- {
--	long end_time;		/* time when program finished */
-+	time_t end_time;		/* time when program finished */
- 
- 	/*
- 	 * Get the end time and calculate elapsed time; write all this out
--- 
-2.45.0
-
diff --git a/meta/recipes-extended/ltp/ltp_20240129.bb b/meta/recipes-extended/ltp/ltp_20240524.bb
index f8e6d3987e..1aafed0bf5 100644
--- a/meta/recipes-extended/ltp/ltp_20240129.bb
+++ b/meta/recipes-extended/ltp/ltp_20240524.bb
@@ -24,12 +24,10 @@ TUNE_CCARGS:remove:x86-64 = "-mfpmath=sse"
 
 CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__"
 CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
-SRCREV = "68737d20556d37364c95776044b1119c0912a36a"
+SRCREV = "8f21ebba42216dbb7e8d44c23b4a977d6823f7a1"
 
 SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \
            file://0001-Remove-OOM-tests-from-runtest-mm.patch \
-           file://0001-scenario_groups-default-remove-connectors.patch \
-           file://0001-sched_stress-Use-time_t-instead-of-long-for-type.patch \
            "
 
 S = "${WORKDIR}/git"