- renamed to "kernel", updated to 5.4.188

diff --git a/kernel-vanilla-x86.config b/kernel-x86.config
similarity index 99%
rename from kernel-vanilla-x86.config
rename to kernel-x86.config
index 194cc882c4d8157023c373796c323eda7872fd37..c1ed6b5739954eb8770d26980239ce309eb717a3 100644 (file)
--- a/kernel-vanilla-x86.config
+++ b/kernel-x86.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.130-5.4-vanilla Kernel Configuration
+# Linux/x86 5.4.188-5.4 Kernel Configuration
 #
 
 #
@@ -217,6 +217,7 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_BPF_SYSCALL=y
 # CONFIG_BPF_JIT_ALWAYS_ON is not set
+# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
 CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_RSEQ=y
@@ -7118,7 +7119,7 @@ CONFIG_I2C_HID=m
 
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
+CONFIG_USB_COMMON=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_ULPI_BUS=m
 CONFIG_USB_CONN_GPIO=m

diff --git a/kernel-vanilla-x86_64.config b/kernel-x86_64.config
similarity index 99%
rename from kernel-vanilla-x86_64.config
rename to kernel-x86_64.config
index b19b1d5773dc7e21aa03092ce2aa7cbde37bb1e6..aac77d40cacd9873e98d14777ee45ac1ab509fab 100644 (file)
--- a/kernel-vanilla-x86_64.config
+++ b/kernel-x86_64.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.130-5.4-vanilla Kernel Configuration
+# Linux/x86 5.4.188-5.4 Kernel Configuration
 #
 
 #
@@ -225,6 +225,7 @@ CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
 CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
+# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
 CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_RSEQ=y
@@ -6983,7 +6984,7 @@ CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m
 
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
+CONFIG_USB_COMMON=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_ULPI_BUS=m
 CONFIG_USB_CONN_GPIO=m

diff --git a/kernel-vanilla.spec b/kernel.spec
similarity index 97%
rename from kernel-vanilla.spec
rename to kernel.spec
index fe10c1a0b3127954e21e462325ab130994043ddc..22e529fa9ffaa8c5272ac9432d564dd59d0c7650 100644 (file)
--- a/kernel-vanilla.spec
+++ b/kernel.spec
@@ -4,10 +4,10 @@
 %bcond_with    verbose         # verbose build (V=1)
 
 %define                basever         5.4
-%define                postver         170
+%define                postver         188
 %define                rel             1
 
-%define                alt_kernel      5.4-vanilla
+%define                alt_kernel      5.4
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}
@@ -30,14 +30,14 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
 # Source0-md5: ce9b2d974d27408a61c53a30d3f98fb9
 %if "%{postver}" != "0"
 Source1:       http://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Source1-md5: 230d4175a0f4c81305c8da71a8674eda
+# Source1-md5: e77a1b24fd5b319c02114bb2abc3505c
 %endif
 
 Source2:       kernel-module-build.pl
 Source3:       kernel.make
 
-Source10:      kernel-vanilla-x86.config
-Source11:      kernel-vanilla-x86_64.config
+Source10:      kernel-x86.config
+Source11:      kernel-x86_64.config
 
 URL:           http://www.kernel.org/
 BuildRequires: binutils >= 3:2.18
@@ -65,28 +65,13 @@ Requires:   kmod >= 12-2
 %ifarch i686
 Requires:      cpuinfo(pae)
 %endif
-Suggests:      crda
 Suggests:      keyutils
 Suggests:      linux-firmware
 Provides:      %{name}(netfilter) = 20070806
 Provides:      %{name}(vermagic) = %{kernel_release}
-Obsoletes:     kernel%{_alt_kernel}-char-lirc-ene0100
-Obsoletes:     kernel%{_alt_kernel}-char-lirc-it87
-Obsoletes:     kernel%{_alt_kernel}-char-lirc-ite8709
-Obsoletes:     kernel%{_alt_kernel}-char-lirc-mceusb
-Obsoletes:     kernel%{_alt_kernel}-char-lirc-streamzap
-Obsoletes:     kernel%{_alt_kernel}-isdn-mISDN
+Obsoletes:     kernel%{_alt_kernel}-vanilla
 Obsoletes:     kernel-firmware
-Obsoletes:     kernel-misc-acer_acpi
-Obsoletes:     kernel-misc-fuse
-Obsoletes:     kernel-misc-uvc
 Obsoletes:     kernel-modules
-Obsoletes:     kernel-net-ar81
-Obsoletes:     kernel-net-hostap
-Obsoletes:     kernel-net-ieee80211
-Obsoletes:     kernel-net-ipp2p
-Obsoletes:     kernel-net-rt61
-Obsoletes:     kernel-smp
 Conflicts:     e2fsprogs < 1.29
 Conflicts:     isdn4k-utils < 3.1pre1
 Conflicts:     jfsutils < 1.1.3