From f25766b4bbc66d50f47a431f7c09b68755081658 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 21 Nov 2020 09:55:58 -0800 Subject: [PATCH] pinebookpro-base: update to 0.3 Mark asound.state file as mutable. Rename udev hwdb to denote pinebookpro specificity. Rather than using an evdev hwdb match, set up a custom match via a udev rule so that only the keyboard (and not other devices are matched). Without the custom rule, lines like the following appear in dmesg: udevd[...]: Error calling EVIOCSKEYCODE on device node [...]: Invalid argument --- .../files/{10-usb-kbd.hwdb => 10-pinebookpro.hwdb} | 2 +- srcpkgs/pinebookpro-base/files/60-pinebookpro.rules | 7 +++++++ srcpkgs/pinebookpro-base/template | 6 ++++-- 3 files changed, 12 insertions(+), 3 deletions(-) rename srcpkgs/pinebookpro-base/files/{10-usb-kbd.hwdb => 10-pinebookpro.hwdb} (76%) create mode 100644 srcpkgs/pinebookpro-base/files/60-pinebookpro.rules diff --git a/srcpkgs/pinebookpro-base/files/10-usb-kbd.hwdb b/srcpkgs/pinebookpro-base/files/10-pinebookpro.hwdb similarity index 76% rename from srcpkgs/pinebookpro-base/files/10-usb-kbd.hwdb rename to srcpkgs/pinebookpro-base/files/10-pinebookpro.hwdb index f8348e6fb3e..65f4b3ed317 100644 --- a/srcpkgs/pinebookpro-base/files/10-usb-kbd.hwdb +++ b/srcpkgs/pinebookpro-base/files/10-pinebookpro.hwdb @@ -1,4 +1,4 @@ -evdev:input:b0003v258Ap001E* +pinebookpro:keyboard KEYBOARD_KEY_700a5=brightnessdown KEYBOARD_KEY_700a6=brightnessup KEYBOARD_KEY_70066=sleep diff --git a/srcpkgs/pinebookpro-base/files/60-pinebookpro.rules b/srcpkgs/pinebookpro-base/files/60-pinebookpro.rules new file mode 100644 index 00000000000..e095f669568 --- /dev/null +++ b/srcpkgs/pinebookpro-base/files/60-pinebookpro.rules @@ -0,0 +1,7 @@ +ACTION=="remove", GOTO="pinebookpro_end" +KERNEL!="event*", GOTO="pinebookpro_end" + +ENV{ID_VENDOR_ID}=="258a", ENV{ID_MODEL_ID}=="001e", ENV{ID_INPUT_KEYBOARD}=="1", \ + IMPORT{builtin}="hwdb 'pinebookpro:keyboard'", RUN{builtin}+="keyboard" + +LABEL="pinebookpro_end" diff --git a/srcpkgs/pinebookpro-base/template b/srcpkgs/pinebookpro-base/template index 9b4a41eb9a6..fce0a329b98 100644 --- a/srcpkgs/pinebookpro-base/template +++ b/srcpkgs/pinebookpro-base/template @@ -1,6 +1,6 @@ # Template file for 'pinebookpro-base' pkgname=pinebookpro-base -version=0.2 +version=0.3 revision=1 archs="aarch64*" build_style=meta @@ -9,8 +9,10 @@ short_desc="Void Linux Pinebook Pro platform package" maintainer="Renato Aguiar " license="Public Domain" homepage="https://www.voidlinux.org" +mutable_files="/var/lib/alsa/asound.state" do_install() { - vinstall "${FILESDIR}/10-usb-kbd.hwdb" 644 usr/lib/udev/hwdb.d + vinstall "${FILESDIR}/60-pinebookpro.rules" 644 usr/lib/udev/rules.d + vinstall "${FILESDIR}/10-pinebookpro.hwdb" 644 usr/lib/udev/hwdb.d vinstall "${FILESDIR}/asound.state" 644 var/lib/alsa }