From: Marcin Krol Date: Thu, 31 Mar 2022 01:14:11 +0000 (+0200) Subject: - renamed to "kernel", updated to 4.9.309 X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=22de2cd4c4736203fcd096304af9764a46eda290;p=packages%2Fkernel.git - renamed to "kernel", updated to 4.9.309 --- 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 75270f5..bef95b1 100644 --- a/kernel-vanilla-x86.config +++ b/kernel-x86.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.9.232-4.9-vanilla Kernel Configuration +# Linux/x86 4.9.309-4.9 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -215,6 +215,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 @@ -893,6 +894,7 @@ CONFIG_NET_EGRESS=y CONFIG_PACKET=y CONFIG_PACKET_DIAG=m CONFIG_UNIX=y +CONFIG_UNIX_SCM=y CONFIG_UNIX_DIAG=m CONFIG_XFRM=y CONFIG_XFRM_ALGO=m @@ -4196,6 +4198,7 @@ CONFIG_SPI_ZYNQMP_GQSPI=m CONFIG_SPI_SPIDEV=m CONFIG_SPI_LOOPBACK_TEST=m CONFIG_SPI_TLE62X0=m +CONFIG_SPI_DYNAMIC=y CONFIG_SPMI=m CONFIG_HSI=m CONFIG_HSI_BOARDINFO=y @@ -5997,8 +6000,6 @@ CONFIG_HDMI=y # Console display driver support # CONFIG_VGA_CONSOLE=y -CONFIG_VGACON_SOFT_SCROLLBACK=y -CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 CONFIG_MDA_CONSOLE=m CONFIG_DUMMY_CONSOLE=y CONFIG_DUMMY_CONSOLE_COLUMNS=80 @@ -6374,7 +6375,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_ANNOUNCE_NEW_DEVICES is not set @@ -6605,7 +6606,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 @@ -6657,7 +6657,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 4893ab6..e4e2c96 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.9.232-4.9-vanilla Kernel Configuration +# Linux/x86 4.9.309-4.9 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -225,6 +225,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 @@ -880,6 +881,7 @@ CONFIG_NET_EGRESS=y CONFIG_PACKET=y CONFIG_PACKET_DIAG=m CONFIG_UNIX=y +CONFIG_UNIX_SCM=y CONFIG_UNIX_DIAG=m CONFIG_XFRM=y CONFIG_XFRM_ALGO=m @@ -4094,6 +4096,7 @@ CONFIG_SPI_ZYNQMP_GQSPI=m CONFIG_SPI_SPIDEV=m CONFIG_SPI_LOOPBACK_TEST=m CONFIG_SPI_TLE62X0=m +CONFIG_SPI_DYNAMIC=y CONFIG_SPMI=m CONFIG_HSI=m CONFIG_HSI_BOARDINFO=y @@ -5844,8 +5847,6 @@ CONFIG_HDMI=y # Console display driver support # CONFIG_VGA_CONSOLE=y -CONFIG_VGACON_SOFT_SCROLLBACK=y -CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 CONFIG_DUMMY_CONSOLE=y CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 @@ -6178,7 +6179,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_ANNOUNCE_NEW_DEVICES is not set @@ -6409,7 +6410,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 @@ -6461,7 +6461,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 817454b..da45fad 100644 --- a/kernel-vanilla.spec +++ b/kernel.spec @@ -4,10 +4,10 @@ %bcond_with verbose # verbose build (V=1) %define basever 4.9 -%define postver 288 +%define postver 309 %define rel 1 -%define alt_kernel 4.9-vanilla +%define alt_kernel 4.9 # 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: 0a68ef3615c64bd5ee54a3320e46667d %if "%{postver}" != "0" Source1: http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz -# Source1-md5: e2605870c7a921e05ccdccf92994a966 +# Source1-md5: f6543693793209202831577ef0c7583b %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