diff options
author | David P | 2020-05-27 01:50:52 -0400 |
---|---|---|
committer | David P | 2020-05-27 01:50:52 -0400 |
commit | 3543510cd4115d02a9ba1306c230d80b23ace4e2 (patch) | |
tree | 3a47aedd5b1ad2c103a10949827f1044658b67ec | |
parent | ca0c62361fafa4712eb5d2a0f7cd5e3c432b9a9f (diff) | |
download | aur-3543510cd4115d02a9ba1306c230d80b23ace4e2.tar.gz |
Fix some things (thanks heckyel!)
Signed-off-by: David P <megver83@parabola.nu>
-rw-r--r-- | 0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch | 4 | ||||
-rw-r--r-- | 0002-fix-Atmel-maXTouch-touchscreen-support.patch | 6 | ||||
-rw-r--r-- | PKGBUILD | 23 |
3 files changed, 17 insertions, 16 deletions
diff --git a/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch b/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch index e9de435fd34c..f3d84ec971c3 100644 --- a/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch +++ b/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch @@ -17,10 +17,10 @@ Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> 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 +index 038c445..996f70b 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) +@@ -1370,8 +1370,13 @@ void gserial_disconnect(struct gserial *gser) gser->ioport = NULL; if (port->port.count > 0 || port->openclose) { wake_up_interruptible(&port->drain_wait); diff --git a/0002-fix-Atmel-maXTouch-touchscreen-support.patch b/0002-fix-Atmel-maXTouch-touchscreen-support.patch index 5ad26fc9e2a0..69d0691f1c93 100644 --- a/0002-fix-Atmel-maXTouch-touchscreen-support.patch +++ b/0002-fix-Atmel-maXTouch-touchscreen-support.patch @@ -23,12 +23,12 @@ Signed-off-by: mytbk <mytbk920423@gmail.com> 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 +index 9f2967b..45db7fd 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) +@@ -2142,7 +2142,7 @@ static int mxt_initialize(struct mxt_data *data) if (error) - goto err_free_object_table; + return error; - error = reject_firmware_nowait(THIS_MODULE, true, MXT_CFG_NAME, + error = request_firmware_nowait(THIS_MODULE, true, MXT_CFG_NAME, @@ -2,9 +2,9 @@ # NOTE: This PKGBUILD will only work with Hyperbola GNU/Linux-libre. Not Parabola, not Arch. # I made this package for users who need a 5.x kernel, but still want LTS software. -# It is made for the old mkinitcpio version that is shipped in Hyperbola. This PKGBUILD aims -# to be simple and minimalist, so it doesn't come with the -docs package (which produced errors -# when building, as I was told by some 'hyperusers' :P) and it is available only for x86_64 +# It is made for the old mkinitcpio version that is shipped in Hyperbola and follows the FHS. +# This PKGBUILD aims to be simple and minimalist, so it doesn't come with the -docs package +# (which produced errors when building, as I was told by some 'hyperusers' :P) _replacesarchkernel=() # '%' gets replaced with kernel suffix _replacesoldkernels=() # '%' gets replaced with kernel suffix @@ -16,7 +16,7 @@ pkgrel=1 pkgdesc='Linux-libre 5.4 LTS' url='https://linux-libre.fsfla.org/' arch=(x86_64) -license=(GPL2) +license=(GPL-2) makedepends=( bc kmod libelf ) @@ -25,7 +25,7 @@ _srcname=linux-5.4 source=( "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_srcname##*-}-gnu/linux-libre-${_srcname##*-}-gnu.tar.xz"{,.sign} "https://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/patch-${_srcname##*-}-gnu-$pkgver-gnu.xz"{,.sign} - "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}{,.sig} + "https://git.hyperbola.info:50100/culture/linux-libre_logos.git/plain/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}{,.sig} config # the main kernel config file linux.preset # standard config files for mkinitcpio ramdisk 90-linux.hook # pacman hook for initramfs regeneration @@ -40,6 +40,7 @@ source=( ) validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva + '684D54A189305A9CC95446D36B888913DDB59515' # Márcio Silva ) sha512sums=('0d0915133864eb031adfc6700066147dcf3e768a50a31c39754950c95ef4fd322dc701cd50af49c403ef0325adfcb07e354d5e46c1be3dcdd719a7a55c963f37' 'SKIP' @@ -54,8 +55,8 @@ sha512sums=('0d0915133864eb031adfc6700066147dcf3e768a50a31c39754950c95ef4fd322dc 'a923bb36ff24d3f2326b0b6bccb8cdfe2ed2ab2acdae17dfcaf9beb269995a52bfba751ad7e616544ef4b98dd9487a66fe04dae2ec2e7d724f8ac47382ee71bd' '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' '38ddc517f33fe41dec63b31313a82e0e8c05788e9db5e448d23a01605c50fe3422927cfd902e81c3b0eae17502db06f48e7f713e1ba1c9c76fd26f1473b02983' - '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' - 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168') + '6a87c0bb2a2f352917eab8a029a89ee1a504b41d73ae536be1d508248e0f280b586e1cf2669cd6501a392d97e1963a806545a1635be9de446e0c9affe61ee56f' + 'c7776361aafe2cec753fdda96eca5c1f4460cb78fb4dfe3d78e92f68387ec80bd1a4d83362af40b33c05e1501f31c83b1ef6115c790f8bf9d6ecd5642b829af8') _replacesarchkernel=("${_replacesarchkernel[@]/\%/${pkgbase#linux-libre}}") _replacesoldkernels=("${_replacesoldkernels[@]/\%/${pkgbase#linux-libre}}") @@ -125,12 +126,12 @@ _package() { make INSTALL_MOD_PATH="$pkgdir" modules_install echo "Install mkinitcpio preset file for kernel..." - sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/linux.preset" | - install -D -m644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" + sed "s|%PKGBASE%|$pkgbase|g" "$srcdir/linux.preset" | + install -D -m644 /dev/stdin "$pkgdir/etc/mkinitcpio.d/$pkgbase.preset" echo "Install pacman hook for initramfs regeneration..." - sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/90-linux.hook" | - install -D -m644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/90-${pkgbase}.hook" + sed "s|%PKGBASE%|$pkgbase|g" "$srcdir/90-linux.hook" | + install -D -m644 /dev/stdin "$pkgdir/usr/share/libalpm/hooks/90-$pkgbase.hook" # remove build and source links rm "$modulesdir"/{source,build} |