autu: Update to 4.4.216-1

5 files changed, 40 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b16930317fcc..e7cd9af52dad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Sun Feb 16 21:54:03 UTC 2020
+# Thu Mar 19 20:15:43 UTC 2020
 pkgbase = linux-lts44
-	pkgver = 4.4.214
+	pkgver = 4.4.216
 	pkgrel = 1
 	url = https://www.kernel.org/
 	arch = x86_64
@@ -13,29 +13,32 @@ pkgbase = linux-lts44
 	makedepends = libelf
 	options = !strip
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.214.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.216.xz
 	source = config
 	source = 60-linux.hook
 	source = 90-linux.hook
 	source = linux-lts.preset
 	source = change-default-console-loglevel.patch
 	source = 0001-sdhci-revert.patch
+	source = 0002-binutils.2.34.sysexit.patch
 	md5sums = 9a78fa2eb6c68ca5a40ed5af08142599
-	md5sums = 84a0f3e39065423ea85516c55dd5d8b0
+	md5sums = e0161027bbd1fc7fb30192cab9e87f75
 	md5sums = a222765e40974acb8318be704f472141
 	md5sums = ce6c81ad1ad1f8b333fd6077d47abdaf
 	md5sums = a85bfae59eb537b973c388ffadb281ff
 	md5sums = a329f9581060d555dc7358483de9760a
 	md5sums = df7fceae6ee5d7e7be7b60ecd7f6bb35
 	md5sums = e1093d9bc718f362344ab56b85d4fb76
+	md5sums = 43d62abf4cd27fa1863759ac87b62ac5
 	sha256sums = 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2
-	sha256sums = 87cce2c33034b51cd24c0ecb0553550cdd4347718dbe7a3ca8d1e9daea4b2fa3
+	sha256sums = d9d7d2701e094eac2004dba2fac5870dc405c1f8d504d1d8627e64bcafd75fc0
 	sha256sums = c5115da0395fe7da1d30e1fd53faabf55bc6a9f616b8d1e22918f5c4933dac56
 	sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
 	sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
 	sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
 	sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
 	sha256sums = 5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375
+	sha256sums = 2c80046fa78bfa6e26ae6d8ac312142d9d67b394914fee423578583fe7ab15db
 
 pkgname = linux-lts44
 	pkgdesc = The Linux-lts44 kernel and modules
@@ -45,12 +48,12 @@ pkgname = linux-lts44
 	depends = kmod
 	depends = mkinitcpio>=0.7
 	optdepends = crda: to set the correct wireless channels of your country
-	provides = linux=4.4.214
+	provides = linux=4.4.216
 	backup = etc/mkinitcpio.d/linux-lts44.preset
 
 pkgname = linux-lts44-headers
 	pkgdesc = Header files and scripts for building modules for Linux-lts44 kernel
-	provides = linux-headers=4.4.214
+	provides = linux-headers=4.4.216
 
 pkgname = linux-lts44-docs
 	pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-lts44 kernel
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f977682f588d..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.xz
-linux.install.pkg
diff --git a/0002-binutils.2.34.sysexit.patch b/0002-binutils.2.34.sysexit.patch
new file mode 100644
index 000000000000..dcaf62b1520d
--- /dev/null
+++ b/0002-binutils.2.34.sysexit.patch
@@ -0,0 +1,18 @@
+diff -up linux-4.4/arch/x86/Makefile.orig linux-4.4/arch/x86/Makefile
+--- linux-4.4/arch/x86/Makefile.orig	2020-03-19 03:08:53.569999999 -0600
++++ linux-4.4/arch/x86/Makefile	2020-03-19 03:38:57.889999999 -0600
+@@ -218,6 +218,14 @@ KBUILD_CFLAGS += -fno-asynchronous-unwin
+ KBUILD_CFLAGS += $(mflags-y)
+ KBUILD_AFLAGS += $(mflags-y)
+ 
++#
++# Binutils 2.34 cannot handle sysexit, this corrects for now.
++#
++ifdef CONFIG_X86_64
++KBUILD_AFLAGS += -Wa,-mintel64
++KBUILD_CFLAGS += -Wa,-mintel64
++endif
++
+ # Avoid indirect branches in kernel to deal with Spectre
+ ifdef CONFIG_RETPOLINE
+     RETPOLINE_CFLAGS += $(call cc-option,-mindirect-branch=thunk-extern -mindirect-branch-register)
diff --git a/PKGBUILD b/PKGBUILD
index dd9d33997010..112b14b7a55d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 set -u
 pkgbase="linux-lts44"
-pkgver="4.4.214"
+pkgver="4.4.216"
 _srcname="linux-${pkgver%.*}"
 pkgrel='1'
 arch=('x86_64')
@@ -21,27 +21,30 @@ source=(
   'linux-lts.preset'   # standard config files for mkinitcpio ramdisk
   'change-default-console-loglevel.patch'
   '0001-sdhci-revert.patch'
+  '0002-binutils.2.34.sysexit.patch' # https://gist.github.com/bbidulock/263c5c3aee34e3a1b09dca0b937c210b
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds <torvalds@linux-foundation.org>
   '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman (Linux kernel stable release signing key) <greg@kroah.com>
 )
 md5sums=('9a78fa2eb6c68ca5a40ed5af08142599'
-         '84a0f3e39065423ea85516c55dd5d8b0'
+         'e0161027bbd1fc7fb30192cab9e87f75'
          'a222765e40974acb8318be704f472141'
          'ce6c81ad1ad1f8b333fd6077d47abdaf'
          'a85bfae59eb537b973c388ffadb281ff'
          'a329f9581060d555dc7358483de9760a'
          'df7fceae6ee5d7e7be7b60ecd7f6bb35'
-         'e1093d9bc718f362344ab56b85d4fb76')
+         'e1093d9bc718f362344ab56b85d4fb76'
+         '43d62abf4cd27fa1863759ac87b62ac5')
 sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2'
-            '87cce2c33034b51cd24c0ecb0553550cdd4347718dbe7a3ca8d1e9daea4b2fa3'
+            'd9d7d2701e094eac2004dba2fac5870dc405c1f8d504d1d8627e64bcafd75fc0'
             'c5115da0395fe7da1d30e1fd53faabf55bc6a9f616b8d1e22918f5c4933dac56'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
-            '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375')
+            '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375'
+            '2c80046fa78bfa6e26ae6d8ac312142d9d67b394914fee423578583fe7ab15db')
 
 _kernelname=${pkgbase#linux}
 
@@ -68,13 +71,16 @@ prepare() {
   # revert http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=9faac7b95ea4f9e83b7a914084cc81ef1632fd91
   # fixes #47778 sdhci broken on some boards
   # https://bugzilla.kernel.org/show_bug.cgi?id=106541
-  patch -NuRp1 -i "${srcdir}/0001-sdhci-revert.patch"
+  patch -Nup1 -R -i "${srcdir}/0001-sdhci-revert.patch"
 
   # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Nup1 -i "${srcdir}/change-default-console-loglevel.patch"
 
+  # Fix for binutils 2.34
+  patch -Nup1 -i "${srcdir}/0002-binutils.2.34.sysexit.patch"
+
   # Local or private patches
   shopt -s nullglob
   local _lpatch
diff --git a/update.sh b/update.sh
deleted file mode 100755
index 7856af187c25..000000000000
--- a/update.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-cd "$(dirname "$0")"
-
-RELEASES_URL="https://www.kernel.org/releases.json"
-SHA256SUMS_URL="https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc"
-
-VERSION="$(curl -sSLf "$RELEASES_URL" |
-    jq -r '[.releases[].version] | map(select(startswith("4.4.")))[]')"
-
-HASH="$(curl -sSLf "$SHA256SUMS_URL" |
-    awk "\$2 == \"patch-$VERSION.xz\" {print \$1}")"
-
-sed -i \
-    -e "s/^pkgver=.*/pkgver=${VERSION}/" \
-    -e 's/^pkgrel=.*/pkgrel=1/' \
-    -e "s/.* # patch$/            '$HASH' # patch/" \
-    PKGBUILD
-
-makepkg --printsrcinfo > .SRCINFO
-
-git add -u
-if ! git diff-index --quiet HEAD; then
-    git commit -m "Updated to $VERSION"
-fi