diff options
4 files changed, 50 insertions, 10 deletions
diff --git a/kernels/linux-libre-grsec-knock/0003-fix-atmel-maxtouch-touchscreen-support.patch b/kernels/linux-libre-grsec-knock/0003-fix-atmel-maxtouch-touchscreen-support.patch new file mode 100644 index 000000000..9d2444252 --- /dev/null +++ b/kernels/linux-libre-grsec-knock/0003-fix-atmel-maxtouch-touchscreen-support.patch @@ -0,0 +1,13 @@ +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/kernels/linux-libre-grsec-knock/PKGBUILD b/kernels/linux-libre-grsec-knock/PKGBUILD index ecc70a442..edf20a6a1 100644 --- a/kernels/linux-libre-grsec-knock/PKGBUILD +++ b/kernels/linux-libre-grsec-knock/PKGBUILD @@ -10,9 +10,9 @@ pkgbase=linux-libre-grsec-knock _pkgbasever=4.4-gnu -_pkgver=4.4.5-gnu +_pkgver=4.4.6-gnu _grsecver=3.1 -_timestamp=201603142220 +_timestamp=201603171922 _knockpatchver=4.2_2 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -55,6 +55,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'change-default-console-loglevel.patch' '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch' '0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch' + '0003-fix-atmel-maxtouch-touchscreen-support.patch' # armv7h patches "https://repo.parabola.nu/other/rcn-libre-grsec/patches/${_pkgver%-*}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch" "https://repo.parabola.nu/other/rcn-libre-grsec/patches/${_pkgver%-*}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch.sig" @@ -71,9 +72,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0009-ARM-dts-dove-add-Dove-divider-clocks.patch') sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0' 'SKIP' - '4adf791c9d7e52ac72c60d337e3fa59f8cef5fb1f497a192345b70ac915674f1' + '0e4403973b4e92ec97e101f4f8053cc8f1b90302c2040f168d0c53374efc121a' 'SKIP' - 'a4b7f9354fe09ea8938c79d2d158600bba426190a009900d3af33e0fe1d3b8c2' + '3ad57cda516c665c8fd093b92b1bfa0f3a56ee79021ea43b64576c8b8d911b2f' 'SKIP' 'c7c4ab580f00dca4114c185812a963e73217e6bf86406c240d669026dc3f98a4' 'SKIP' @@ -90,7 +91,8 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' '61370b766e0c60b407c29d2c44b3f55fc352e9049c448bc8fcddb0efc53e42fc' '3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808' - '5a8d8fe270a5423fb5f712aebf55d367906a8f44f1ca343341ab67619479a319' + '0a6f76bbc03ae6e846a4ba4e31bbc0a40b1ae538c1271defcbe3089e00a4b53d' + '1ddb4826dc41c5e6db05c1ccad396915e678992c97b300089bf47040e0db4f44' 'SKIP' '1fc7055041da895d5d023fcf0c5e06d00a3506ae98931138229dba7392e2c382' 'bd7e6446b8ca7724642f8317326fe228b116be28f9649b5783530d7c0899ded8' @@ -179,6 +181,11 @@ prepare() { # http://www.coreboot.org/EHCI_Gadget_Debug patch -p1 -i "${srcdir}/0002-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 "${srcdir}/0003-fix-atmel-maxtouch-touchscreen-support.patch" + cat "${srcdir}/config.${CARCH}" > ./.config # append pkgrel to extraversion diff --git a/libre/linux-libre-grsec/0003-fix-atmel-maxtouch-touchscreen-support.patch b/libre/linux-libre-grsec/0003-fix-atmel-maxtouch-touchscreen-support.patch new file mode 100644 index 000000000..9d2444252 --- /dev/null +++ b/libre/linux-libre-grsec/0003-fix-atmel-maxtouch-touchscreen-support.patch @@ -0,0 +1,13 @@ +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-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index b1935ef92..ad937875b 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -10,9 +10,9 @@ pkgbase=linux-libre-grsec _pkgbasever=4.4-gnu -_pkgver=4.4.5-gnu +_pkgver=4.4.6-gnu _grsecver=3.1 -_timestamp=201603142220 +_timestamp=201603171922 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=() # '%' gets replaced with _kernelname @@ -50,6 +50,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'change-default-console-loglevel.patch' '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch' '0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch' + '0003-fix-atmel-maxtouch-touchscreen-support.patch' # armv7h patches "https://repo.parabola.nu/other/rcn-libre-grsec/patches/${_pkgver%-*}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch" "https://repo.parabola.nu/other/rcn-libre-grsec/patches/${_pkgver%-*}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch.sig" @@ -66,9 +67,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0009-ARM-dts-dove-add-Dove-divider-clocks.patch') sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0' 'SKIP' - '4adf791c9d7e52ac72c60d337e3fa59f8cef5fb1f497a192345b70ac915674f1' + '0e4403973b4e92ec97e101f4f8053cc8f1b90302c2040f168d0c53374efc121a' 'SKIP' - 'a4b7f9354fe09ea8938c79d2d158600bba426190a009900d3af33e0fe1d3b8c2' + '3ad57cda516c665c8fd093b92b1bfa0f3a56ee79021ea43b64576c8b8d911b2f' 'SKIP' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' @@ -83,7 +84,8 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' '61370b766e0c60b407c29d2c44b3f55fc352e9049c448bc8fcddb0efc53e42fc' '3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808' - '5a8d8fe270a5423fb5f712aebf55d367906a8f44f1ca343341ab67619479a319' + '0a6f76bbc03ae6e846a4ba4e31bbc0a40b1ae538c1271defcbe3089e00a4b53d' + '1ddb4826dc41c5e6db05c1ccad396915e678992c97b300089bf47040e0db4f44' 'SKIP' '1fc7055041da895d5d023fcf0c5e06d00a3506ae98931138229dba7392e2c382' 'bd7e6446b8ca7724642f8317326fe228b116be28f9649b5783530d7c0899ded8' @@ -168,6 +170,11 @@ prepare() { # http://www.coreboot.org/EHCI_Gadget_Debug patch -p1 -i "${srcdir}/0002-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 "${srcdir}/0003-fix-atmel-maxtouch-touchscreen-support.patch" + cat "${srcdir}/config.${CARCH}" > ./.config # append pkgrel to extraversion |