From: Marcin Krol <hawk@tld-linux.org>
Date: Wed, 30 Mar 2022 19:53:26 +0000 (+0200)
Subject: - renamed to "kernel", updated to 4.14.274
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=c8dbd67ccd0a5b3a1276c59b315a493b7fa42f24;p=packages%2Fkernel.git
- renamed to "kernel", updated to 4.14.274
---
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 5b0a5dc..0d5eb20 100644
--- a/kernel-vanilla-x86.config
+++ b/kernel-x86.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.192-4.14-vanilla Kernel Configuration
+# Linux/x86 4.14.274-4.14 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -223,6 +223,7 @@ CONFIG_BPF_SYSCALL=y
CONFIG_SHMEM=y
CONFIG_AIO=y
CONFIG_ADVISE_SYSCALLS=y
+# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
CONFIG_USERFAULTFD=y
CONFIG_PCI_QUIRKS=y
CONFIG_MEMBARRIER=y
@@ -330,6 +331,7 @@ CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
CONFIG_STRICT_MODULE_RWX=y
CONFIG_ARCH_HAS_REFCOUNT=y
# CONFIG_REFCOUNT_FULL is not set
+CONFIG_ARCH_USE_MEMREMAP_PROT=y
#
# GCOV-based kernel profiling
@@ -966,6 +968,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_XFRM=y
@@ -4338,6 +4341,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
@@ -6235,9 +6239,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
@@ -6603,7 +6604,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
@@ -6838,7 +6839,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
@@ -6892,7 +6892,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 4b67677..f4e706c 100644
--- a/kernel-vanilla-x86_64.config
+++ b/kernel-x86_64.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.192-4.14-vanilla Kernel Configuration
+# Linux/x86 4.14.274-4.14 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -233,6 +233,7 @@ CONFIG_BPF_JIT_ALWAYS_ON=y
CONFIG_SHMEM=y
CONFIG_AIO=y
CONFIG_ADVISE_SYSCALLS=y
+# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
CONFIG_USERFAULTFD=y
CONFIG_PCI_QUIRKS=y
CONFIG_MEMBARRIER=y
@@ -350,6 +351,7 @@ CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
CONFIG_STRICT_MODULE_RWX=y
CONFIG_ARCH_HAS_REFCOUNT=y
# CONFIG_REFCOUNT_FULL is not set
+CONFIG_ARCH_USE_MEMREMAP_PROT=y
#
# GCOV-based kernel profiling
@@ -963,6 +965,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_XFRM=y
@@ -4249,6 +4252,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
@@ -6097,9 +6101,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
@@ -6427,7 +6428,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
@@ -6662,7 +6663,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
@@ -6716,7 +6716,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 bde5b09..31ede25 100644
--- a/kernel-vanilla.spec
+++ b/kernel.spec
@@ -4,10 +4,10 @@
%bcond_with verbose # verbose build (V=1)
%define basever 4.14
-%define postver 253
+%define postver 274
%define rel 1
-%define alt_kernel 4.14-vanilla
+%define alt_kernel 4.14
# 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: bacdb9ffdcd922aa069a5e1520160e24
%if "%{postver}" != "0"
Source1: http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Source1-md5: f9459c123a5d220f6f2468532d671ff2
+# Source1-md5: d737d4809e8392d2a8fdefc5e98cc9e6
%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