From 509574de4eeee30a0fd052786fa60cbe6540b7d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 17 Oct 2022 07:42:50 +0700 Subject: [PATCH 1/3] linux4.9: update to 4.9.330. --- srcpkgs/linux4.9/files/arm64-dotconfig | 15 ++++++++++----- srcpkgs/linux4.9/files/i386-dotconfig | 19 +++++++++---------- srcpkgs/linux4.9/files/ppc-dotconfig | 13 +++++++++---- srcpkgs/linux4.9/files/ppc64-dotconfig | 17 +++++++++-------- srcpkgs/linux4.9/files/x86_64-dotconfig | 19 +++++++++---------- srcpkgs/linux4.9/template | 7 ++++--- 6 files changed, 50 insertions(+), 40 deletions(-) diff --git a/srcpkgs/linux4.9/files/arm64-dotconfig b/srcpkgs/linux4.9/files/arm64-dotconfig index 1c3da432c2e4..b825826bafc8 100644 --- a/srcpkgs/linux4.9/files/arm64-dotconfig +++ b/srcpkgs/linux4.9/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.9.232 Kernel Configuration +# Linux/arm64 4.9.330 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -193,6 +193,7 @@ CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_SHMEM=y CONFIG_AIO=y CONFIG_ADVISE_SYSCALLS=y +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y # CONFIG_USERFAULTFD is not set CONFIG_PCI_QUIRKS=y CONFIG_MEMBARRIER=y @@ -522,6 +523,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_ARM64_SSBD=y +CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y # # ARMv8.1 architectural features @@ -649,6 +651,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=y @@ -2288,7 +2291,6 @@ CONFIG_MLX4_DEBUG=y CONFIG_NET_VENDOR_MICREL=y # CONFIG_KS8842 is not set # CONFIG_KS8851 is not set -# CONFIG_KS8851_MLL is not set CONFIG_KSZ884X_PCI=m CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_ENC28J60 is not set @@ -2729,7 +2731,6 @@ CONFIG_IEEE802154_ATUSB=m # CONFIG_IEEE802154_ADF7242 is not set # CONFIG_FUJITSU_ES is not set # CONFIG_ISDN is not set -# CONFIG_NVM is not set # # Input device support @@ -3107,6 +3108,7 @@ CONFIG_TCG_ATMEL=m # CONFIG_TCG_TIS_ST33ZP24_SPI is not set CONFIG_DEVPORT=y # CONFIG_XILLYBUS is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y # # I2C support @@ -3250,6 +3252,7 @@ CONFIG_SPI_QUP=y CONFIG_SPI_SPIDEV=m # CONFIG_SPI_LOOPBACK_TEST is not set # CONFIG_SPI_TLE62X0 is not set +CONFIG_SPI_DYNAMIC=y CONFIG_SPMI=y CONFIG_SPMI_MSM_PMIC_ARB=y # CONFIG_HSI is not set @@ -3475,6 +3478,7 @@ CONFIG_CHARGER_QCOM_SMBB=m # CONFIG_CHARGER_BQ25890 is not set CONFIG_CHARGER_SMB347=m # CONFIG_BATTERY_GAUGE_LTC2941 is not set +CONFIG_BATTERY_RT5033=m # CONFIG_CHARGER_RT9455 is not set CONFIG_HWMON=y CONFIG_HWMON_VID=m @@ -5376,7 +5380,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 @@ -6064,6 +6067,7 @@ CONFIG_CLKSRC_PROBE=y CONFIG_CLKSRC_MMIO=y CONFIG_ARM_ARCH_TIMER=y CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y +CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y CONFIG_FSL_ERRATUM_A008585=y CONFIG_ARM_TIMER_SP804=y # CONFIG_ATMEL_PIT is not set @@ -6855,7 +6859,7 @@ CONFIG_NFS_V4_2=y CONFIG_PNFS_FILE_LAYOUT=y CONFIG_PNFS_BLOCK=y CONFIG_PNFS_OBJLAYOUT=m -CONFIG_PNFS_FLEXFILE_LAYOUT=m +CONFIG_PNFS_FLEXFILE_LAYOUT=y CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" # CONFIG_NFS_V4_1_MIGRATION is not set CONFIG_NFS_V4_SECURITY_LABEL=y @@ -7085,6 +7089,7 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_LOCK_TORTURE_TEST is not set CONFIG_STACKTRACE=y +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set # CONFIG_DEBUG_KOBJECT is not set CONFIG_HAVE_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_BUGVERBOSE=y diff --git a/srcpkgs/linux4.9/files/i386-dotconfig b/srcpkgs/linux4.9/files/i386-dotconfig index 9e2272c7ec83..73429a1cc142 100644 --- a/srcpkgs/linux4.9/files/i386-dotconfig +++ b/srcpkgs/linux4.9/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 4.9.232 Kernel Configuration +# Linux/i386 4.9.330 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=y CONFIG_USERFAULTFD=y CONFIG_PCI_QUIRKS=y CONFIG_MEMBARRIER=y @@ -843,6 +844,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 @@ -1848,6 +1850,7 @@ CONFIG_PNPACPI=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_ZRAM=m @@ -2531,7 +2534,6 @@ CONFIG_MLXSW_SPECTRUM_DCB=y CONFIG_NET_VENDOR_MICREL=y CONFIG_KS8842=m CONFIG_KS8851=m -CONFIG_KS8851_MLL=m CONFIG_KSZ884X_PCI=m CONFIG_NET_VENDOR_MICROCHIP=y CONFIG_ENC28J60=m @@ -2990,10 +2992,6 @@ CONFIG_VMXNET3=m CONFIG_FUJITSU_ES=m CONFIG_HYPERV_NET=m # CONFIG_ISDN is not set -CONFIG_NVM=y -# CONFIG_NVM_DEBUG is not set -CONFIG_NVM_GENNVM=m -CONFIG_NVM_RRPC=m # # Input device support @@ -3411,6 +3409,8 @@ CONFIG_TELCLOCK=m CONFIG_DEVPORT=y CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m +CONFIG_RANDOM_TRUST_CPU=y +CONFIG_RANDOM_TRUST_BOOTLOADER=y # # I2C support @@ -3541,6 +3541,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 @@ -5093,7 +5094,6 @@ CONFIG_HDMI=y # Console display driver support # CONFIG_VGA_CONSOLE=y -# CONFIG_VGACON_SOFT_SCROLLBACK is not set CONFIG_DUMMY_CONSOLE=y CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 @@ -5581,7 +5581,7 @@ CONFIG_USB_MOUSE=m 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=y @@ -5786,7 +5786,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 @@ -5838,7 +5837,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 is not set @@ -7597,6 +7595,7 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_LOCK_TORTURE_TEST is not set CONFIG_STACKTRACE=y +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_LIST=y diff --git a/srcpkgs/linux4.9/files/ppc-dotconfig b/srcpkgs/linux4.9/files/ppc-dotconfig index 7a95057509e2..99184deb0da0 100644 --- a/srcpkgs/linux4.9/files/ppc-dotconfig +++ b/srcpkgs/linux4.9/files/ppc-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 4.9.261 Kernel Configuration +# Linux/powerpc 4.9.330 Kernel Configuration # # CONFIG_PPC64 is not set @@ -214,6 +214,7 @@ CONFIG_BPF_SYSCALL=y CONFIG_SHMEM=y CONFIG_AIO=y CONFIG_ADVISE_SYSCALLS=y +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y CONFIG_USERFAULTFD=y CONFIG_PCI_QUIRKS=y CONFIG_MEMBARRIER=y @@ -620,6 +621,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 @@ -1585,6 +1587,7 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_MAC_FLOPPY=y # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -2031,6 +2034,7 @@ CONFIG_MACINTOSH_DRIVERS=y CONFIG_ADB=y CONFIG_ADB_CUDA=y CONFIG_ADB_PMU=y +CONFIG_ADB_PMU_EVENT=y CONFIG_ADB_PMU_LED=y CONFIG_PMAC_APM_EMU=m CONFIG_PMAC_MEDIABAY=y @@ -2272,7 +2276,6 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_NET_VENDOR_MICREL=y # CONFIG_KS8842 is not set # CONFIG_KS8851 is not set -# CONFIG_KS8851_MLL is not set CONFIG_KSZ884X_PCI=m CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_ENC28J60 is not set @@ -2797,7 +2800,6 @@ CONFIG_MISDN_W6692=m # CONFIG_MISDN_NETJET is not set CONFIG_MISDN_IPAC=m CONFIG_MISDN_ISAR=m -# CONFIG_NVM is not set # # Input device support @@ -3132,6 +3134,7 @@ CONFIG_IPWIRELESS=m # CONFIG_TCG_TPM is not set CONFIG_DEVPORT=y # CONFIG_XILLYBUS is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y # # I2C support @@ -3327,6 +3330,7 @@ CONFIG_BATTERY_BQ27XXX=m # CONFIG_CHARGER_BQ2415X is not set # CONFIG_CHARGER_SMB347 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set +# CONFIG_BATTERY_RT5033 is not set CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -4761,7 +4765,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y 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=y @@ -6238,6 +6242,7 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_LOCK_TORTURE_TEST is not set CONFIG_STACKTRACE=y +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_LIST=y diff --git a/srcpkgs/linux4.9/files/ppc64-dotconfig b/srcpkgs/linux4.9/files/ppc64-dotconfig index 2799066f07f8..545c92f231c1 100644 --- a/srcpkgs/linux4.9/files/ppc64-dotconfig +++ b/srcpkgs/linux4.9/files/ppc64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 4.9.253 Kernel Configuration +# Linux/powerpc 4.9.330 Kernel Configuration # CONFIG_PPC64=y @@ -237,6 +237,7 @@ CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_SHMEM=y CONFIG_AIO=y CONFIG_ADVISE_SYSCALLS=y +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y CONFIG_USERFAULTFD=y CONFIG_PCI_QUIRKS=y CONFIG_MEMBARRIER=y @@ -763,6 +764,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 @@ -1870,6 +1872,7 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_ZRAM=m @@ -2325,6 +2328,7 @@ CONFIG_FIREWIRE_NET=m CONFIG_FIREWIRE_NOSY=m CONFIG_MACINTOSH_DRIVERS=y CONFIG_ADB_PMU=y +CONFIG_ADB_PMU_EVENT=y CONFIG_ADB_PMU_LED=y CONFIG_PMAC_SMU=y CONFIG_MAC_EMUMOUSEBTN=y @@ -2578,7 +2582,6 @@ CONFIG_MLXSW_SPECTRUM_DCB=y CONFIG_NET_VENDOR_MICREL=y CONFIG_KS8842=m CONFIG_KS8851=m -CONFIG_KS8851_MLL=m CONFIG_KSZ884X_PCI=m CONFIG_NET_VENDOR_MICROCHIP=y CONFIG_ENC28J60=m @@ -3079,10 +3082,6 @@ CONFIG_IEEE802154_ATUSB=m CONFIG_IEEE802154_ADF7242=m # CONFIG_VMXNET3 is not set # CONFIG_ISDN is not set -CONFIG_NVM=y -# CONFIG_NVM_DEBUG is not set -CONFIG_NVM_GENNVM=m -CONFIG_NVM_RRPC=m # # Input device support @@ -3521,6 +3520,8 @@ CONFIG_DEVPORT=y CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYBUS_OF=m +CONFIG_RANDOM_TRUST_CPU=y +CONFIG_RANDOM_TRUST_BOOTLOADER=y # # I2C support @@ -5642,7 +5643,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=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=y @@ -5903,7 +5904,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 is not set @@ -7698,6 +7698,7 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_LOCK_TORTURE_TEST is not set CONFIG_STACKTRACE=y +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_LIST=y diff --git a/srcpkgs/linux4.9/files/x86_64-dotconfig b/srcpkgs/linux4.9/files/x86_64-dotconfig index 5972f909a99a..dbbd1e9156fa 100644 --- a/srcpkgs/linux4.9/files/x86_64-dotconfig +++ b/srcpkgs/linux4.9/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.9.232 Kernel Configuration +# Linux/x86_64 4.9.330 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=y CONFIG_USERFAULTFD=y CONFIG_PCI_QUIRKS=y CONFIG_MEMBARRIER=y @@ -862,6 +863,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 @@ -1868,6 +1870,7 @@ CONFIG_PNPACPI=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_ZRAM=m @@ -2560,7 +2563,6 @@ CONFIG_MLXSW_SPECTRUM_DCB=y CONFIG_NET_VENDOR_MICREL=y CONFIG_KS8842=m CONFIG_KS8851=m -CONFIG_KS8851_MLL=m CONFIG_KSZ884X_PCI=m CONFIG_NET_VENDOR_MICROCHIP=y CONFIG_ENC28J60=m @@ -3031,10 +3033,6 @@ CONFIG_VMXNET3=m CONFIG_FUJITSU_ES=m CONFIG_HYPERV_NET=m # CONFIG_ISDN is not set -CONFIG_NVM=y -# CONFIG_NVM_DEBUG is not set -CONFIG_NVM_GENNVM=m -CONFIG_NVM_RRPC=m # # Input device support @@ -3450,6 +3448,8 @@ CONFIG_TELCLOCK=m CONFIG_DEVPORT=y CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m +CONFIG_RANDOM_TRUST_CPU=y +CONFIG_RANDOM_TRUST_BOOTLOADER=y # # I2C support @@ -3577,6 +3577,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 @@ -5113,7 +5114,6 @@ CONFIG_HDMI=y # Console display driver support # CONFIG_VGA_CONSOLE=y -# CONFIG_VGACON_SOFT_SCROLLBACK is not set CONFIG_DUMMY_CONSOLE=y CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 @@ -5602,7 +5602,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=y @@ -5807,7 +5807,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 @@ -5859,7 +5858,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 is not set @@ -7679,6 +7677,7 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_LOCK_TORTURE_TEST is not set CONFIG_STACKTRACE=y +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_LIST=y diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template index bad95d88f072..087698abbca1 100644 --- a/srcpkgs/linux4.9/template +++ b/srcpkgs/linux4.9/template @@ -1,6 +1,6 @@ # Template file for 'linux4.9' pkgname=linux4.9 -version=4.9.261 +version=4.9.330 revision=1 wrksrc="linux-${version%.*}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -10,7 +10,7 @@ homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version%.*}.tar.xz https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-${version}.xz" checksum="029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a - f808e190ab3d4b254b22c8b93936747c135a47c1a66d657af0e494bfbc125ca5" + 581777562ce7872c2998b67fb9e9e53ef5d4a8a14eaf98744884ea57c6237d15" python_version=2 #unverified skip_extraction="patch-${version}.xz" @@ -49,7 +49,8 @@ export KBUILD_BUILD_USER=voidlinux export KBUILD_BUILD_HOST=voidlinux pre_patch() { - xzcat $XBPS_SRCDISTDIR/$pkgname-$version/patch-${version}.xz | patch -Np1 + xzcat $XBPS_SRCDISTDIR/$pkgname-$version/patch-${version}.xz | + patch -sNp1 -F0 } do_configure() { From fb23e4984aa1f1921e055502b883eacb8433813a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 17 Oct 2022 07:43:21 +0700 Subject: [PATCH 2/3] linux4.14: update to 4.14.295. --- srcpkgs/linux4.14/files/arm64-dotconfig | 15 +++++++++++---- srcpkgs/linux4.14/files/i386-dotconfig | 20 +++++++++----------- srcpkgs/linux4.14/files/ppc-dotconfig | 11 ++++++++--- srcpkgs/linux4.14/files/ppc64-dotconfig | 15 ++++++++------- srcpkgs/linux4.14/files/x86_64-dotconfig | 20 +++++++++----------- srcpkgs/linux4.14/template | 7 ++++--- 6 files changed, 49 insertions(+), 39 deletions(-) diff --git a/srcpkgs/linux4.14/files/arm64-dotconfig b/srcpkgs/linux4.14/files/arm64-dotconfig index 744985cfb4ca..67d79338016a 100644 --- a/srcpkgs/linux4.14/files/arm64-dotconfig +++ b/srcpkgs/linux4.14/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.188 Kernel Configuration +# Linux/arm64 4.14.295 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -206,6 +206,7 @@ CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_SHMEM=y CONFIG_AIO=y CONFIG_ADVISE_SYSCALLS=y +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y # CONFIG_USERFAULTFD is not set CONFIG_PCI_QUIRKS=y CONFIG_MEMBARRIER=y @@ -523,6 +524,7 @@ CONFIG_ARM64_ERRATUM_834220=y CONFIG_ARM64_ERRATUM_845719=y CONFIG_ARM64_ERRATUM_843419=y CONFIG_ARM64_ERRATUM_1024718=y +CONFIG_ARM64_ERRATUM_1188873=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_27456=y @@ -614,6 +616,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_ARM64_SSBD=y +CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y # CONFIG_ARMV8_DEPRECATED is not set CONFIG_ARM64_SW_TTBR0_PAN=y @@ -754,6 +757,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 is not set CONFIG_XFRM=y @@ -2883,7 +2887,6 @@ CONFIG_IEEE802154_CA8210=m # CONFIG_IEEE802154_CA8210_DEBUGFS is not set # CONFIG_FUJITSU_ES is not set # CONFIG_ISDN is not set -# CONFIG_NVM is not set # # Input device support @@ -3303,6 +3306,7 @@ CONFIG_TCG_ATMEL=m # CONFIG_TCG_TIS_ST33ZP24_SPI is not set CONFIG_DEVPORT=y # CONFIG_XILLYBUS is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y # # I2C support @@ -3475,6 +3479,7 @@ CONFIG_SPI_SPIDEV=m # CONFIG_SPI_LOOPBACK_TEST is not set # CONFIG_SPI_TLE62X0 is not set # CONFIG_SPI_SLAVE is not set +CONFIG_SPI_DYNAMIC=y CONFIG_SPMI=y CONFIG_SPMI_MSM_PMIC_ARB=y # CONFIG_HSI is not set @@ -3736,6 +3741,7 @@ CONFIG_CHARGER_QCOM_SMBB=m # CONFIG_CHARGER_BQ25890 is not set CONFIG_CHARGER_SMB347=m # CONFIG_BATTERY_GAUGE_LTC2941 is not set +CONFIG_BATTERY_RT5033=m # CONFIG_CHARGER_RT9455 is not set CONFIG_HWMON=y CONFIG_HWMON_VID=m @@ -5815,7 +5821,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 @@ -6635,6 +6640,8 @@ CONFIG_TIMER_OF=y CONFIG_TIMER_ACPI=y CONFIG_TIMER_PROBE=y CONFIG_CLKSRC_MMIO=y +CONFIG_DW_APB_TIMER=y +CONFIG_DW_APB_TIMER_OF=y CONFIG_ROCKCHIP_TIMER=y CONFIG_OWL_TIMER=y CONFIG_ARM_ARCH_TIMER=y @@ -7631,7 +7638,7 @@ CONFIG_NFS_V4_1=y CONFIG_NFS_V4_2=y CONFIG_PNFS_FILE_LAYOUT=y CONFIG_PNFS_BLOCK=y -CONFIG_PNFS_FLEXFILE_LAYOUT=m +CONFIG_PNFS_FLEXFILE_LAYOUT=y CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" # CONFIG_NFS_V4_1_MIGRATION is not set CONFIG_NFS_V4_SECURITY_LABEL=y diff --git a/srcpkgs/linux4.14/files/i386-dotconfig b/srcpkgs/linux4.14/files/i386-dotconfig index 17f128f801e2..7f8ac63ee576 100644 --- a/srcpkgs/linux4.14/files/i386-dotconfig +++ b/srcpkgs/linux4.14/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 4.14.188 Kernel Configuration +# Linux/i386 4.14.295 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=y 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=y +CONFIG_ARCH_USE_MEMREMAP_PROT=y # # GCOV-based kernel profiling @@ -908,6 +910,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 is not set CONFIG_XFRM=y @@ -1893,6 +1896,7 @@ CONFIG_PNPACPI=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_ZRAM=m @@ -3082,10 +3086,6 @@ CONFIG_VMXNET3=m CONFIG_FUJITSU_ES=m CONFIG_HYPERV_NET=m # CONFIG_ISDN is not set -CONFIG_NVM=y -# CONFIG_NVM_DEBUG is not set -CONFIG_NVM_RRPC=m -# CONFIG_NVM_PBLK is not set # # Input device support @@ -3522,6 +3522,8 @@ CONFIG_TELCLOCK=m CONFIG_DEVPORT=y CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m +CONFIG_RANDOM_TRUST_CPU=y +CONFIG_RANDOM_TRUST_BOOTLOADER=y # # I2C support @@ -3655,6 +3657,7 @@ CONFIG_SPI_SPIDEV=m CONFIG_SPI_LOOPBACK_TEST=m CONFIG_SPI_TLE62X0=m # CONFIG_SPI_SLAVE is not set +CONFIG_SPI_DYNAMIC=y CONFIG_SPMI=m CONFIG_HSI=m CONFIG_HSI_BOARDINFO=y @@ -5277,9 +5280,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=y CONFIG_DUMMY_CONSOLE=y CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 @@ -5808,7 +5808,7 @@ CONFIG_USB_MOUSE=m 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 @@ -6017,7 +6017,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 @@ -6070,7 +6069,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 is not set diff --git a/srcpkgs/linux4.14/files/ppc-dotconfig b/srcpkgs/linux4.14/files/ppc-dotconfig index 69ea5d411540..b46dcdcd9cac 100644 --- a/srcpkgs/linux4.14/files/ppc-dotconfig +++ b/srcpkgs/linux4.14/files/ppc-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 4.14.225 Kernel Configuration +# Linux/powerpc 4.14.295 Kernel Configuration # # CONFIG_PPC64 is not set @@ -227,6 +227,7 @@ CONFIG_BPF_SYSCALL=y CONFIG_SHMEM=y CONFIG_AIO=y CONFIG_ADVISE_SYSCALLS=y +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y CONFIG_USERFAULTFD=y CONFIG_PCI_QUIRKS=y CONFIG_MEMBARRIER=y @@ -689,6 +690,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 is not set CONFIG_XFRM=y @@ -1629,6 +1631,7 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_MAC_FLOPPY=y # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -2081,6 +2084,7 @@ CONFIG_MACINTOSH_DRIVERS=y CONFIG_ADB=y CONFIG_ADB_CUDA=y CONFIG_ADB_PMU=y +CONFIG_ADB_PMU_EVENT=y CONFIG_ADB_PMU_LED=y # CONFIG_ADB_PMU_LED_DISK is not set CONFIG_PMAC_APM_EMU=m @@ -2879,7 +2883,6 @@ CONFIG_MISDN_W6692=m # CONFIG_MISDN_NETJET is not set CONFIG_MISDN_IPAC=m CONFIG_MISDN_ISAR=m -# CONFIG_NVM is not set # # Input device support @@ -3231,6 +3234,7 @@ CONFIG_IPWIRELESS=m # CONFIG_TCG_TPM is not set CONFIG_DEVPORT=y # CONFIG_XILLYBUS is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y # # I2C support @@ -3432,6 +3436,7 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m # CONFIG_CHARGER_BQ2415X is not set # CONFIG_CHARGER_SMB347 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set +# CONFIG_BATTERY_RT5033 is not set CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -4940,7 +4945,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y 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 diff --git a/srcpkgs/linux4.14/files/ppc64-dotconfig b/srcpkgs/linux4.14/files/ppc64-dotconfig index 306268a91826..1b6f98dd40b3 100644 --- a/srcpkgs/linux4.14/files/ppc64-dotconfig +++ b/srcpkgs/linux4.14/files/ppc64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 4.14.217 Kernel Configuration +# Linux/powerpc 4.14.295 Kernel Configuration # CONFIG_PPC64=y @@ -251,6 +251,7 @@ CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_SHMEM=y CONFIG_AIO=y CONFIG_ADVISE_SYSCALLS=y +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y CONFIG_USERFAULTFD=y CONFIG_PCI_QUIRKS=y CONFIG_MEMBARRIER=y @@ -857,6 +858,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 is not set CONFIG_XFRM=y @@ -1944,6 +1946,7 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_ZRAM=m @@ -2401,6 +2404,7 @@ CONFIG_FIREWIRE_NET=m CONFIG_FIREWIRE_NOSY=m CONFIG_MACINTOSH_DRIVERS=y CONFIG_ADB_PMU=y +CONFIG_ADB_PMU_EVENT=y CONFIG_ADB_PMU_LED=y CONFIG_ADB_PMU_LED_DISK=y CONFIG_PMAC_SMU=y @@ -3196,10 +3200,6 @@ CONFIG_IEEE802154_ATUSB=m CONFIG_IEEE802154_ADF7242=m # CONFIG_VMXNET3 is not set # CONFIG_ISDN is not set -CONFIG_NVM=y -# CONFIG_NVM_DEBUG is not set -CONFIG_NVM_RRPC=m -# CONFIG_NVM_PBLK is not set # # Input device support @@ -3661,6 +3661,8 @@ CONFIG_DEVPORT=y CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYBUS_OF=m +CONFIG_RANDOM_TRUST_CPU=y +CONFIG_RANDOM_TRUST_BOOTLOADER=y # # I2C support @@ -5905,7 +5907,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=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 @@ -6172,7 +6174,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 is not set diff --git a/srcpkgs/linux4.14/files/x86_64-dotconfig b/srcpkgs/linux4.14/files/x86_64-dotconfig index acc2f6767c92..a7150354fc77 100644 --- a/srcpkgs/linux4.14/files/x86_64-dotconfig +++ b/srcpkgs/linux4.14/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.14.188 Kernel Configuration +# Linux/x86_64 4.14.295 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=y CONFIG_USERFAULTFD=y CONFIG_PCI_QUIRKS=y CONFIG_MEMBARRIER=y @@ -352,6 +353,7 @@ CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y CONFIG_ARCH_HAS_REFCOUNT=y CONFIG_REFCOUNT_FULL=y +CONFIG_ARCH_USE_MEMREMAP_PROT=y # # GCOV-based kernel profiling @@ -938,6 +940,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 is not set CONFIG_XFRM=y @@ -1926,6 +1929,7 @@ CONFIG_PNPACPI=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_ZRAM=m @@ -3134,10 +3138,6 @@ CONFIG_VMXNET3=m CONFIG_FUJITSU_ES=m CONFIG_HYPERV_NET=m # CONFIG_ISDN is not set -CONFIG_NVM=y -# CONFIG_NVM_DEBUG is not set -CONFIG_NVM_RRPC=m -# CONFIG_NVM_PBLK is not set # # Input device support @@ -3572,6 +3572,8 @@ CONFIG_TELCLOCK=m CONFIG_DEVPORT=y CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m +CONFIG_RANDOM_TRUST_CPU=y +CONFIG_RANDOM_TRUST_BOOTLOADER=y # # I2C support @@ -3703,6 +3705,7 @@ CONFIG_SPI_SPIDEV=m CONFIG_SPI_LOOPBACK_TEST=m CONFIG_SPI_TLE62X0=m # CONFIG_SPI_SLAVE is not set +CONFIG_SPI_DYNAMIC=y CONFIG_SPMI=m CONFIG_HSI=m CONFIG_HSI_BOARDINFO=y @@ -5312,9 +5315,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=y CONFIG_DUMMY_CONSOLE=y CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 @@ -5844,7 +5844,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 @@ -6053,7 +6053,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 @@ -6106,7 +6105,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 is not set diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template index 9d9d56af8c3f..06844a260df5 100644 --- a/srcpkgs/linux4.14/template +++ b/srcpkgs/linux4.14/template @@ -1,6 +1,6 @@ # Template file for 'linux4.14' pkgname=linux4.14 -version=4.14.225 +version=4.14.295 revision=1 wrksrc="linux-${version%.*}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -10,7 +10,7 @@ homepage="http://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version%.*}.tar.xz https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-${version}.xz" checksum="f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7 - b9afed9ae1f63b67fa01d17b3146f23a2ab5ef8ce458f3aec4d0b174553d0c52" + 941c34f4a5c438bbb1b0ab5ee84b8075acf9c4d3843697259e980def08c6a839" skip_extraction="patch-${version}.xz" python_version=2 #unverified @@ -51,7 +51,8 @@ export KBUILD_BUILD_USER=voidlinux export KBUILD_BUILD_HOST=voidlinux pre_patch() { - xzcat $XBPS_SRCDISTDIR/$pkgname-$version/patch-${version}.xz | patch -Np1 + xzcat $XBPS_SRCDISTDIR/$pkgname-$version/patch-${version}.xz | + patch -sNp1 -F0 } do_configure() { From cbd362f1296ec224ca73cc7afdda4aaee9090cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 17 Oct 2022 07:44:06 +0700 Subject: [PATCH 3/3] linux5.4: update to 5.4.218. --- srcpkgs/linux5.4/files/i386-dotconfig | 9 +++------ srcpkgs/linux5.4/files/ppc-dotconfig | 15 ++++++++------- srcpkgs/linux5.4/files/ppc64-dotconfig | 10 ++++------ srcpkgs/linux5.4/files/ppc64le-dotconfig | 9 +++------ srcpkgs/linux5.4/files/x86_64-dotconfig | 9 +++------ srcpkgs/linux5.4/template | 16 ++++++++++++---- 6 files changed, 33 insertions(+), 35 deletions(-) diff --git a/srcpkgs/linux5.4/files/i386-dotconfig b/srcpkgs/linux5.4/files/i386-dotconfig index f02921ccb9d6..cca637e2c54a 100644 --- a/srcpkgs/linux5.4/files/i386-dotconfig +++ b/srcpkgs/linux5.4/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 5.4.193 Kernel Configuration +# Linux/i386 5.4.218 Kernel Configuration # # @@ -21,7 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y # CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION="_1" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_BUILD_SALT="" CONFIG_HAVE_KERNEL_GZIP=y @@ -777,8 +777,6 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y -CONFIG_ARCH_HAS_REFCOUNT=y -CONFIG_REFCOUNT_FULL=y CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y CONFIG_ARCH_USE_MEMREMAP_PROT=y # CONFIG_LOCK_EVENT_COUNTS is not set @@ -3909,10 +3907,9 @@ CONFIG_TELCLOCK=m CONFIG_DEVPORT=y CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m -# end of Character devices - # CONFIG_RANDOM_TRUST_CPU is not set CONFIG_RANDOM_TRUST_BOOTLOADER=y +# end of Character devices # # I2C support diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig index 272515f2ced8..a74cd10ca871 100644 --- a/srcpkgs/linux5.4/files/ppc-dotconfig +++ b/srcpkgs/linux5.4/files/ppc-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.4.180 Kernel Configuration +# Linux/powerpc 5.4.218 Kernel Configuration # # @@ -237,10 +237,13 @@ CONFIG_PPC_BOOK3S_6xx=y # CONFIG_40x is not set # CONFIG_44x is not set # CONFIG_E200 is not set -CONFIG_GENERIC_CPU=y +CONFIG_POWERPC_CPU=y # CONFIG_E300C2_CPU is not set # CONFIG_E300C3_CPU is not set # CONFIG_G4_CPU is not set +# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set +CONFIG_TARGET_CPU_BOOL=y +CONFIG_TARGET_CPU="powerpc" CONFIG_PPC_BOOK3S=y CONFIG_PPC_FPU=y CONFIG_ALTIVEC=y @@ -513,7 +516,6 @@ CONFIG_OLD_SIGACTION=y CONFIG_64BIT_TIME=y CONFIG_COMPAT_32BIT_TIME=y CONFIG_ARCH_HAS_PHYS_TO_DMA=y -# CONFIG_REFCOUNT_FULL is not set # CONFIG_LOCK_EVENT_COUNTS is not set # @@ -1741,6 +1743,7 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_MAC_FLOPPY=y CONFIG_CDROM=m # CONFIG_PARIDE is not set @@ -2211,6 +2214,7 @@ CONFIG_MACINTOSH_DRIVERS=y CONFIG_ADB=y CONFIG_ADB_CUDA=y CONFIG_ADB_PMU=y +CONFIG_ADB_PMU_EVENT=y CONFIG_ADB_PMU_LED=y # CONFIG_ADB_PMU_LED_DISK is not set CONFIG_PMAC_APM_EMU=m @@ -3048,7 +3052,6 @@ CONFIG_MISDN_W6692=m # CONFIG_MISDN_NETJET is not set CONFIG_MISDN_IPAC=m CONFIG_MISDN_ISAR=m -# CONFIG_NVM is not set # # Input device support @@ -3423,10 +3426,8 @@ CONFIG_IPWIRELESS=m # CONFIG_TCG_TPM is not set CONFIG_DEVPORT=y # CONFIG_XILLYBUS is not set -# end of Character devices - -CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_BOOTLOADER=y +# end of Character devices # # I2C support diff --git a/srcpkgs/linux5.4/files/ppc64-dotconfig b/srcpkgs/linux5.4/files/ppc64-dotconfig index 09957afc087c..4238fff5d038 100644 --- a/srcpkgs/linux5.4/files/ppc64-dotconfig +++ b/srcpkgs/linux5.4/files/ppc64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.4.180 Kernel Configuration +# Linux/powerpc 5.4.218 Kernel Configuration # # @@ -675,7 +675,6 @@ CONFIG_COMPAT_OLD_SIGACTION=y CONFIG_64BIT_TIME=y CONFIG_COMPAT_32BIT_TIME=y CONFIG_ARCH_HAS_PHYS_TO_DMA=y -CONFIG_REFCOUNT_FULL=y # CONFIG_LOCK_EVENT_COUNTS is not set CONFIG_ARCH_HAS_MEM_ENCRYPT=y @@ -2150,6 +2149,7 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_CDROM=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -2637,6 +2637,7 @@ CONFIG_FIREWIRE_NOSY=m CONFIG_MACINTOSH_DRIVERS=y CONFIG_ADB_PMU=y +CONFIG_ADB_PMU_EVENT=y CONFIG_ADB_PMU_LED=y CONFIG_ADB_PMU_LED_DISK=y CONFIG_PMAC_SMU=y @@ -3514,8 +3515,6 @@ CONFIG_IEEE802154_HWSIM=m # CONFIG_NETDEVSIM is not set CONFIG_NET_FAILOVER=m # CONFIG_ISDN is not set -CONFIG_NVM=y -# CONFIG_NVM_PBLK is not set # # Input device support @@ -4008,10 +4007,9 @@ CONFIG_DEVPORT=y CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYBUS_OF=m -# end of Character devices - # CONFIG_RANDOM_TRUST_CPU is not set CONFIG_RANDOM_TRUST_BOOTLOADER=y +# end of Character devices # # I2C support diff --git a/srcpkgs/linux5.4/files/ppc64le-dotconfig b/srcpkgs/linux5.4/files/ppc64le-dotconfig index 1f2bfd3ac7a9..391d316fb91b 100644 --- a/srcpkgs/linux5.4/files/ppc64le-dotconfig +++ b/srcpkgs/linux5.4/files/ppc64le-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.4.180 Kernel Configuration +# Linux/powerpc 5.4.218 Kernel Configuration # # @@ -604,7 +604,6 @@ CONFIG_COMPAT_OLD_SIGACTION=y CONFIG_64BIT_TIME=y CONFIG_COMPAT_32BIT_TIME=y CONFIG_ARCH_HAS_PHYS_TO_DMA=y -CONFIG_REFCOUNT_FULL=y # CONFIG_LOCK_EVENT_COUNTS is not set CONFIG_ARCH_HAS_MEM_ENCRYPT=y @@ -2053,6 +2052,7 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_CDROM=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -3363,8 +3363,6 @@ CONFIG_IEEE802154_HWSIM=m # CONFIG_NETDEVSIM is not set CONFIG_NET_FAILOVER=m # CONFIG_ISDN is not set -CONFIG_NVM=y -# CONFIG_NVM_PBLK is not set # # Input device support @@ -3844,10 +3842,9 @@ CONFIG_DEVPORT=y CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYBUS_OF=m -# end of Character devices - # CONFIG_RANDOM_TRUST_CPU is not set CONFIG_RANDOM_TRUST_BOOTLOADER=y +# end of Character devices # # I2C support diff --git a/srcpkgs/linux5.4/files/x86_64-dotconfig b/srcpkgs/linux5.4/files/x86_64-dotconfig index a613708a4c4f..ce0f81219dcf 100644 --- a/srcpkgs/linux5.4/files/x86_64-dotconfig +++ b/srcpkgs/linux5.4/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.4.193 Kernel Configuration +# Linux/x86_64 5.4.218 Kernel Configuration # # @@ -21,7 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y # CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION="_1" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_BUILD_SALT="" CONFIG_HAVE_KERNEL_GZIP=y @@ -804,8 +804,6 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y -CONFIG_ARCH_HAS_REFCOUNT=y -CONFIG_REFCOUNT_FULL=y CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y CONFIG_ARCH_USE_MEMREMAP_PROT=y # CONFIG_LOCK_EVENT_COUNTS is not set @@ -3982,10 +3980,9 @@ CONFIG_TELCLOCK=m CONFIG_DEVPORT=y CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m -# end of Character devices - # CONFIG_RANDOM_TRUST_CPU is not set CONFIG_RANDOM_TRUST_BOOTLOADER=y +# end of Character devices # # I2C support diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template index 02322021d223..1fb73395efab 100644 --- a/srcpkgs/linux5.4/template +++ b/srcpkgs/linux5.4/template @@ -1,15 +1,18 @@ # Template file for 'linux5.4' pkgname=linux5.4 -version=5.4.217 +version=5.4.218 revision=1 -wrksrc="linux-${version}" +wrksrc="linux-${version%.*}" short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Helmut Pozimski " license="GPL-2.0-only" homepage="https://www.kernel.org" -distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz" -checksum=2bb826cdf9b2cfce385fb5d51fc8070fe428e467bd3df4ae2a7eb6f0c0cc2e63 +distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz + https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz" +checksum="bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491 + 0e6d67a2db107fb9b6cdf0272076d80782c8a85311a1cd426a2f4c20c9cda97a" python_version=3 +skip_extraction="patch-${version}.xz" nodebug=yes # -dbg package is generated below manually nostrip=yes @@ -44,6 +47,11 @@ export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0} export KBUILD_BUILD_USER=voidlinux export KBUILD_BUILD_HOST=voidlinux +pre_patch() { + xzcat $XBPS_SRCDISTDIR/$pkgname-$version/patch-${version}.xz | + patch -sNp1 -F0 +} + do_configure() { # 5.4 misses Documentation/DocBook. We ship the directory from 4.12 here. cp -a $FILESDIR/DocBook -t Documentation