- renamed to "kernel", updated to 5.10.109

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 6919da69369f33eae6fa0f40da3c2fd0ad809b8f..94cc6dba793db2f575c45ebe4ed1dee5cf1df4a0 100644 (file)
--- a/kernel-vanilla-x86.config
+++ b/kernel-x86.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.48-5.10-vanilla Kernel Configuration
+# Linux/x86 5.10.109-5.10 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (TLD-Linux) 10.2.0 20201208 (release)"
 CONFIG_CC_IS_GCC=y
@@ -232,10 +232,10 @@ CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_BPF_LSM=y
 CONFIG_BPF_SYSCALL=y
 # CONFIG_BPF_JIT_ALWAYS_ON is not set
+# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
 CONFIG_USERMODE_DRIVER=y
 CONFIG_BPF_PRELOAD=y
 CONFIG_BPF_PRELOAD_UMD=m
-CONFIG_BPF_UNPRIV_DEFAULT_OFF=n
 CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_KCMP=y
@@ -2311,7 +2311,6 @@ CONFIG_RFD_FTL=m
 CONFIG_SSFDC=m
 CONFIG_SM_FTL=m
 CONFIG_MTD_OOPS=m
-CONFIG_MTD_PSTORE=m
 CONFIG_MTD_SWAP=m
 CONFIG_MTD_PARTITIONED_MASTER=y
 
@@ -7009,6 +7008,7 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
 CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
@@ -7403,7 +7403,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
@@ -9280,7 +9280,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-CONFIG_RESET_BRCMSTB_RESCAL=y
 CONFIG_RESET_INTEL_GW=y
 CONFIG_RESET_TI_SYSCON=m
 
@@ -9681,13 +9680,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_PMSG=y
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
-CONFIG_PSTORE_BLK_PMSG_SIZE=64
-CONFIG_PSTORE_BLK_CONSOLE_SIZE=64
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set

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 8b70c9e2d31c9d9ecf19fec7c6fd10231c98b8f8..a919db0636a766b367971a8778fd41ef39f5e252 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.10.48-5.10-vanilla Kernel Configuration
+# Linux/x86 5.10.109-5.10 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (TLD-Linux) 10.2.0 20201208 (release)"
 CONFIG_CC_IS_GCC=y
@@ -246,10 +246,10 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
+# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
 CONFIG_USERMODE_DRIVER=y
 CONFIG_BPF_PRELOAD=y
 CONFIG_BPF_PRELOAD_UMD=m
-CONFIG_BPF_UNPRIV_DEFAULT_OFF=n
 CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_KCMP=y
@@ -2329,7 +2329,6 @@ CONFIG_RFD_FTL=m
 CONFIG_SSFDC=m
 CONFIG_SM_FTL=m
 CONFIG_MTD_OOPS=m
-CONFIG_MTD_PSTORE=m
 CONFIG_MTD_SWAP=m
 CONFIG_MTD_PARTITIONED_MASTER=y
 
@@ -6916,6 +6915,7 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
 CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
@@ -7274,7 +7274,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
@@ -9182,7 +9182,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-CONFIG_RESET_BRCMSTB_RESCAL=y
 CONFIG_RESET_INTEL_GW=y
 CONFIG_RESET_TI_SYSCON=m
 
@@ -9597,13 +9596,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_PMSG=y
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
-CONFIG_PSTORE_BLK_PMSG_SIZE=64
-CONFIG_PSTORE_BLK_CONSOLE_SIZE=64
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set

diff --git a/kernel-vanilla.spec b/kernel.spec
similarity index 97%
rename from kernel-vanilla.spec
rename to kernel.spec
index 72e449b6d3e9548189ceea9f2d3686be8c35ed75..bb18dad271b6e395aa8408d657b0067753df2514 100644 (file)
--- a/kernel-vanilla.spec
+++ b/kernel.spec
@@ -4,10 +4,10 @@
 %bcond_with    verbose         # verbose build (V=1)
 
 %define                basever         5.10
-%define                postver         90
+%define                postver         109
 %define                rel             1
 
-%define                alt_kernel      5.10-vanilla
+%define                alt_kernel      5.10
 
 # 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: 753adc474bf799d569dec4f165ed92c3
 %if "%{postver}" != "0"
 Source1:       http://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Source1-md5: fc596166049d8f5dba41b8c9d737f4c1
+# Source1-md5: eb1e3841c0ce05b8630754bcbddb8f74
 %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