updpkg: libre/linux-libre-hardened 4.13.9_gnu.a-1

libre/linux-libre-pck 4.13.9_gnu.pck1-1

12 files changed, 45 insertions, 95 deletions

diff --git a/kernels/linux-libre-knock/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/kernels/linux-libre-knock/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
index b0463fae8..47f149aa5 100644
--- a/kernels/linux-libre-knock/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
+++ b/kernels/linux-libre-knock/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
@@ -1,4 +1,4 @@
-From 917b58ee1f0fe801d59103e3bb8eb147f256c2f5 Mon Sep 17 00:00:00 2001
+From 81e89a314fb1e70274c2ec72013ba0a076de55dd Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:59:28 +0100
 Subject: [PATCH 1/9] ARM: atags: add support for Marvell's u-boot
@@ -47,5 +47,5 @@ index 979ff4016404..d1d0c1950fa4 100644
  };
  
 -- 
-2.12.1
+2.13.0
 
diff --git a/kernels/linux-libre-knock/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/kernels/linux-libre-knock/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
index 2ab3143ef..ccc42d67e 100644
--- a/kernels/linux-libre-knock/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
+++ b/kernels/linux-libre-knock/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
@@ -1,4 +1,4 @@
-From 8f2e8ce8901c2da8c69ba68a472e2091be3bb512 Mon Sep 17 00:00:00 2001
+From e62b74b84f4b146e0b82d6acf1c043dc599ea884 Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:56:58 +0100
 Subject: [PATCH 2/9] ARM: atags/fdt: retrieve MAC addresses from Marvell boot
@@ -43,5 +43,5 @@ index 9448aa0c6686..ac7b6ae6c00f 100644
  	}
  
 -- 
-2.12.1
+2.13.0
 
diff --git a/kernels/linux-libre-knock/0003-SMILE-Plug-device-tree-file.patch b/kernels/linux-libre-knock/0003-SMILE-Plug-device-tree-file.patch
index adb4ad070..5976f1a80 100644
--- a/kernels/linux-libre-knock/0003-SMILE-Plug-device-tree-file.patch
+++ b/kernels/linux-libre-knock/0003-SMILE-Plug-device-tree-file.patch
@@ -1,4 +1,4 @@
-From 4905eee60c7a744fb9b15ec357dccd01d0caaba9 Mon Sep 17 00:00:00 2001
+From 8a920b8030a9a677dd6d38cf0305e7bf63617a61 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:41:19 -0600
 Subject: [PATCH 3/9] SMILE Plug device tree file
@@ -14,10 +14,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  create mode 100644 arch/arm/boot/dts/armada-370-smileplug.dts
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 01d178a2009f..85f6d6661443 100644
+index 9c5e1d944d1c..342ed08ab225 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -935,6 +935,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
+@@ -985,6 +985,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
  	armada-370-db.dtb \
  	armada-370-dlink-dns327l.dtb \
  	armada-370-mirabox.dtb \
@@ -205,5 +205,5 @@ index 000000000000..d01308ab848b
 +	};
 +};
 -- 
-2.12.1
+2.13.0
 
diff --git a/kernels/linux-libre-knock/0004-fix-mvsdio-eMMC-timing.patch b/kernels/linux-libre-knock/0004-fix-mvsdio-eMMC-timing.patch
index b599ba410..b9e969f7a 100644
--- a/kernels/linux-libre-knock/0004-fix-mvsdio-eMMC-timing.patch
+++ b/kernels/linux-libre-knock/0004-fix-mvsdio-eMMC-timing.patch
@@ -1,4 +1,4 @@
-From 0188343b28b4019a7502ca492f55fb2e7f9eb6f2 Mon Sep 17 00:00:00 2001
+From 9ef8feb3e1a701eacd6979653511e1b13b095697 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:43:56 -0600
 Subject: [PATCH 4/9] fix mvsdio eMMC timing
@@ -12,7 +12,7 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
-index 42296e55b9de..e5ce6d27ec82 100644
+index 58d74b8d6c79..c9715530d676 100644
 --- a/drivers/mmc/host/mvsdio.c
 +++ b/drivers/mmc/host/mvsdio.c
 @@ -93,7 +93,7 @@ static int mvsd_setup_data(struct mvsd_host *host, struct mmc_data *data)
@@ -24,7 +24,7 @@ index 42296e55b9de..e5ce6d27ec82 100644
  		tmout_index = MVSD_HOST_CTRL_TMOUT_MAX;
  
  	dev_dbg(host->dev, "data %s at 0x%08x: blocks=%d blksz=%d tmout=%u (%d)\n",
-@@ -615,6 +615,8 @@ static void mvsd_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
+@@ -614,6 +614,8 @@ static void mvsd_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
  		u32 m = DIV_ROUND_UP(host->base_clock, ios->clock) - 1;
  		if (m > MVSD_BASE_DIV_MAX)
  			m = MVSD_BASE_DIV_MAX;
@@ -34,5 +34,5 @@ index 42296e55b9de..e5ce6d27ec82 100644
  		host->clock = ios->clock;
  		host->ns_per_clk = 1000000000 / (host->base_clock / (m+1));
 -- 
-2.12.1
+2.13.0
 
diff --git a/kernels/linux-libre-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/kernels/linux-libre-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
index b9c1238df..0cbd821c5 100644
--- a/kernels/linux-libre-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
+++ b/kernels/linux-libre-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
@@ -1,4 +1,4 @@
-From d24fd01bc56e4dccfb16826da9cf53e92efc24f7 Mon Sep 17 00:00:00 2001
+From d52a089f2564db419f6a9b4109ccda69e847793d Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 18 Feb 2014 01:43:50 -0300
 Subject: [PATCH 5/9] net/smsc95xx: Allow mac address to be set as a parameter
@@ -8,7 +8,7 @@ Subject: [PATCH 5/9] net/smsc95xx: Allow mac address to be set as a parameter
  1 file changed, 56 insertions(+)
 
 diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
-index 831aa33d078a..03625547d794 100644
+index 765400b62168..ee3212f887e3 100644
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
 @@ -60,6 +60,7 @@
@@ -91,5 +91,5 @@ index 831aa33d078a..03625547d794 100644
  
  	/* maybe the boot loader passed the MAC address in devicetree */
 -- 
-2.12.1
+2.13.0
 
diff --git a/kernels/linux-libre-knock/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch b/kernels/linux-libre-knock/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
deleted file mode 100644
index d7bc54642..000000000
--- a/kernels/linux-libre-knock/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From e2ee2a2f50947c4bdc4c9d827bd8ae0c383a7549 Mon Sep 17 00:00:00 2001
-From: dobatog <dobatog@gmail.com>
-Date: Thu, 26 Feb 2015 12:32:27 +0100
-Subject: [PATCH 6/9] ARM: TLV320AIC23 SoC Audio Codec: Fix errors reported
- related to input routing signals.
-
-The following patch, based on stable v3.19,  corrects the errors that are reported in the boot trace in reference to the Input Signals of the audio codec TLV320AIC23:
-
-tlv320aic23-codec 1-001a: Control not supported for path LLINEIN -> [NULL] -> Line Input
-tlv320aic23-codec 1-001a: ASoC: no dapm match for LLINEIN --> NULL --> Line Input
-tlv320aic23-codec 1-001a: ASoC: Failed to add route LLINEIN -> NULL -> Line Input
-tlv320aic23-codec 1-001a: Control not supported for path RLINEIN -> [NULL] -> Line Input
-tlv320aic23-codec 1-001a: ASoC: no dapm match for RLINEIN --> NULL --> Line Input
-tlv320aic23-codec 1-001a: ASoC: Failed to add route RLINEIN -> NULL -> Line Input
-tlv320aic23-codec 1-001a: Control not supported for path MICIN -> [NULL] -> Mic Input
-tlv320aic23-codec 1-001a: ASoC: no dapm match for MICIN --> NULL --> Mic Input
-tlv320aic23-codec 1-001a: ASoC: Failed to add route MICIN -> NULL -> Mic Input
-
-I am trying to set the sound system in a CM-510 (Compulab - SoM) based board with DT, using Simple-Card-Audio and  the TLV320AIC23 audio codec included in the SoM . I faced this problem and thanks to the help of Sebastian Hesselbarth who noticed the possible error located in the structure snd_soc_dapm_route tlv320aic23_intercon[] , now errors are not reported.
-
-Tested on CM-510 (Compulab SoM Board).
-
-Signed-off-by: dobatog <dobatog@gmail.com>
-Tested-by: Max Filippov <jcmvbkbc@gmail.com>
----
- sound/soc/codecs/tlv320aic23.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c
-index 410cae0f2060..0bb8e2602d8e 100644
---- a/sound/soc/codecs/tlv320aic23.c
-+++ b/sound/soc/codecs/tlv320aic23.c
-@@ -174,10 +174,10 @@ static const struct snd_soc_dapm_route tlv320aic23_intercon[] = {
- 	{"ROUT", NULL, "Output Mixer"},
- 
- 	/* Inputs */
--	{"Line Input", "NULL", "LLINEIN"},
--	{"Line Input", "NULL", "RLINEIN"},
-+	{"Line Input", NULL, "LLINEIN"},
-+	{"Line Input", NULL, "RLINEIN"},
- 
--	{"Mic Input", "NULL", "MICIN"},
-+	{"Mic Input", NULL, "MICIN"},
- 
- 	/* input mux */
- 	{"Capture Source", "Line", "Line Input"},
--- 
-2.12.1
-
diff --git a/kernels/linux-libre-knock/0007-set-default-cubietruck-led-triggers.patch b/kernels/linux-libre-knock/0006-set-default-cubietruck-led-triggers.patch
index bfcd558f9..4a8965cae 100644
--- a/kernels/linux-libre-knock/0007-set-default-cubietruck-led-triggers.patch
+++ b/kernels/linux-libre-knock/0006-set-default-cubietruck-led-triggers.patch
@@ -1,7 +1,7 @@
-From 18e61c475bb02949da35cf579737a8bec90ffc64 Mon Sep 17 00:00:00 2001
+From 6a5a573951f166fdda2d2daa235207f32d9bec92 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sat, 14 Feb 2015 12:32:27 +0100
-Subject: [PATCH 7/9] set default cubietruck led triggers
+Subject: [PATCH 6/9] set default cubietruck led triggers
 
 Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
 ---
@@ -9,10 +9,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  1 file changed, 2 insertions(+)
 
 diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
-index 83f39b0362cb..15e9626ea81b 100644
+index 102903e83bd2..40ce78704e8f 100644
 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
 +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
-@@ -70,6 +70,7 @@
+@@ -69,6 +69,7 @@
  		blue {
  			label = "cubietruck:blue:usr";
  			gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>;
@@ -20,7 +20,7 @@ index 83f39b0362cb..15e9626ea81b 100644
  		};
  
  		orange {
-@@ -85,6 +86,7 @@
+@@ -84,6 +85,7 @@
  		green {
  			label = "cubietruck:green:usr";
  			gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>;
@@ -29,5 +29,5 @@ index 83f39b0362cb..15e9626ea81b 100644
  	};
  
 -- 
-2.12.1
+2.13.0
 
diff --git a/kernels/linux-libre-knock/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/kernels/linux-libre-knock/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
index 0e7c2c7e9..9c3f76760 100644
--- a/kernels/linux-libre-knock/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
+++ b/kernels/linux-libre-knock/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
@@ -1,7 +1,7 @@
-From d1adb6eb7ec4898bbca97f7dc4ffdb2f6fdc9b99 Mon Sep 17 00:00:00 2001
+From 65265b8379903a8dd95489616fde0126d10bd4ef Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Thu, 11 Aug 2016 00:42:37 -0600
-Subject: [PATCH 8/9] exynos4412-odroid: set higher minimum buck2 regulator
+Subject: [PATCH 7/9] exynos4412-odroid: set higher minimum buck2 regulator
  voltage
 
 Set a higher minimum voltage to help reboot issue.
@@ -13,7 +13,7 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
-index 8aa19ba14436..8e2d94e3af72 100644
+index 0f1ff792fe44..a6fc2a53522f 100644
 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
 +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
 @@ -423,7 +423,7 @@
@@ -26,5 +26,5 @@ index 8aa19ba14436..8e2d94e3af72 100644
  				regulator-always-on;
  				regulator-boot-on;
 -- 
-2.12.1
+2.13.0
 
diff --git a/kernels/linux-libre-knock/0009-disable-USB3-port-on-ODROID-XU.patch b/kernels/linux-libre-knock/0008-disable-USB3-port-on-ODROID-XU.patch
index c40b3b032..01a9c3f01 100644
--- a/kernels/linux-libre-knock/0009-disable-USB3-port-on-ODROID-XU.patch
+++ b/kernels/linux-libre-knock/0008-disable-USB3-port-on-ODROID-XU.patch
@@ -1,7 +1,7 @@
-From 7cc217a4e96f65ef0156b590f9fad5da4958f846 Mon Sep 17 00:00:00 2001
+From 800ac49ce45ca2500e2455194d155d5d20f633e0 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sat, 25 Feb 2017 19:39:51 -0700
-Subject: [PATCH 9/9] disable USB3 port on ODROID-XU
+Subject: [PATCH 8/9] disable USB3 port on ODROID-XU
 
 Ports report over-current condition and are non-operable.
 
@@ -23,5 +23,5 @@ index c4de1353e5df..f80fa58995c5 100644
  
  &usbdrd_dwc3_1 {
 -- 
-2.12.1
+2.13.0
 
diff --git a/kernels/linux-libre-knock/0010-ARM-dove-enable-ethernet-on-D3Plug.patch b/kernels/linux-libre-knock/0009-ARM-dove-enable-ethernet-on-D3Plug.patch
index ef40ac3bc..eca0ffcb8 100644
--- a/kernels/linux-libre-knock/0010-ARM-dove-enable-ethernet-on-D3Plug.patch
+++ b/kernels/linux-libre-knock/0009-ARM-dove-enable-ethernet-on-D3Plug.patch
@@ -1,7 +1,7 @@
-From a986bc8d10b57b3261f712327fd477c6f09ff414 Mon Sep 17 00:00:00 2001
+From 04cbef0366837832994a3dd25661d28afe0d65a4 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 7 May 2017 13:32:25 -0600
-Subject: [PATCH 10/10] ARM: dove: enable ethernet on D3Plug
+Subject: [PATCH 9/9] ARM: dove: enable ethernet on D3Plug
 
 Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
 ---
@@ -27,5 +27,5 @@ index f5f59bb5a534..b0ad0bbf6818 100644
  /* Samsung M8G2F eMMC */
  &sdio0 {
 -- 
-2.12.2
+2.13.0
 
diff --git a/libre/linux-libre-hardened/PKGBUILD b/libre/linux-libre-hardened/PKGBUILD
index b1db2a750..682955274 100644
--- a/libre/linux-libre-hardened/PKGBUILD
+++ b/libre/linux-libre-hardened/PKGBUILD
@@ -1,5 +1,4 @@
 # Maintainer: David P. <megver83@parabola.nu>
-# Maintainer: Jesús E. <heckyel@openmailbox.org>
 # Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor: Márcio Silva <coadde@hyperbola.info>
 # Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
@@ -12,7 +11,7 @@
 
 pkgbase=linux-libre-hardened
 _pkgbasever=4.13-gnu
-_pkgver=4.13.8-gnu
+_pkgver=4.13.9-gnu
 _hardenedver=a
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
@@ -45,7 +44,7 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l
         '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
         '0002-fix-Atmel-maXTouch-touchscreen-support.patch'
         # armv7h patches
-        "https://repo.parabola.nu/other/rcn-libre-hardened/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"{,.sig}
+        "https://repo.parabola.nu/other/rcn-libre-hardened/patches/${_pkgver%-*}/rcn-libre-hardened-${_pkgver%-*}-${rcnrel}.patch"{,.sig}
         '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
         '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
         '0003-SMILE-Plug-device-tree-file.patch'
@@ -57,7 +56,7 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l
         '0009-ARM-dove-enable-ethernet-on-D3Plug.patch')
 sha512sums=('9ad6866c68f29f7e4f8b53d0b857f9b3c7f6abd0054460675c76f3100db34a77c2777d7f4191831008b532cb2ab6f686d8c4f457a4d005226c73f90937963518'
             'SKIP'
-            'd86cf42fce2e82180517a1cefd84ae37484c78d0852086af341e12c2b19d5068075a38375a9c55cfe7c6c1ef169ae01b94d6bd856602efbf089d59ff1d356082'
+            '12221d0eb85f30eace8fac389c27d3455df11475c466b600c466a2cb843435a406cf663547cb7a0aa8340ac4bd178ba4e694136e5172c1c396bd033ab840ac4e'
             'SKIP'
             '7b85ed41fdd8effba2284175fdfaea087cf5a491e8940cdb289aa4ba5fcb5e54d3595f612e943e99e42cbbbd39d6167c5032c07e05901eb1c25dd25219bdd2c7'
             'SKIP'
@@ -114,7 +113,7 @@ prepare() {
     # Note: For stability reasons, AUFS has been removed in the RCN patch.
     # We are supporting AUFS in linux-libre-pck through PCK patch.
     # See https://wiki.parabola.nu/PCK for further details.
-    git apply -v "${srcdir}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
+    git apply -v "${srcdir}/rcn-libre-hardened-${_pkgver%-*}-${rcnrel}.patch"
 
     # ALARM patches
     patch -p1 -i "${srcdir}/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch"
diff --git a/libre/linux-libre-pck/PKGBUILD b/libre/linux-libre-pck/PKGBUILD
index 5eda33f10..bc2a4f320 100644
--- a/libre/linux-libre-pck/PKGBUILD
+++ b/libre/linux-libre-pck/PKGBUILD
@@ -1,5 +1,4 @@
 # Maintainer: David P. <megver83@parabola.nu>
-# Maintainer: Jesús E. <heckyel@parabola.nu>
 # Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor: Márcio Silva <coadde@hyperbola.info>
 # Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
@@ -12,7 +11,7 @@
 
 pkgbase=linux-libre-pck
 _pkgbasever=4.13-gnu
-_pkgver=4.13.5-gnu
+_pkgver=4.13.9-gnu
 _pckpatchver=pck1
 
 _replacesarchkernel=('linux-zen')
@@ -23,11 +22,11 @@ _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}.${_pckpatchver}
 pkgrel=1
-rcnrel=armv7-x1
+rcnrel=armv7-x2
 arch=('i686' 'x86_64' 'armv7h')
 url="https://wiki.parabola.nu/PCK"
 license=('GPL2')
-makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'libelf' 'gcc6')
+makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'libelf')
 makedepends_armv7h=('git')
 options=('!strip')
 source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz"{,.sign}
@@ -55,9 +54,9 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l
         '0009-ARM-dove-enable-ethernet-on-D3Plug.patch')
 sha512sums=('9ad6866c68f29f7e4f8b53d0b857f9b3c7f6abd0054460675c76f3100db34a77c2777d7f4191831008b532cb2ab6f686d8c4f457a4d005226c73f90937963518'
             'SKIP'
-            '2d6eddb52bf160cbaeec203e7b0a77f4230f7e1995f17524f6164a8eaacf19340663be1f23e38ea3b0eb2e2504b48eb2371d89419e15f2b7c9371a189c95710d'
+            '12221d0eb85f30eace8fac389c27d3455df11475c466b600c466a2cb843435a406cf663547cb7a0aa8340ac4bd178ba4e694136e5172c1c396bd033ab840ac4e'
             'SKIP'
-            '1735e55976112c3b4d1db92e5cbaf408031afa9e11e8a4167dc0e4ce130410db0621c0d3991827a7617cefdf17dc99071a1dcb09668d80ad30a46a7e599a33b6'
+            'b2c91fb6613f7dfa9c2e0d5644d0a7297b0a8af82c5990809b70dc512bde0cef42e82e951c61d7deb767baf01d618597a04f92355484f2c198f91b4568f6ead2'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -70,7 +69,7 @@ sha512sums=('9ad6866c68f29f7e4f8b53d0b857f9b3c7f6abd0054460675c76f3100db34a77c27
             '55cebbbc7d65337419f0c0f9f0685a466d6296e09d1df7a53761bf741a7881a1cb559b7528bb30e6e11484aef0027d105649da6a53665329477a1a24a604336f'
             'd6faa67f3ef40052152254ae43fee031365d0b1524aa0718b659eb75afc21a3f79ea8d62d66ea311a800109bed545bc8f79e8752319cd378eef2cbd3a09aba22'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
-            '9ce4124257d446ba6cf6b2e7adffbd3d92326ac761a49ce47395310afe3ada1a0d6138f4f355af2a4a752920d59577a03483399bd5650e4b6de2018e394e59de'
+            '1507b924cfc415398ee8972d61d669e501481e95a41d4851aae467f2e8894760842b0b89e1dad4f0791abe85d0e67fa995eefbfcf716ace8acbe8626a1d57314'
             'SKIP'
             '8da49af5cce12f0bf21f5985cf85d13624404bab76cc0fd7a04b3ee6c046b5dceb4ae0bb821e060405366310473042892e716f530f04d1dab9a21ca1f778dd6c'
             '06f40e0f197b15dffc7c724aba9a41f2343c8528576700202f069d5cd00013e7e5e8d62153cf358d02c21e28d7cf2a66e3f5190677cb590ac07f36be58b43cab'
@@ -157,14 +156,15 @@ build() {
   cd ${_srcname}
 
   if [ "${CARCH}" = "armv7h" ]; then
-    CC="gcc-6" CXX="g++-6" make ${MAKEFLAGS} LOCALVERSION= zImage modules dtbs
+    make ${MAKEFLAGS} LOCALVERSION= zImage modules dtbs
   elif [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then
-    CC="gcc-6" CXX="g++-6" make ${MAKEFLAGS} LOCALVERSION= bzImage modules
+    make ${MAKEFLAGS} LOCALVERSION= bzImage modules
   fi
 }
 
 _package() {
-  pkgdesc="The ${pkgbase^} kernel and modules with a handful of awesome features not merged into mainline [AUFS, BFQ, BFS, Knock, UKSM]"
+#  pkgdesc="The ${pkgbase^} kernel and modules with a handful of awesome features not merged into mainline [AUFS, BFQ, BFS, Knock, UKSM]"
+  pkgdesc="The ${pkgbase^} kernel and modules with a handful of awesome features not merged into mainline [AUFS, BFQ, BFS, UKSM]" # Knock has been removed for now
   [ "${pkgbase}" = "linux-libre" ] && groups=('base' 'base-openrc')
   depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country'