diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-10-23 06:54:55 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-10-23 11:19:05 +0000 |
| commit | 95e32b464fa4bacfb495ccd68757b90cdbe759f2 (patch) | |
| tree | 606cbf453bcd688147a4c6b2106f1ac67627ac72 /main/linux-vanilla | |
| parent | 8bb9777abd07c0c1c34be479aeb66b944c71eafe (diff) | |
| download | aports-95e32b464fa4bacfb495ccd68757b90cdbe759f2.tar.bz2 aports-95e32b464fa4bacfb495ccd68757b90cdbe759f2.tar.xz | |
main/linux-vanilla: upgrade to 4.14.78
Diffstat (limited to 'main/linux-vanilla')
| -rw-r--r-- | main/linux-vanilla/0001-HID-quirks-fix-support-for-Apple-Magic-Keyboards.patch | 35 | ||||
| -rw-r--r-- | main/linux-vanilla/APKBUILD | 8 |
2 files changed, 3 insertions, 40 deletions
diff --git a/main/linux-vanilla/0001-HID-quirks-fix-support-for-Apple-Magic-Keyboards.patch b/main/linux-vanilla/0001-HID-quirks-fix-support-for-Apple-Magic-Keyboards.patch deleted file mode 100644 index 864070e0b1..0000000000 --- a/main/linux-vanilla/0001-HID-quirks-fix-support-for-Apple-Magic-Keyboards.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 80f1d275c53464f7f8154b8d36012c1c68ab6719 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 17 Oct 2018 14:26:55 +0200 -Subject: [PATCH] HID: quirks: fix support for Apple Magic Keyboards - -Commit ee345492 (HID: add support for Apple Magic Keyboards) added -support for the Magic Keyboard over Bluetooth, but did not add the -BT_VENDOR_ID_APPLE to hid-quirks. Fix this so hid-apple driver is used -over hid-generic. - -This fixes the Fn key, which does not work at all with hid-generic. - -Bugzilla-id: https://bugzilla.kernel.org/show_bug.cgi?id=99881 -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - drivers/hid/hid-core.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c -index 672b0be41d44..a306493e2e97 100644 ---- a/drivers/hid/hid-core.c -+++ b/drivers/hid/hid-core.c -@@ -1964,6 +1964,9 @@ static const struct hid_device_id hid_have_special_driver[] = { - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO) }, - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS) }, - { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI) }, -+ { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_ANSI) }, -+ { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_ANSI) }, - { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) }, - { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, - #endif --- -2.19.1 - diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD index 24d3060b56..48ab0eb833 100644 --- a/main/linux-vanilla/APKBUILD +++ b/main/linux-vanilla/APKBUILD @@ -2,12 +2,12 @@ _flavor=vanilla pkgname=linux-${_flavor} -pkgver=4.14.77 +pkgver=4.14.78 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=1 +pkgrel=0 pkgdesc="Linux vanilla kernel" url="http://kernel.org" depends="mkinitfs" @@ -17,7 +17,6 @@ options="!strip" _config=${config:-config-vanilla.${CARCH}} install= source="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz - 0001-HID-quirks-fix-support-for-Apple-Magic-Keyboards.patch config-vanilla.aarch64 config-vanilla.armhf config-vanilla.x86 @@ -219,7 +218,6 @@ _dev() { } sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz -421a64fc535a2091facddcc6ad4847351ccbe461f5cb57a6634d4fa78e0f4379eaf68bc43b451c026c6b07425bd7b14bc7730050f02fbe9563f6d580f9661f1b 0001-HID-quirks-fix-support-for-Apple-Magic-Keyboards.patch 2429433ce9e0bbf0a400f6e0a0bc25730a66f74d3365793063252239cfec8fcaa9af5c99d0933f0b239ec9b2e28645bbc05e7e150a90c0a481c2870a03c902e4 config-vanilla.aarch64 f983fd992e281f68dce3b4bf99ca0a5578a9c5bbafec1cda34a3e3e1dcf1d03dbc8cca3cfa5e3d5bbccc394bd34ca0b69ca28d004552a6d00037d577dccb1071 config-vanilla.armhf 0206981c09a8a3c6f3261b0a6722324629a6d8d4da9872923bb85cb1a43756c95833331c65ef63ec040e86aa8ed616a6623b74c36f1aa98138c0212102814c7f config-vanilla.x86 @@ -229,4 +227,4 @@ adc20244550d66da34de747a0b7dccf3bbc86a46491e97de4c17e9873c1a4578b7afd31717c0a8ba 10ecea3e0a101a898e347a42d74f9a3d8f226153cf487e1d65f59fb557b6fdaccab0d2ad6cf705c6cdeb5ed053eb7c5edecc655b3700e4ba237e965c0b6e417e config-vanilla.s390x 830f568c91a17cfc57b5458a9b949c343b87ee160a7e27f50010be0ff8e5f80163114b8852dec5a8ce2849ddd99a2530c67dbb818c41a0c69e241fc87e5ff145 config-virt.x86 5c9b45399dc4477e37e350e763b869a30e3b52815ba60208b805147f16316221d017d0a593f1f2911aeaf89d73f5603e06f7e478b19db4fad49ce15025ec28e6 config-virt.x86_64 -4135a64a0ff64f20cc405a1afd12961cfefdb998bae027aeef837506fd6fc77efd34bf58d74e82ec65f9826b96443235f994c375323df77533ca6ea050819d5b patch-4.14.77.xz" +bf0c0cbe9ee7ddfee0d8a70656e6db5979d1928c7aad917039c471ad6e2b049fe9d0f59161dab5ccfb9180263d2630cd6df735524b5886f0d05f709cb30b11bd patch-4.14.78.xz" |