- updated to 5.5[.0]

- adjusted x32 patch to apply (still no proper x32 support)

diff --git a/kernel-tools.spec b/kernel-tools.spec
index f289f0b592db7f5fa6df5b8533f5d809447c7ff4..ff4bce04a626b6b26cab4494cddd9461762e02c1 100644 (file)
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -17,8 +17,8 @@
 %undefine      with_multilib
 %endif
 
 %undefine      with_multilib
 %endif
 

-%define                basever         5.4
-%define                postver         .2
+%define                basever         5.5
+%define                postver         .0

 Summary:       Assortment of tools for the Linux kernel
 Summary(pl.UTF-8):     Zestaw narzędzi dla jądra Linuksa
 Name:          kernel-tools
 Summary:       Assortment of tools for the Linux kernel
 Summary(pl.UTF-8):     Zestaw narzędzi dla jądra Linuksa
 Name:          kernel-tools


@@ -27,7 +27,7 @@ Release:      1
 License:       GPL v2
 Group:         Applications/System
 Source0:       https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
 License:       GPL v2
 Group:         Applications/System
 Source0:       https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz

-# Source0-md5: ce9b2d974d27408a61c53a30d3f98fb9
+# Source0-md5: 0a78b1dc48dc032fe505b170c1b92339

 Source1:       cpupower.service
 Source2:       cpupower.config
 %if "%{postver}" != ".0"
 Source1:       cpupower.service
 Source2:       cpupower.config
 %if "%{postver}" != ".0"

diff --git a/x32.patch b/x32.patch
index 78f1cacd9ed81e184c3414c5b2f8e9cc0a04f9b4..b01ac4b538e8be16659ec22ef1d9aaeccffba02c 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -30,12 +30,12 @@ FIXME: regs_load.S need complete x32 ABI support; now it will just compile, but
  endif
  
  ifeq ($(ARCH),arm)
  endif
  
  ifeq ($(ARCH),arm)

---- linux-3.19/tools/perf/arch/x86/tests/regs_load.S~  2015-02-09 03:54:22.000000000 +0100
-+++ linux-3.19/tools/perf/arch/x86/tests/regs_load.S   2015-04-11 12:21:07.717912384 +0200
-@@ -62,14 +62,20 @@
- ENDPROC(perf_regs_load)
+--- linux-5.5/tools/perf/arch/x86/tests/regs_load.S.orig       2020-01-27 20:52:02.819752368 +0100
++++ linux-5.5/tools/perf/arch/x86/tests/regs_load.S    2020-01-27 20:56:05.908435444 +0100
+@@ -63,14 +63,20 @@
+ SYM_FUNC_END(perf_regs_load)

  #else
  #else

- ENTRY(perf_regs_load)
+ SYM_FUNC_START(perf_regs_load)

 -      push %edi
 +#ifdef HAVE_ARCH_X32_SUPPORT
 +#else
 -      push %edi
 +#ifdef HAVE_ARCH_X32_SUPPORT
 +#else