Update to 4.6.1_gnu-2

* use _$CARCH variables instead of using an `if` block
* add libelf to makedepends
* fix flicker problem

1 files changed, 20 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cb54aca02d8d..2c3ac5e1e2d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed May 18 14:21:32 UTC 2016
+# Mon Jun  6 00:03:45 UTC 2016
 pkgbase = linux-libre
-	pkgver = 4.6_gnu
-	pkgrel = 1
+	pkgver = 4.6.1_gnu
+	pkgrel = 2
 	url = http://linux-libre.fsfla.org/
 	arch = i686
 	arch = x86_64
@@ -13,9 +13,12 @@ pkgbase = linux-libre
 	makedepends = kmod
 	makedepends = inetutils
 	makedepends = bc
+	makedepends = libelf
 	options = !strip
 	source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.6-gnu/linux-libre-4.6-gnu.tar.xz
 	source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.6-gnu/linux-libre-4.6-gnu.tar.xz.sign
+	source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.6.1-gnu/patch-4.6-gnu-4.6.1-gnu.xz
+	source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.6.1-gnu/patch-4.6-gnu-4.6.1-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
@@ -27,10 +30,11 @@ pkgbase = linux-libre
 	source = config.armv7h
 	source = linux.preset
 	source = change-default-console-loglevel.patch
+	source = 0001-linux-4.6-drm-i915-psr.patch
 	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.6/rcn-libre-4.6-armv7-x2.patch
-	source = https://repo.parabola.nu/other/rcn-libre/patches/4.6/rcn-libre-4.6-armv7-x2.patch.sig
+	source = https://repo.parabola.nu/other/rcn-libre/patches/4.6.1/rcn-libre-4.6.1-armv7-x4.patch
+	source = https://repo.parabola.nu/other/rcn-libre/patches/4.6.1/rcn-libre-4.6.1-armv7-x4.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
@@ -41,6 +45,8 @@ pkgbase = linux-libre
 	source = 0008-USB-armory-support.patch
 	sha256sums = c3726ad785b2f4534c78a2cff1dd09906dde8b82775e55860a6091b16bf62ef8
 	sha256sums = SKIP
+	sha256sums = 663f30c19792e5de130d3adbb41d0ce76c03717b38e596c23e4c62ec29ff10f0
+	sha256sums = SKIP
 	sha256sums = bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494
 	sha256sums = SKIP
 	sha256sums = 13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74
@@ -49,12 +55,13 @@ pkgbase = linux-libre
 	sha256sums = SKIP
 	sha256sums = 61e60b3a914744d85b030aa1c5f923308fcb9c05ac244d01b8b25820de9cdac0
 	sha256sums = 7959e923a90555432db595b9da677668839bd37ef4f2c920d22eb7ab9013e63e
-	sha256sums = 7fe3eabb27fbfab161df63dba1d638f60074b8ad8c39f9c78c83d4265027500c
+	sha256sums = 7a286c6d42c2b7cbf778428e215a61fd13958d6a89349a7f508a76b738d4bace
 	sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c
 	sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
+	sha256sums = b719c3bd58d71a9e0d76b3674e854419ebec4a3fa9f8a4823f23639720527e83
 	sha256sums = 0376bd5efa31d4e2a9d52558777cebd9f0941df8e1adab916c868bf0c05f2fc3
 	sha256sums = 351fd96be8cd5ebd0435c0a8a978673fc023e3b1026085e67f86d815b2285e25
-	sha256sums = d05febd9fdec0ea8c7e21e01beabb6b2b0f7f021d41538077b5c6ec27bacf9fe
+	sha256sums = f74b28e9e3b6434c1bb7803f9751a068299206953519a9e61162538f5dd8be7e
 	sha256sums = SKIP
 	sha256sums = 9fc2533ed95497583752c6eca931f24c159be956fcc49d39cac64da7298a9c88
 	sha256sums = 909c046f6123ec81764fde5d9a78431a9dc3b206ce01119ae4d91be54d9471dd
@@ -64,6 +71,7 @@ pkgbase = linux-libre
 	sha256sums = 9ade3a63d0d1b4004af3733b0853a4c4d6837d933f30a462045214e2a4354a7a
 	sha256sums = bd41dd7fa8241781c150f783d55317c2d6d7dd31834619b12504d7277fe91574
 	sha256sums = f9626d188c76f387da62c6294b09f5fa4d94f5b1534ce2891bef7a99c7b40d2b
+	makedepends_armv7h = git
 
 pkgname = linux-libre
 	pkgdesc = The Linux-libre kernel and modules
@@ -71,22 +79,22 @@ pkgname = linux-libre
 	depends = coreutils
 	depends = linux-libre-firmware
 	depends = kmod
-	depends = mkinitcpio>=0.7
 	optdepends = crda: to set the correct wireless channels of your country
-	provides = linux=4.6
+	provides = linux=4.6.1
 	conflicts = 
 	replaces = linux
-	backup = etc/mkinitcpio.d/linux-libre.preset
+	depends_i686 = mkinitcpio>=0.7
+	depends_x86_64 = mkinitcpio>=0.7
 
 pkgname = linux-libre-headers
 	pkgdesc = Header files and scripts for building modules for Linux-libre kernel
-	provides = linux-headers=4.6
+	provides = linux-headers=4.6.1
 	conflicts = 
 	replaces = linux-headers
 
 pkgname = linux-libre-docs
 	pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-libre kernel
-	provides = linux-docs=4.6
+	provides = linux-docs=4.6.1
 	conflicts = 
 	replaces = linux-docs