upgpkg: libre/linux-libre 4.17.11_gnu-1

Signed-off-by: David P <megver83@parabola.nu>

3 files changed, 24 insertions, 59 deletions

diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 4c2ffaa2d..b80a5bf42 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -13,7 +13,8 @@
 pkgbase=linux-libre         # Build stock kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _pkgbasever=4.17-gnu
-_pkgver=4.17.10-gnu
+_pkgver=4.17.11-gnu
+_archpatchver=arch1
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=() # '%' gets replaced with _kernelname
@@ -23,7 +24,7 @@ _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}
 pkgrel=1
-rcnrel=armv7-x10
+rcnrel=armv7-x11
 arch=('i686' 'x86_64' 'armv7h')
 url="https://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -32,6 +33,7 @@ options=('!strip')
 source=(
   "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz"{,.sign}
   "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz"{,.sign}
+  "https://repo.parabola.nu/other/arch/patches/${_pkgver%-*}/patch-${_pkgver%-*}-${_archpatchver}.patch"{,.sig}
   "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm"{,.sig}
   "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm"{,.sig}
   "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_vga16.ppm"{,.sig}
@@ -60,10 +62,6 @@ source=(
   # other patches
   '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
   '0002-fix-Atmel-maXTouch-touchscreen-support.patch'
-  '0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch'
-  '0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch'
-  '0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch'
-  '0004-mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch'
 )
 validpgpkeys=(
   '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
@@ -71,7 +69,9 @@ validpgpkeys=(
 )
 sha512sums=('a09014005d64839e958cabb20dbd50e051907b1afea2f517f41f0a9312fa1bc8447690e64ec0e6488a778be8a7384891c003f39029ff5799f9884482628aadf2'
             'SKIP'
-            '26e44c0cdb1236ebb7e513e0f161f0205262fa79318713b220468a931020574754231d3363523bd5ad03c2397829e6e827a2b1bf0a312379a25c8a0af9d20515'
+            'a977ac21aa66b7d01ccc207f74d6213cdeed7ab0dd40c5569f97a97f42244c9db002f79d84ad6b4583d1a3b5f357f55bb12da214078c919ac2b70800b0b6ae69'
+            'SKIP'
+            'f7a54457093981f74282d862aeba704c3ec49ae550448230294ac9cfcb6cf0ac0b62f6948855b9b505e2af5e748b782facde14c107c6d2b448f818cdc27c6188'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -80,12 +80,12 @@ sha512sums=('a09014005d64839e958cabb20dbd50e051907b1afea2f517f41f0a9312fa1bc8447
             '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'
             'SKIP'
             '428f647e31577d1652b87f4ffd36a3120ff3e8ddd7e0cdcd1da07fbc8811957dc3b24a5ff48b5ba638209b9e09ac1201d44cfb82e1316c00aff932662c1dd0ae'
-            '6fc7547e0acab81cf30ebad06ee87a493b20e57ec0dbb59fc1a675ca282a44d5964f45b0907979033a64d1b63a9062a51de55fe61c4d6de25861a1c80221c7c7'
-            '9cc75ae04f3200ac9385654b78c66e31d262c3e40072bdc074dadd521653bc97b79d738b10daf4903d46aee0c7b859a8382c00d3a051b51041b34afd3111cd85'
+            'e80abd50dd477b7c9937f99537a72c7ee1a481aa19173f7a0747016d8017dd67535b18fe67449df575dcd008926b7085b4ecae827461afd0a7d4cfe31be8c9d6'
+            'c5e0052ee043ea4dc25959d41139930e21461840b3461b4f49a316ef130529d61a84b69bdf65acc6d007a03370071a7974949a2ba83674ff97ef756d53dd0c35'
             '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
             '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
-            '93909dee8e89a5e243489c3c47b6b1023b4064bea7688e6d395912383e1d2e69b64c2dea161ef85ce9a52ff24b0de8fe975297cd1b17eaebc1f72a9d6a5cafbe'
+            '600a373e26f7755f5a4c7cbc84d713cd8670cacf8891ec00e728818622a312cef3d2073a656dcda50e05ae8b2fdfe103b4ae5b6a2fe8387c3fc2674402c426dc'
             'SKIP'
             'c6e758931e599199db07276a51b204a4030e0da80f08df60783278cf3d4d3ee6c0c280cc1788ca024cdf2043a39dd527e2205dd678368097b68240a7e80b931c'
             '3e0852e188549e60fa35b70e82740d5124936688d5f5ff0314c4e555ad9cc4c7688c56b5949baa8fd67ede22a579019919b09091b59eafac60409fdf18105af5'
@@ -102,11 +102,7 @@ sha512sums=('a09014005d64839e958cabb20dbd50e051907b1afea2f517f41f0a9312fa1bc8447
             '1d0626f6e95ffe71dbbf281167d312a8acfc300930b39e80ef7771a2b65091e974e2ec703d463d8fc16d36472f5f5deb28b77d854c0e96685d31e42040d18f6d'
             'a4d72cdcddc3f43f27e0d415e1d8ce45bc552ee07d29b566cd8128715daf8267f549968434ca6a949b39aed8bbd6b8790f65f7f4641d8008d1b856d8f1a8ee94'
             '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
-            'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
-            'd7160f9a3560c95736d43bc75601a73d507c55b80bd8466bc60b19209fd5d672312db34572bc813df9df4322906032d55ce744df1c05db4bbde014ae92f6241e'
-            'ea157e29d4c7d2121586eb1dbcbbb3b15a3cf0074469fbc957ba3f660f71cfe2825da7d7d58824c22d02abbe7995d32491ec381741c5e7ae83e88f6e14944d6e'
-            '8f70e4145486c1567c58663bcd9b6e2e519d21f682103edefd916ec9cd1275802f61685dc0f8255471023fd39591f3bbd7ad9293751f6cd3d33580b664d44b3d'
-            'f82aecc333581c08b75014a39504c184724802203551b601354452b18ae80e69b5fc8d14f1eb86f75423e9907e13dbe7dbede8758be6477a42dd85238c229b05')
+            'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168')
 
 _kernelname=${pkgbase#linux-libre}
 _replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}")
@@ -125,7 +121,12 @@ prepare() {
   if [ "${_pkgbasever}" != "${_pkgver}" ]; then
     patch -p1 -i ../patch-${_pkgbasever}-${_pkgver}
   fi
-  
+
+  # add Arch Linux kernel patch
+  if [ -e ../patch-${_pkgver%-*}-${_archpatchver}.patch ]; then
+    patch -p1 -i ../patch-${_pkgver%-*}-${_archpatchver}.patch
+  fi
+
   if [ "${CARCH}" = "armv7h" ]; then
     # RCN patch (CM3 firmware deblobbed and AUFS/WireGuard removed)
     # Note: For stability reasons, AUFS has been removed in the RCN patch.
@@ -154,21 +155,6 @@ prepare() {
   install -m644 -t drivers/video/logo \
     ../logo_linux_{clut224.ppm,vga16.ppm,mono.pbm}
 
-  # add latest fixes from stable queue, if needed
-  # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
-
-  # disable USER_NS for non-root users by default
-  patch -Np1 -i ../0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
-
-  # https://bugs.archlinux.org/task/56711
-  patch -Np1 -i ../0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
-
-  # https://bugs.archlinux.org/task/56780
-  patch -Np1 -i ../0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch
-
-  # Fix iwd provoking a BUG
-  patch -Np1 -i ../0004-mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch
-
   # maintain the TTY over USB disconnects
   # http://www.coreboot.org/EHCI_Gadget_Debug
   patch -p1 -i ../0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
@@ -178,32 +164,12 @@ prepare() {
   # http://www.fsfla.org/pipermail/linux-libre/2015-November/003202.html
   patch -p1 -i ../0002-fix-Atmel-maXTouch-touchscreen-support.patch
 
-  cat ../config.${CARCH} - >.config <<END
-CONFIG_LOCALVERSION="${_kernelname}"
-CONFIG_LOCALVERSION_AUTO=n
-END
-
   # append pkgrel to extraversion and empty localversion
   sed -e "/^EXTRAVERSION = -gnu/s/-gnu.*/-gnu-${pkgrel}/" \
       -e "/^EXTRAVERSION =/aLOCALVERSION =" \
       -i Makefile
 
-  # don't run depmod on 'make install'. We'll do this ourselves in packaging
-  sed -i '2iexit 0' scripts/depmod.sh
-
-  # get kernel version
-  make prepare
-
-  # load configuration
-  # Configure the kernel. Replace the line below with one of your choice.
-  #make menuconfig # CLI menu for configuration
-  #make nconfig # new CLI menu for configuration
-  #make xconfig # X-based configuration
-  #make oldconfig # using old config from previous kernel version
-  # ... or manually edit .config
-
-  # rewrite configuration
-  yes "" | make config >/dev/null
+  make olddefconfig
 }
 
 build() {
@@ -235,7 +201,7 @@ _package() {
   _basekernel=${_basekernel%.*}
 
   mkdir -p "${pkgdir}"/{boot,usr/lib/modules}
-  make INSTALL_MOD_PATH="${pkgdir}/usr" modules_install
+  make INSTALL_MOD_PATH="${pkgdir}/usr" DEPMOD=/doesnt/exist modules_install
   if [ "${CARCH}" = "armv7h" ]; then
     make LOCALVERSION= INSTALL_DTBS_PATH="${pkgdir}/boot/dtbs/${pkgbase}" dtbs_install
     cp arch/$KARCH/boot/zImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
diff --git a/libre/linux-libre/config.armv7h b/libre/linux-libre/config.armv7h
index b0bea0eba..156eb0f5d 100644
--- a/libre/linux-libre/config.armv7h
+++ b/libre/linux-libre/config.armv7h
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.17.6-gnu-1 Kernel Configuration
+# Linux/arm 4.17.11-gnu-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -7875,8 +7875,8 @@ CONFIG_FPGA_MGR_SOCFPGA=m
 CONFIG_FPGA_MGR_SOCFPGA_A10=m
 CONFIG_ALTERA_PR_IP_CORE=m
 CONFIG_ALTERA_PR_IP_CORE_PLAT=m
-# CONFIG_FPGA_MGR_ALTERA_PS_SPI is not set
-# CONFIG_FPGA_MGR_ALTERA_CVP is not set
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
 CONFIG_FPGA_MGR_ZYNQ_FPGA=m
 CONFIG_FPGA_MGR_XILINX_SPI=m
 CONFIG_FPGA_MGR_ICE40_SPI=m
@@ -8181,7 +8181,7 @@ CONFIG_CIFS_FSCACHE=y
 # CONFIG_9P_FS is not set
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_CODEPAGE_737=m
 CONFIG_NLS_CODEPAGE_775=m
 CONFIG_NLS_CODEPAGE_850=m
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 6ef7e4503..a8e2c920a 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.17.6-gnu-1 Kernel Configuration
+# Linux/x86 4.17.11-gnu-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -9252,7 +9252,6 @@ CONFIG_CRYPTO_DES3_EDE_X86_64=m
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20_X86_64=m
 CONFIG_CRYPTO_SEED=m