summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO18
-rw-r--r--0003-fix-atmel-maxtouch-touchscreen-support.patch13
-rw-r--r--PKGBUILD15
3 files changed, 34 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e5520d09e191..a1817704d73a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
# Generated by mksrcinfo v8
-# Mon Mar 7 18:57:51 UTC 2016
+# Mon Mar 28 02:43:06 UTC 2016
pkgbase = linux-libre-xen
- pkgver = 4.4.4_gnu
+ pkgver = 4.4.6_gnu
pkgrel = 1
url = http://linux-libre.fsfla.org/
arch = i686
@@ -14,8 +14,8 @@ pkgbase = linux-libre-xen
options = !strip
source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.4-gnu/linux-libre-4.4-gnu.tar.xz
source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.4-gnu/linux-libre-4.4-gnu.tar.xz.sign
- source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.4.4-gnu/patch-4.4-gnu-4.4.4-gnu.xz
- source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.4.4-gnu/patch-4.4-gnu-4.4.4-gnu.xz.sign
+ source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.4.6-gnu/patch-4.4-gnu-4.4.6-gnu.xz
+ source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.4.6-gnu/patch-4.4-gnu-4.4.6-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,9 +27,10 @@ pkgbase = linux-libre-xen
source = change-default-console-loglevel.patch
source = 0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
source = 0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
+ source = 0003-fix-atmel-maxtouch-touchscreen-support.patch
sha256sums = f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0
sha256sums = SKIP
- sha256sums = 5b52578afb3bab7a50748e9b8e26bd9df851b3dcfbb55079d2abf3d3ad46aaff
+ sha256sums = 0e4403973b4e92ec97e101f4f8053cc8f1b90302c2040f168d0c53374efc121a
sha256sums = SKIP
sha256sums = bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494
sha256sums = SKIP
@@ -42,6 +43,7 @@ pkgbase = linux-libre-xen
sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
sha256sums = 61370b766e0c60b407c29d2c44b3f55fc352e9049c448bc8fcddb0efc53e42fc
sha256sums = 3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808
+ sha256sums = 0a6f76bbc03ae6e846a4ba4e31bbc0a40b1ae538c1271defcbe3089e00a4b53d
pkgname = linux-libre-xen
pkgdesc = The Linux-libre-xen kernel and modules with Xen guest support
@@ -51,20 +53,20 @@ pkgname = linux-libre-xen
depends = kmod
depends = mkinitcpio>=0.7
optdepends = crda: to set the correct wireless channels of your country
- provides = linux-xen=4.4.4
+ provides = linux-xen=4.4.6
conflicts =
replaces = linux-xen
backup = etc/mkinitcpio.d/linux-libre-xen.preset
pkgname = linux-libre-xen-headers
pkgdesc = Header files and scripts for building modules for Linux-libre-xen kernel
- provides = linux-xen-headers=4.4.4
+ provides = linux-xen-headers=4.4.6
conflicts =
replaces = linux-xen-headers
pkgname = linux-libre-xen-docs
pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-libre-xen kernel
- provides = linux-xen-docs=4.4.4
+ provides = linux-xen-docs=4.4.6
conflicts =
replaces = linux-xen-docs
diff --git a/0003-fix-atmel-maxtouch-touchscreen-support.patch b/0003-fix-atmel-maxtouch-touchscreen-support.patch
new file mode 100644
index 000000000000..9d2444252a94
--- /dev/null
+++ b/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/PKGBUILD b/PKGBUILD
index 8b68bc26acd6..ab740bac9c4f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
pkgbase=linux-libre-xen
_pkgbasever=4.4-gnu
-_pkgver=4.4.4-gnu
+_pkgver=4.4.6-gnu
_replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
_replacesoldkernels=() # '%' gets replaced with _kernelname
@@ -40,10 +40,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
'linux.preset'
'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')
+ '0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
+ '0003-fix-atmel-maxtouch-touchscreen-support.patch')
sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0'
'SKIP'
- '5b52578afb3bab7a50748e9b8e26bd9df851b3dcfbb55079d2abf3d3ad46aaff'
+ '0e4403973b4e92ec97e101f4f8053cc8f1b90302c2040f168d0c53374efc121a'
'SKIP'
'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494'
'SKIP'
@@ -55,7 +56,8 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0'
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
'61370b766e0c60b407c29d2c44b3f55fc352e9049c448bc8fcddb0efc53e42fc'
- '3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808')
+ '3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808'
+ '0a6f76bbc03ae6e846a4ba4e31bbc0a40b1ae538c1271defcbe3089e00a4b53d')
validpgpkeys=(
'474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
'684D54A189305A9CC95446D36B888913DDB59515' # Márcio Silva
@@ -94,6 +96,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" > ./.config # simpler
# append pkgrel to extraversion