From 14f08ce1476f8854a176a01911fdfbffc558be15 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Wed, 16 Sep 2015 09:26:25 +0200
Subject: [PATCH] rpi-kernel: update to 4.1.7.

---
 srcpkgs/rpi-kernel/template | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index b61229d8f13..a38ff3e5851 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,10 +1,10 @@
 # Template file for 'rpi-kernel'
 #
-_githash="6b30ac82c3595887416c7870c35c2cc522f801cc"
+_githash="a43aae208a42640548b952838b450f31f731afd1"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=4.1.6
+version=4.1.7
 revision=1
 wrksrc="linux-${_githash}"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
@@ -12,7 +12,7 @@ homepage="http://www.kernel.org"
 license="GPL-2"
 short_desc="The Linux kernel for Raspberry Pi (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=98182df1da1b2f24fed340890c9819b4ec5337071e6f57ef067b7302ba084337
+checksum=41170d0ef8e0a7fdfb26acd27790df5aaf0d52b2315f8238242b44bf1c436a9a
 
 _kernver="${version}_${revision}"
 
@@ -49,13 +49,16 @@ do_configure() {
 	fi
 
 	# Use upstream default configuration, no need to maintain ours.
-	if [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
+	case "$XBPS_TARGET_MACHINE" in
+	armv7l*)
 		echo "CONFIG_USER_NS=y" >> arch/arm/configs/bcm2709_defconfig
 		make ${makejobs} ${_args} ARCH=arm bcm2709_defconfig
-	else
+		;;
+	armv6l*)
 		echo "CONFIG_USER_NS=y" >> arch/arm/configs/bcmrpi_defconfig
 		make ${makejobs} ${_args} ARCH=arm bcmrpi_defconfig
-	fi
+		;;
+	esac
 
 	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
 	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
@@ -78,11 +81,15 @@ do_install() {
 
 	vmkdir boot
 	# Generate kernel.img and install it to destdir.
-	if [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
+	case "$XBPS_TARGET_MACHINE" in
+	armv7l*)
 		./mkknlimg --dtok arch/arm/boot/zImage ${DESTDIR}/boot/kernel7.img
-	else
+		;;
+	armv6l*)
 		./mkknlimg --dtok arch/arm/boot/zImage ${DESTDIR}/boot/kernel.img
-	fi
+		;;
+	esac
+
 	vmkdir boot/overlays
 	mv arch/arm/boot/dts/overlays/*.dtb ${DESTDIR}/boot/overlays
 	mv arch/arm/boot/dts/*.dtb ${DESTDIR}/boot
@@ -174,7 +181,6 @@ rpi-kernel-headers_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	replaces="kernel-rpi-headers>=0"
 	short_desc="The Linux kernel headers for Raspberry Pi (${version%.*} series [git ${_gitshort}])"
 	pkg_install() {
 		vmove usr/src