upgpkg: libre/linux-libre-pck 4.17.11_gnu.pck1-1

Remove 0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
and 0002-fix-Atmel-maXTouch-touchscreen-support.patch since they are
now part of the PCK patch

https://gitlab.com/Megver83/linux-libre-pck/commit/a2480bbde34ac04bb54c3ad761917e43add298ac
https://gitlab.com/Megver83/linux-libre-pck/commit/94fb7776c7404ac2e97f7febef5066cff9016715

Also update config files

Signed-off-by: David P <megver83@parabola.nu>

6 files changed, 19 insertions, 133 deletions

diff --git a/libre/linux-libre-pck/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch b/libre/linux-libre-pck/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
deleted file mode 100644
index e9de435fd..000000000
--- a/libre/linux-libre-pck/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 716120e8010a7f400c6bed7384000e95e1465c94 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
-Date: Mon, 26 Aug 2013 19:19:44 +0300
-Subject: [PATCH 1/2] usb serial gadget: no TTY hangup on USB disconnect [WIP]
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We may want to maintain the TTY over USB disconnects.
-
-This is useful when we have a terminal console to a host which
-power-cycles or for other reasons resets the USB host controller.
-
-Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
----
- drivers/usb/gadget/function/u_serial.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
-index b369292..d156a28 100644
---- a/drivers/usb/gadget/function/u_serial.c
-+++ b/drivers/usb/gadget/function/u_serial.c
-@@ -1258,8 +1258,13 @@ void gserial_disconnect(struct gserial *gser)
- 	gser->ioport = NULL;
- 	if (port->port.count > 0 || port->openclose) {
- 		wake_up_interruptible(&port->drain_wait);
-+#if 0
- 		if (port->port.tty)
- 			tty_hangup(port->port.tty);
-+#else
-+		if (port->port.tty)
-+			stop_tty(port->port.tty);
-+#endif
- 	}
- 	spin_unlock_irqrestore(&port->port_lock, flags);
- 
--- 
-1.8.1.1
-
diff --git a/libre/linux-libre-pck/0002-fix-Atmel-maXTouch-touchscreen-support.patch b/libre/linux-libre-pck/0002-fix-Atmel-maXTouch-touchscreen-support.patch
deleted file mode 100644
index 5ad26fc9e..000000000
--- a/libre/linux-libre-pck/0002-fix-Atmel-maXTouch-touchscreen-support.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From ab8cc1b2dc1b716d5c08f72dacbe1eded269f304 Mon Sep 17 00:00:00 2001
-From: André Silva <emulatorman@parabola.nu>
-Date: Tue, 22 Mar 2016 17:58:59 -0300
-Subject: [PATCH 2/2] fix Atmel maXTouch touchscreen support
-
-The Atmel maXTouch touchscreen works with Linux-libre 3.13-gnu,
-but not with the current longterm and mainline kernels in
-Parabola.
-
-Now it needs to load nonfree firmware in mxt_initialize(),
-which is in drivers/input/touchscreen/atmel_mxt_ts.c, and the
-atmel_mxt_ts driver fails to work.
-
-This driver works if changing reject_firmware_nowait to
-request_firmware_nowait in atmel_mxt_ts.c. This line is
-requesting the file named MXT_CFG_NAME, and it's a config file,
-not the firmware blob.
-
-Signed-off-by: André Silva <emulatorman@parabola.nu>
-Signed-off-by: mytbk <mytbk920423@gmail.com>
----
- drivers/input/touchscreen/atmel_mxt_ts.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
-index 726a83e..d818834 100644
---- a/drivers/input/touchscreen/atmel_mxt_ts.c
-+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
-@@ -1989,7 +1989,7 @@ static int mxt_initialize(struct mxt_data *data)
- 	if (error)
- 		goto err_free_object_table;
- 
--	error = reject_firmware_nowait(THIS_MODULE, true, MXT_CFG_NAME,
-+	error = request_firmware_nowait(THIS_MODULE, true, MXT_CFG_NAME,
- 					&client->dev, GFP_KERNEL, data,
- 					mxt_config_cb);
- 	if (error) {
diff --git a/libre/linux-libre-pck/PKGBUILD b/libre/linux-libre-pck/PKGBUILD
index 452dacd38..eeb26fcd4 100644
--- a/libre/linux-libre-pck/PKGBUILD
+++ b/libre/linux-libre-pck/PKGBUILD
@@ -11,7 +11,7 @@
 
 pkgbase=linux-libre-pck
 _pkgbasever=4.17-gnu
-_pkgver=4.17.6-gnu
+_pkgver=4.17.11-gnu
 _pckpatchver=pck1
 
 _replacesarchkernel=('linux-zen')
@@ -22,7 +22,7 @@ _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}.${_pckpatchver}
 pkgrel=1
-rcnrel=armv7-x7
+rcnrel=armv7-x11
 arch=('i686' 'x86_64' 'armv7h')
 url="https://wiki.parabola.nu/PCK"
 license=('GPL2')
@@ -57,9 +57,6 @@ source=(
   '0012-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch'
   '0013-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch'
   '0014-ARM-mvebu-declare-asm-symbols-as-character-arrays-in.patch'
-  # other patches
-  '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
-  '0002-fix-Atmel-maXTouch-touchscreen-support.patch'
 )
 validpgpkeys=(
   '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
@@ -67,9 +64,9 @@ validpgpkeys=(
 )
 sha512sums=('a09014005d64839e958cabb20dbd50e051907b1afea2f517f41f0a9312fa1bc8447690e64ec0e6488a778be8a7384891c003f39029ff5799f9884482628aadf2'
             'SKIP'
-            'e87d8039431db2fc26480d2079705056638a2147e97840a331f520ad273e4a0ac57b4d939ee1fe8fff9ac8518680be21513a2a0ab7dda618ca85b603b218c22b'
+            'a977ac21aa66b7d01ccc207f74d6213cdeed7ab0dd40c5569f97a97f42244c9db002f79d84ad6b4583d1a3b5f357f55bb12da214078c919ac2b70800b0b6ae69'
             'SKIP'
-            'f83e76d558c4c5c0581edd5a9d0d076050f371a0e45afe4df4a2e275319c330a79b8fa9385fe1a421355691bbb4424dd3ee431ac78e8faaf66d9a78ec841d751'
+            '4c9d86fe6e184b1808f9105ff75efea7d42731d4fcd106e391ccc2f6d4abf4ae9cd49410af46e5c0e0724b60a4a1371fa6d6461e79bf21c83f5b089fe2440365'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -77,13 +74,13 @@ sha512sums=('a09014005d64839e958cabb20dbd50e051907b1afea2f517f41f0a9312fa1bc8447
             'SKIP'
             '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'
             'SKIP'
-            '9de11b796d1acd3e02b8cd1e024f7af1c57d896c92ffed41bb728ea3457d5b5241dce51d5961d2637aa2909d65827f32fb0debd4c6772cb75a85a6658b72f9d1'
-            'c0688d828813eaeb1f837cb0ffc25ebba584d47e7080f27873bd9ad6dfec2c3fbc781106d25204128ad3385f9af82a5cf7a3ed92dad69632bc5d1bfcf7dd61c5'
-            'a6fb9fd8c42232457de3dafa6291afeb31a595119b91adb6d673080899942a6ca4718438b54c011c6b87031cce746af94a12ee81ceb033c69a354d19fe6b60c0'
+            '152695f14929099fc4c6c3866b0584015712ce57dbe428b67180650328228abac1f8db269f2ef6563b7712e8d1098e3bac781bc5a9900c9782dc31f792a9ca59'
+            '4194d81e4a320fdfeafb5b7083279582691f97bdbaa765b8f4794431e1b34e6de59c492a77ce8abfbb95d4d5e45e480c004adfa6585017db7f3135f392fe7bd7'
+            '69eca8992e2057dcd93eab829d6be9ced55006bb03e7bc4bc2afc127e90755ac521ead2b272fa13a5008b5957c1803164bcdedea9cee8c3ba26bf66b8d120f7a'
             '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
             '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
-            '93909dee8e89a5e243489c3c47b6b1023b4064bea7688e6d395912383e1d2e69b64c2dea161ef85ce9a52ff24b0de8fe975297cd1b17eaebc1f72a9d6a5cafbe'
+            '600a373e26f7755f5a4c7cbc84d713cd8670cacf8891ec00e728818622a312cef3d2073a656dcda50e05ae8b2fdfe103b4ae5b6a2fe8387c3fc2674402c426dc'
             'SKIP'
             'c6e758931e599199db07276a51b204a4030e0da80f08df60783278cf3d4d3ee6c0c280cc1788ca024cdf2043a39dd527e2205dd678368097b68240a7e80b931c'
             '3e0852e188549e60fa35b70e82740d5124936688d5f5ff0314c4e555ad9cc4c7688c56b5949baa8fd67ede22a579019919b09091b59eafac60409fdf18105af5'
@@ -98,9 +95,7 @@ sha512sums=('a09014005d64839e958cabb20dbd50e051907b1afea2f517f41f0a9312fa1bc8447
             'b6b39a2fdc5963611806d387866edab43eb52c591b05d92e0ed887657d43383ddfc2e088b7063bd6586ff872203fdbf0348fecc2c1f673134a8cc5112a1d4179'
             '79da6491df96d8bc13edc2bd071b8859a7f915a72244992869e3be44c3118fd3421d9fff4fe6c858895ad8c19dcc02d8d3b458dc6f3efbae3120693708af31b4'
             '1d0626f6e95ffe71dbbf281167d312a8acfc300930b39e80ef7771a2b65091e974e2ec703d463d8fc16d36472f5f5deb28b77d854c0e96685d31e42040d18f6d'
-            'a4d72cdcddc3f43f27e0d415e1d8ce45bc552ee07d29b566cd8128715daf8267f549968434ca6a949b39aed8bbd6b8790f65f7f4641d8008d1b856d8f1a8ee94'
-            '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
-            'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168')
+            'a4d72cdcddc3f43f27e0d415e1d8ce45bc552ee07d29b566cd8128715daf8267f549968434ca6a949b39aed8bbd6b8790f65f7f4641d8008d1b856d8f1a8ee94')
 
 _kernelname=${pkgbase#linux-libre}
 _replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}")
@@ -119,7 +114,7 @@ prepare() {
   if [ "${_pkgbasever}" != "${_pkgver}" ]; then
     patch -p1 -i ../patch-${_pkgbasever}-${_pkgver}
   fi
-  
+
   # add PCK patch
   patch -p1 -i ../patch-${_pkgver}-${_pckpatchver}.patch
 
@@ -151,44 +146,13 @@ prepare() {
   install -m644 -t drivers/video/logo \
     ../logo_linux_{clut224.ppm,vga16.ppm,mono.pbm}
 
-  # add latest fixes from stable queue, if needed
-  # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
-
-  # maintain the TTY over USB disconnects
-  # http://www.coreboot.org/EHCI_Gadget_Debug
-  patch -p1 -i ../0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
-
-  # fix Atmel maXTouch touchscreen support
-  # https://labs.parabola.nu/issues/877
-  # http://www.fsfla.org/pipermail/linux-libre/2015-November/003202.html
-  patch -p1 -i ../0002-fix-Atmel-maXTouch-touchscreen-support.patch
-
-  cat ../config.${CARCH} - >.config <<END
-CONFIG_LOCALVERSION="${_kernelname}"
-CONFIG_LOCALVERSION_AUTO=n
-END
-
   # append pkgrel to extraversion and empty localversion
   sed -e "/^EXTRAVERSION = -gnu/s/-gnu.*/-gnu-${pkgrel}/" \
       -e "/^EXTRAVERSION =/aLOCALVERSION =" \
       -i Makefile
 
-  # don't run depmod on 'make install'. We'll do this ourselves in packaging
-  sed -i '2iexit 0' scripts/depmod.sh
-
-  # get kernel version
-  make prepare
-
-  # load configuration
-  # Configure the kernel. Replace the line below with one of your choice.
-  #make menuconfig # CLI menu for configuration
-  #make nconfig # new CLI menu for configuration
-  #make xconfig # X-based configuration
-  #make oldconfig # using old config from previous kernel version
-  # ... or manually edit .config
-
-  # rewrite configuration
-  yes "" | make config >/dev/null
+  cp ../config.${CARCH} .config
+  make olddefconfig
 }
 
 build() {
@@ -220,7 +184,7 @@ _package() {
   _basekernel=${_basekernel%.*}
 
   mkdir -p "${pkgdir}"/{boot,usr/lib/modules}
-  make INSTALL_MOD_PATH="${pkgdir}/usr" modules_install
+  make INSTALL_MOD_PATH="${pkgdir}/usr" DEPMOD=/doesnt/exist modules_install
   if [ "${CARCH}" = "armv7h" ]; then
     make LOCALVERSION= INSTALL_DTBS_PATH="${pkgdir}/boot/dtbs/${pkgbase}" dtbs_install
     cp arch/$KARCH/boot/zImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
diff --git a/libre/linux-libre-pck/config.armv7h b/libre/linux-libre-pck/config.armv7h
index 7096fe86e..1d895dba0 100644
--- a/libre/linux-libre-pck/config.armv7h
+++ b/libre/linux-libre-pck/config.armv7h
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.17.6-gnu-1-pck Kernel Configuration
+# Linux/arm 4.17.11-gnu-1-pck Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -7928,8 +7928,8 @@ CONFIG_FPGA_MGR_SOCFPGA=m
 CONFIG_FPGA_MGR_SOCFPGA_A10=m
 CONFIG_ALTERA_PR_IP_CORE=m
 CONFIG_ALTERA_PR_IP_CORE_PLAT=m
-# CONFIG_FPGA_MGR_ALTERA_PS_SPI is not set
-# CONFIG_FPGA_MGR_ALTERA_CVP is not set
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
 CONFIG_FPGA_MGR_ZYNQ_FPGA=m
 CONFIG_FPGA_MGR_XILINX_SPI=m
 CONFIG_FPGA_MGR_ICE40_SPI=m
@@ -8253,7 +8253,7 @@ CONFIG_CIFS_FSCACHE=y
 # CONFIG_9P_FS is not set
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_CODEPAGE_737=m
 CONFIG_NLS_CODEPAGE_775=m
 CONFIG_NLS_CODEPAGE_850=m
diff --git a/libre/linux-libre-pck/config.i686 b/libre/linux-libre-pck/config.i686
index c18d42faa..6b9b7073a 100644
--- a/libre/linux-libre-pck/config.i686
+++ b/libre/linux-libre-pck/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.17.6-gnu-1-pck Kernel Configuration
+# Linux/x86 4.17.11-gnu-1-pck Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -9363,7 +9363,6 @@ CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_586=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
diff --git a/libre/linux-libre-pck/config.x86_64 b/libre/linux-libre-pck/config.x86_64
index 5c4c7a93f..72bb1a1e9 100644
--- a/libre/linux-libre-pck/config.x86_64
+++ b/libre/linux-libre-pck/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.17.6-gnu-1-pck Kernel Configuration
+# Linux/x86 4.17.11-gnu-1-pck Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -9313,7 +9313,6 @@ CONFIG_CRYPTO_DES3_EDE_X86_64=m
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20_X86_64=m
 CONFIG_CRYPTO_SEED=m