[packages/kernel-tools] - updated to 5.12.1 - updated x32 patch

qboosh qboosh at pld-linux.org
Sat May 8 15:28:44 CEST 2021


commit 884ec151a8bf959fd8ddd9eb363b60cd942c18bf
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat May 8 15:30:50 2021 +0200

    - updated to 5.12.1
    - updated x32 patch

 kernel-tools.spec | 10 +++++-----
 x32.patch         | 49 -------------------------------------------------
 2 files changed, 5 insertions(+), 54 deletions(-)
---
diff --git a/kernel-tools.spec b/kernel-tools.spec
index f37c906..2da2c50 100644
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -19,22 +19,22 @@
 %undefine	with_multilib
 %endif
 
-%define		basever		5.11
-%define		postver		.0
+%define		basever		5.12
+%define		postver		.1
 Summary:	Assortment of tools for the Linux kernel
 Summary(pl.UTF-8):	Zestaw narzędzi dla jądra Linuksa
 Name:		kernel-tools
 Version:	%{basever}%{postver}
-Release:	3
+Release:	1
 License:	GPL v2
 Group:		Applications/System
 Source0:	https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
-# Source0-md5:	d2985a3f16ef1ea3405c04c406e29dcc
+# Source0-md5:	8c7420990de85f6754db287337da08b4
 Source1:	cpupower.service
 Source2:	cpupower.config
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:	33c2cbab3e136939c065e397879a8087
+# Patch0-md5:	d8273731ed72ed885ab815d3805ecd67
 %endif
 Patch1:		x32.patch
 Patch2:		regex.patch
diff --git a/x32.patch b/x32.patch
index 168698c..1668e7f 100644
--- a/x32.patch
+++ b/x32.patch
@@ -83,55 +83,6 @@ FIXME: verify x32 ABI support in regs_load.S
  
  /*
   * We need to provide note.GNU-stack section, saying that we want
---- linux-3.19/tools/perf/bench/sched-messaging.c~	2015-02-09 03:54:22.000000000 +0100
-+++ linux-3.19/tools/perf/bench/sched-messaging.c	2015-04-11 12:33:22.587917365 +0200
-@@ -310,13 +310,13 @@
- 		printf("# %d groups == %d %s run\n\n",
- 		       num_groups, num_groups * 2 * num_fds,
- 		       thread_mode ? "threads" : "processes");
--		printf(" %14s: %lu.%03lu [sec]\n", "Total time",
--		       diff.tv_sec,
--		       (unsigned long) (diff.tv_usec / USEC_PER_MSEC));
-+		printf(" %14s: %llu.%03llu [sec]\n", "Total time",
-+		       (unsigned long long) diff.tv_sec,
-+		       (unsigned long long) (diff.tv_usec / USEC_PER_MSEC));
- 		break;
- 	case BENCH_FORMAT_SIMPLE:
--		printf("%lu.%03lu\n", diff.tv_sec,
--		       (unsigned long) (diff.tv_usec / USEC_PER_MSEC));
-+		printf("%llu.%03llu\n", (unsigned long long) diff.tv_sec,
-+		       (unsigned long long) (diff.tv_usec / USEC_PER_MSEC));
- 		break;
- 	default:
- 		/* reaching here is something disaster */
---- linux-5.11/tools/perf/bench/sched-pipe.c.orig	2021-02-14 23:32:24.000000000 +0100
-+++ linux-5.11/tools/perf/bench/sched-pipe.c	2021-02-25 20:38:57.380710973 +0100
-@@ -155,9 +155,9 @@
- 		result_usec = diff.tv_sec * USEC_PER_SEC;
- 		result_usec += diff.tv_usec;
- 
--		printf(" %14s: %lu.%03lu [sec]\n\n", "Total time",
--		       diff.tv_sec,
--		       (unsigned long) (diff.tv_usec / USEC_PER_MSEC));
-+		printf(" %14s: %llu.%03llu [sec]\n\n", "Total time",
-+		       (unsigned long long) diff.tv_sec,
-+		       (unsigned long long) (diff.tv_usec / USEC_PER_MSEC));
- 
- 		printf(" %14lf usecs/op\n",
- 		       (double)result_usec / (double)loops);
-@@ -167,9 +167,9 @@
- 		break;
- 
- 	case BENCH_FORMAT_SIMPLE:
--		printf("%lu.%03lu\n",
--		       diff.tv_sec,
--		       (unsigned long) (diff.tv_usec / USEC_PER_MSEC));
-+		printf("%llu.%03llu\n",
-+		       (unsigned long long) diff.tv_sec,
-+		       (unsigned long long) (diff.tv_usec / USEC_PER_MSEC));
- 		break;
- 
- 	default:
 --- linux-3.19/tools/perf/builtin-kvm.c~	2015-02-09 03:54:22.000000000 +0100
 +++ linux-3.19/tools/perf/builtin-kvm.c	2015-04-11 12:36:00.511251770 +0200
 @@ -565,7 +565,7 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel-tools.git/commitdiff/884ec151a8bf959fd8ddd9eb363b60cd942c18bf



More information about the pld-cvs-commit mailing list