Re: [PR PATCH] [Updated] pinebookpro-base: update to 0.3

[CameronNemo <CameronNemo@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 706 bytes --]

There is an updated pull request by CameronNemo against master on the void-packages repository

https://github.com/CameronNemo/void-packages pbp-base
https://github.com/void-linux/void-packages/pull/26565

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

A patch file from https://github.com/void-linux/void-packages/pull/26565.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pbp-base-26565.patch --]
[-- Type: text/x-diff, Size: 2966 bytes --]

From 3e71c3cc9d6e562a3701db886a611736e98cdc53 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
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..63d3e9ea21f
--- /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{idVendor}=="258a", ENV{idProduct}=="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 <renato@renatoaguiar.net>"
 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
 }