Merge pull request #6781 from cr6gtx/linux-firmware

linux-firmware: update to 20170615

srcpkgs/linux-firmware/template

@@ -1,6 +1,6 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
-version=20170311
+version=20170615
 revision=1
 noarch=yes
 short_desc="Binary firmware blobs for the Linux kernel"
@@ -11,18 +11,13 @@ hostmakedepends="git"
 depends="${pkgname}-amd-${version}_${revision} ${pkgname}-network-${version}_${revision}"
 
 do_fetch() {
-	local _githash=695f2d6d82173f4e322d8f834c9849775778022a
+	local _githash=a3a26af24e29c818ef9b5661856018e21a5c49fb
 	local _url="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"
 	git clone ${_url} ${wrksrc}
 	cd ${wrksrc}
 	git checkout ${_githash}
-
-	# Restore old Bluetooth firmware
-	# https://bugzilla.kernel.org/show_bug.cgi?id=190831
-	# @pullmoll: Looks like it is fixed (Emmanuel Grumbach 2017-03-08 07:10:16 UTC: OK - close this for now)
-	# Leaving it enabled until someone confirms it isn't needed anymore
-	git checkout 9c71af939b51ce1431087acfb5b0f61c0b491c63 -- intel/ibt-11-5.{sfi,ddc}
 }
+
 do_install() {
 	vmkdir usr/lib/firmware
 	vmkdir usr/share/licenses/${pkgname}
@@ -41,10 +36,9 @@ linux-firmware-amd_package() {
 		vmove usr/share/licenses/linux-firmware/LICENSE.amdgpu
 		vmove usr/share/licenses/linux-firmware/LICENSE.amd-ucode
 		vmove usr/share/licenses/linux-firmware/LICENSE.radeon
-		# https://github.com/voidlinux/void-packages/issues/3505
-		ln -s bonaire_mc.bin ${PKGDESTDIR}/usr/lib/firmware/radeon/boniare_mc.bin
 	}
 }
+
 linux-firmware-intel_package() {
 	short_desc+=" - Intel CPU/GPU microcode"
 	noarch=yes
@@ -53,6 +47,7 @@ linux-firmware-intel_package() {
 		vmove usr/share/licenses/linux-firmware/LICENSE.i915
 	}
 }
+
 linux-firmware-nvidia_package() {
 	short_desc+=" NVIDIA GPU microcode"
 	noarch=yes
@@ -61,6 +56,7 @@ linux-firmware-nvidia_package() {
 		vmove usr/share/licenses/linux-firmware/LICENCE.nvidia*
 	}
 }
+
 linux-firmware-network_package() {
 	short_desc+=" - network"
 	noarch=yes