Update to 4.10.6_gnu-1

* fix mkinitcpio preset file for armv7h - Bug #1261 -> https://labs.parabola.nu/issues/1261

2 files changed, 15 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5873c7523a34..a2cd36bac027 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Wed Mar 22 21:40:16 UTC 2017
+# Thu Mar 30 04:37:43 UTC 2017
 pkgbase = linux-libre
-	pkgver = 4.10.4_gnu
+	pkgver = 4.10.6_gnu
 	pkgrel = 1
 	url = https://linux-libre.fsfla.org/
 	arch = i686
@@ -17,8 +17,8 @@ pkgbase = linux-libre
 	options = !strip
 	source = https://linux-libre.fsfla.org/pub/linux-libre/releases/4.10-gnu/linux-libre-4.10-gnu.tar.xz
 	source = https://linux-libre.fsfla.org/pub/linux-libre/releases/4.10-gnu/linux-libre-4.10-gnu.tar.xz.sign
-	source = https://linux-libre.fsfla.org/pub/linux-libre/releases/4.10.4-gnu/patch-4.10-gnu-4.10.4-gnu.xz
-	source = https://linux-libre.fsfla.org/pub/linux-libre/releases/4.10.4-gnu/patch-4.10-gnu-4.10.4-gnu.xz.sign
+	source = https://linux-libre.fsfla.org/pub/linux-libre/releases/4.10.6-gnu/patch-4.10-gnu-4.10.6-gnu.xz
+	source = https://linux-libre.fsfla.org/pub/linux-libre/releases/4.10.6-gnu/patch-4.10-gnu-4.10.6-gnu.xz.sign
 	source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm
 	source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm.sig
 	source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm
@@ -32,8 +32,8 @@ pkgbase = linux-libre
 	source = linux.preset
 	source = 0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
 	source = 0002-fix-Atmel-maXTouch-touchscreen-support.patch
-	source = https://repo.parabola.nu/other/rcn-libre/patches/4.10.4/rcn-libre-4.10.4-armv7-x1.patch
-	source = https://repo.parabola.nu/other/rcn-libre/patches/4.10.4/rcn-libre-4.10.4-armv7-x1.patch.sig
+	source = https://repo.parabola.nu/other/rcn-libre/patches/4.10.6/rcn-libre-4.10.6-armv7-x1.patch
+	source = https://repo.parabola.nu/other/rcn-libre/patches/4.10.6/rcn-libre-4.10.6-armv7-x1.patch.sig
 	source = 0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
 	source = 0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
 	source = 0003-SMILE-Plug-device-tree-file.patch
@@ -46,7 +46,7 @@ pkgbase = linux-libre
 	source = 0010-disable-USB3-port-on-ODROID-XU.patch
 	sha512sums = 44d1774a1d43a15322297d351737fbcbf92c6f433266ce2b17587437d433562cf5811fdae48fafd5a8e00d18ed9ac2e1ad4b12a657f322eb234384316ad131e0
 	sha512sums = SKIP
-	sha512sums = fec60e9e40df2991ea9770786cfc5baf7cc1baf6d9e41427e3cb68c471779a21fb7374bd739aa168171198f76c35022bab4118ab21c95f90a7bd6d2cd305bc58
+	sha512sums = 4390c92afb02678e416fab6cc988139463c247047d09d4e0f69677e2239f05d8aa412842de383a3e7de603c979b1f2786017cd398fe931ba25a5b554d666ad9b
 	sha512sums = SKIP
 	sha512sums = 13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3
 	sha512sums = SKIP
@@ -83,21 +83,21 @@ pkgname = linux-libre
 	depends = kmod
 	depends = mkinitcpio>=0.7
 	optdepends = crda: to set the correct wireless channels of your country
-	provides = linux=4.10.4
-	provides = LINUX-ABI_VERSION=4.10.4
+	provides = linux=4.10.6
+	provides = LINUX-ABI_VERSION=4.10.6
 	conflicts = 
 	replaces = 
 	backup = etc/mkinitcpio.d/linux-libre.preset
 
 pkgname = linux-libre-headers
 	pkgdesc = Header files and scripts for building modules for Linux-libre kernel
-	provides = linux-headers=4.10.4
+	provides = linux-headers=4.10.6
 	conflicts = 
 	replaces = 
 
 pkgname = linux-libre-docs
 	pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-libre kernel
-	provides = linux-docs=4.10.4
+	provides = linux-docs=4.10.6
 	conflicts = 
 	replaces = 
 
diff --git a/PKGBUILD b/PKGBUILD
index 7c20319a887f..5303495adc4b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
 pkgbase=linux-libre         # Build stock kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _pkgbasever=4.10-gnu
-_pkgver=4.10.4-gnu
+_pkgver=4.10.6-gnu
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=() # '%' gets replaced with _kernelname
@@ -61,7 +61,7 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l
         '0010-disable-USB3-port-on-ODROID-XU.patch')
 sha512sums=('44d1774a1d43a15322297d351737fbcbf92c6f433266ce2b17587437d433562cf5811fdae48fafd5a8e00d18ed9ac2e1ad4b12a657f322eb234384316ad131e0'
             'SKIP'
-            'fec60e9e40df2991ea9770786cfc5baf7cc1baf6d9e41427e3cb68c471779a21fb7374bd739aa168171198f76c35022bab4118ab21c95f90a7bd6d2cd305bc58'
+            '4390c92afb02678e416fab6cc988139463c247047d09d4e0f69677e2239f05d8aa412842de383a3e7de603c979b1f2786017cd398fe931ba25a5b554d666ad9b'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -215,7 +215,8 @@ _package() {
 
   # install mkinitcpio preset file for kernel
   if [ "${CARCH}" = "armv7h" ]; then
-    sed "s|/boot/vmlinuz-%PKGBASE%|${_kernver}|g" "${srcdir}/linux.preset" |
+    sed "s|/boot/vmlinuz-%PKGBASE%|${_kernver}|g
+         s|%PKGBASE%|${pkgbase}|g" "${srcdir}/linux.preset" |
       install -D -m644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
   elif [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then
     sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/linux.preset" |