- renamed to "kernel", updated to 4.19.237

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 c5aae95785fcde36165133129164c1925709a2a0..e9cac1101154ec08f45b670b853cd3840de89a10 100644 (file)
--- a/kernel-vanilla-x86.config
+++ b/kernel-x86.config
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.137-4.19-vanilla Kernel Configuration
+# Linux/x86 4.19.237-4.19 Kernel Configuration
 #
 
 #
-# Compiler: gcc (TLD-Linux) 9.3.0 20200408 (release)
+# Compiler: gcc (TLD-Linux) 10.2.0 20201208 (release)
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
+CONFIG_GCC_VERSION=100200
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
@@ -200,6 +200,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
@@ -880,6 +881,7 @@ CONFIG_STRICT_MODULE_RWX=y
 CONFIG_ARCH_HAS_REFCOUNT=y
 # CONFIG_REFCOUNT_FULL is not set
 CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
+CONFIG_ARCH_USE_MEMREMAP_PROT=y
 
 #
 # GCOV-based kernel profiling
@@ -1067,6 +1069,7 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 CONFIG_TLS=m
 CONFIG_TLS_DEVICE=y
@@ -4523,6 +4526,7 @@ CONFIG_SPI_TLE62X0=m
 CONFIG_SPI_SLAVE=y
 CONFIG_SPI_SLAVE_TIME=m
 CONFIG_SPI_SLAVE_SYSTEM_CONTROL=m
+CONFIG_SPI_DYNAMIC=y
 CONFIG_SPMI=m
 CONFIG_HSI=m
 CONFIG_HSI_BOARDINFO=y
@@ -6472,9 +6476,6 @@ CONFIG_HDMI=y
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
-CONFIG_VGACON_SOFT_SCROLLBACK=y
-CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
-# CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set
 CONFIG_MDA_CONSOLE=m
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
@@ -6849,7 +6850,7 @@ CONFIG_USB_HIDDEV=y
 CONFIG_I2C_HID=m
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
+CONFIG_USB_COMMON=m
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=m
 CONFIG_USB_PCI=y
@@ -7072,7 +7073,6 @@ CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
@@ -7126,7 +7126,6 @@ CONFIG_USB_BDC_UDC=m
 #
 # Platform Support
 #
-CONFIG_USB_BDC_PCI=m
 CONFIG_USB_AMD5536UDC=m
 CONFIG_USB_NET2272=m
 CONFIG_USB_NET2272_DMA=y

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 5f304269067bcc58574b8758e5c20cfa0c6d0f2d..e89afc01df056cce7395229ec0c9aa3b80ac2c15 100644 (file)
--- a/kernel-vanilla-x86_64.config
+++ b/kernel-x86_64.config
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.137-4.19-vanilla Kernel Configuration
+# Linux/x86 4.19.237-4.19 Kernel Configuration
 #
 
 #
-# Compiler: gcc (TLD-Linux) 9.3.0 20200408 (release)
+# Compiler: gcc (TLD-Linux) 10.2.0 20201208 (release)
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
+CONFIG_GCC_VERSION=100200
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
@@ -207,6 +207,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
@@ -870,6 +871,7 @@ CONFIG_STRICT_MODULE_RWX=y
 CONFIG_ARCH_HAS_REFCOUNT=y
 # CONFIG_REFCOUNT_FULL is not set
 CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
+CONFIG_ARCH_USE_MEMREMAP_PROT=y
 
 #
 # GCOV-based kernel profiling
@@ -1078,6 +1080,7 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 CONFIG_TLS=m
 CONFIG_TLS_DEVICE=y
@@ -4449,6 +4452,7 @@ CONFIG_SPI_TLE62X0=m
 CONFIG_SPI_SLAVE=y
 CONFIG_SPI_SLAVE_TIME=m
 CONFIG_SPI_SLAVE_SYSTEM_CONTROL=m
+CONFIG_SPI_DYNAMIC=y
 CONFIG_SPMI=m
 CONFIG_HSI=m
 CONFIG_HSI_BOARDINFO=y
@@ -6355,9 +6359,6 @@ CONFIG_HDMI=y
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
-CONFIG_VGACON_SOFT_SCROLLBACK=y
-CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
-# CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
@@ -6693,7 +6694,7 @@ CONFIG_I2C_HID=m
 CONFIG_INTEL_ISH_HID=m
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
+CONFIG_USB_COMMON=m
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=m
 CONFIG_USB_PCI=y
@@ -6916,7 +6917,6 @@ CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
@@ -6970,7 +6970,6 @@ CONFIG_USB_BDC_UDC=m
 #
 # Platform Support
 #
-CONFIG_USB_BDC_PCI=m
 CONFIG_USB_AMD5536UDC=m
 CONFIG_USB_NET2272=m
 CONFIG_USB_NET2272_DMA=y

diff --git a/kernel-vanilla.spec b/kernel.spec
similarity index 97%
rename from kernel-vanilla.spec
rename to kernel.spec
index b5df80a2143eb8ed59ac8d78d74a033147807c38..0ff595a1d394ca2605d552a89b2c404c1029426c 100644 (file)
--- a/kernel-vanilla.spec
+++ b/kernel.spec
@@ -4,10 +4,10 @@
 %bcond_with    verbose         # verbose build (V=1)
 
 %define                basever         4.19
-%define                postver         214
+%define                postver         237
 %define                rel             1
 
-%define                alt_kernel      4.19-vanilla
+%define                alt_kernel      4.19
 
 # 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/v4.x/linux-%{basever}.tar.xz
 # Source0-md5: 740a90cf810c2105df8ee12e5d0bb900
 %if "%{postver}" != "0"
 Source1:       http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Source1-md5: e90e24c4adf6d28696bcee16fcc7c4ff
+# Source1-md5: c13df2e09b5a17221a6d5daac500615e
 %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