From 7a78ba25accdd2017ccfeca91f793c94819985a2 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 13 Mar 2018 12:48:29 +0100 Subject: [PATCH] linux4.15: update to 4.15.9. Set CONFIG_RTL8723BS=m. Closes #12457. Set CONFIG_MMC_RICOH_MMC=y. Closes #12377. --- srcpkgs/linux4.15/files/i386-dotconfig | 19 ++++++++++++++++--- srcpkgs/linux4.15/files/x86_64-dotconfig | 19 ++++++++++++++++--- srcpkgs/linux4.15/template | 4 ++-- 3 files changed, 34 insertions(+), 8 deletions(-) diff --git a/srcpkgs/linux4.15/files/i386-dotconfig b/srcpkgs/linux4.15/files/i386-dotconfig index 8f16f7a4c0..0b8790e106 100644 --- a/srcpkgs/linux4.15/files/i386-dotconfig +++ b/srcpkgs/linux4.15/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 4.15.1 Kernel Configuration +# Linux/x86 4.15.9 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2503,6 +2503,9 @@ CONFIG_MACB_USE_HWSTAMP=y CONFIG_MACB_PCI=m CONFIG_NET_VENDOR_BROADCOM=y CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y CONFIG_BNX2=m CONFIG_CNIC=m CONFIG_TIGON3=m @@ -2886,6 +2889,8 @@ CONFIG_B43_SSB=y CONFIG_B43_BUSES_BCMA_AND_SSB=y # CONFIG_B43_BUSES_BCMA is not set # CONFIG_B43_BUSES_SSB is not set +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_SDIO=y CONFIG_B43_BCMA_PIO=y CONFIG_B43_PIO=y @@ -2897,6 +2902,8 @@ CONFIG_B43_LEDS=y CONFIG_B43_HWRNG=y # CONFIG_B43_DEBUG is not set CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y CONFIG_B43LEGACY_LEDS=y CONFIG_B43LEGACY_HWRNG=y # CONFIG_B43LEGACY_DEBUG is not set @@ -4166,11 +4173,17 @@ CONFIG_SSB_POSSIBLE=y # Sonics Silicon Backplane # CONFIG_SSB=m +CONFIG_SSB_SPROM=y CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y CONFIG_SSB_SDIOHOST_POSSIBLE=y CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set # CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_DRIVER_GPIO=y CONFIG_BCMA_POSSIBLE=y CONFIG_BCMA=m @@ -6189,7 +6202,7 @@ CONFIG_SDIO_UART=m # CONFIG_MMC_DEBUG is not set CONFIG_MMC_SDHCI=m CONFIG_MMC_SDHCI_PCI=m -# CONFIG_MMC_RICOH_MMC is not set +CONFIG_MMC_RICOH_MMC=y CONFIG_MMC_SDHCI_ACPI=m CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_WBSD=m @@ -6710,7 +6723,7 @@ CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m CONFIG_RTL8192E=m -# CONFIG_RTL8723BS is not set +CONFIG_RTL8723BS=m CONFIG_R8712U=m CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y diff --git a/srcpkgs/linux4.15/files/x86_64-dotconfig b/srcpkgs/linux4.15/files/x86_64-dotconfig index 34b6cb4889..c8f4973443 100644 --- a/srcpkgs/linux4.15/files/x86_64-dotconfig +++ b/srcpkgs/linux4.15/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.15.1 Kernel Configuration +# Linux/x86 4.15.9 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -2539,6 +2539,9 @@ CONFIG_MACB_USE_HWSTAMP=y CONFIG_MACB_PCI=m CONFIG_NET_VENDOR_BROADCOM=y CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y CONFIG_BNX2=m CONFIG_CNIC=m CONFIG_TIGON3=m @@ -2936,6 +2939,8 @@ CONFIG_B43_SSB=y CONFIG_B43_BUSES_BCMA_AND_SSB=y # CONFIG_B43_BUSES_BCMA is not set # CONFIG_B43_BUSES_SSB is not set +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_SDIO=y CONFIG_B43_BCMA_PIO=y CONFIG_B43_PIO=y @@ -2947,6 +2952,8 @@ CONFIG_B43_LEDS=y CONFIG_B43_HWRNG=y # CONFIG_B43_DEBUG is not set CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y CONFIG_B43LEGACY_LEDS=y CONFIG_B43LEGACY_HWRNG=y # CONFIG_B43LEGACY_DEBUG is not set @@ -4210,11 +4217,17 @@ CONFIG_SSB_POSSIBLE=y # Sonics Silicon Backplane # CONFIG_SSB=m +CONFIG_SSB_SPROM=y CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y CONFIG_SSB_SDIOHOST_POSSIBLE=y CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set # CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_DRIVER_GPIO=y CONFIG_BCMA_POSSIBLE=y CONFIG_BCMA=m @@ -6227,7 +6240,7 @@ CONFIG_SDIO_UART=m # CONFIG_MMC_DEBUG is not set CONFIG_MMC_SDHCI=m CONFIG_MMC_SDHCI_PCI=m -# CONFIG_MMC_RICOH_MMC is not set +CONFIG_MMC_RICOH_MMC=y CONFIG_MMC_SDHCI_ACPI=m CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_WBSD=m @@ -6784,7 +6797,7 @@ CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m CONFIG_RTL8192E=m -# CONFIG_RTL8723BS is not set +CONFIG_RTL8723BS=m CONFIG_R8712U=m CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y diff --git a/srcpkgs/linux4.15/template b/srcpkgs/linux4.15/template index 812ba11e8c..b30f308be6 100644 --- a/srcpkgs/linux4.15/template +++ b/srcpkgs/linux4.15/template @@ -1,6 +1,6 @@ # Template file for 'linux4.15' pkgname=linux4.15 -version=4.15.8 +version=4.15.9 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=8ac071c4f7cd6d7673a6d98c3c58d138db1d0b2dc56f0b3c427e53ee9f99605a +checksum=dda015b2042e71c6d0df56de553846df1252eac486514000c76b741cde6d4492 nodebug=yes # -dbg package is generated below manually nostrip=yes