Use pinned commit frag

Installing this package results in complaints being logged to dmesg.  These
may be the result of a conflict between

  * cros_kbd_led_backlight.ko (shipped with linux)
  * chromeos_keyboard_leds.ko (ours)

both of which, for example, claim the alias platform:chromeos-keyboard-leds.
Some workarounds include

   * blacklisting the existing "cros" module via modprobe.d
   * manually loading ours via modules-load.d
   * renaming the existing file to cros_kbd_led_backlight.ko.xz.orig

Of these, the second is chosen because upstream mentions it in its README.

A change to the core linux package on 2019-10-14 has removed auto-creation of
the main extramodules dir and symlinks to it from children of versioned
siblings.  Not sure whether this was in response to a shift in upstream
behavior, but module discovery appears unchanged.

See: 1fef2fd41ff7ad7f8713295471ee44adb9029c86

Although real archlinux packages like nvidia still use the extramodules
convention, this package has reverted to traditional upstream behavior.

See: https://git.archlinux.org/svntogit/packages.git
     /tree/trunk/PKGBUILD?h=packages/nvidia#n27

3 files changed, 57 insertions, 76 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9fa34b0d2de6..8bebc54a0ee4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
 pkgbase = chromebook_keyboard_backlight_driver
 	pkgdesc = Keyboard backlight driver for various chromebook models
 	pkgver = 1.0r24.g39568fa
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/corcoran/chromebook_keyboard_backlight_driver
 	install = chromebook_keyboard_backlight_driver.install
-	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = linux-headers
 	provides = chromebook_keyboard_backlight_driver
 	conflicts = chromebook_keyboard_backlight_driver
-	source = git://github.com/corcoran/chromebook_keyboard_backlight_driver.git
+	conflicts = chromebook_keyboard_backlight_driver-dkms
+	source = git+https://github.com/corcoran/chromebook_keyboard_backlight_driver.git#commit=39568facbc8440d84e4bfbd9cc380106ddc2b436
 	md5sums = SKIP
 
 pkgname = chromebook_keyboard_backlight_driver
diff --git a/PKGBUILD b/PKGBUILD
index 588cdf986dd9..2c0e30f53fbe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,67 +1,62 @@
 # Maintainer: Poppy Schmo <poppyschmo at users dot noreply.github.com>
+#
 pkgname=chromebook_keyboard_backlight_driver
+# This should be 0.0 instead of 0.1 but too late, now
 pkgver=1.0r24.g39568fa
-pkgrel=2
+pkgrel=3
 epoch=
 pkgdesc="Keyboard backlight driver for various chromebook models"
-arch=('i686' 'x86_64')
+arch=("x86_64")
 url="https://github.com/corcoran/chromebook_keyboard_backlight_driver"
-license=('GPL')
+license=("GPL")
 depends=()
-makedepends=('linux-headers')
 provides=("$pkgname")
-conflicts=("$pkgname")
+conflicts=("$pkgname" "$pkgname-dkms")
 install=${pkgname}.install
-source=("git://github.com/corcoran/chromebook_keyboard_backlight_driver.git")
-md5sums=('SKIP')
+_commit=39568facbc8440d84e4bfbd9cc380106ddc2b436
+_baseurl=git+https://github.com/corcoran/chromebook_keyboard_backlight_driver.git
+source=("$_baseurl#commit=$_commit")
+md5sums=(SKIP)
 
 pkgver() {
-	cd "${srcdir}/${pkgname}"
-	printf "1.0r%s.g%s" "$(git rev-list --count HEAD)" "$(git describe --always)"
+    cd "${srcdir}/${pkgname}"
+    printf "1.0r%s.g%s" "$(git rev-list --count HEAD)" "$(git describe --always)"
 }
 
 build() {
-	cd "${srcdir}/${pkgname}"
-	make
+    local _target_dirs _kvers
+    cd "${srcdir}/${pkgname}"
+    _target_dirs=$(find /usr/lib/modules -name vmlinuz -printf '%h\n')
+    while read -r _kvers; do
+        [[ -d "$_kvers" ]] || exit 11
+        msg2 "$(gettext "Building module for $_kvers")"
+        mkdir -p "_output/${_kvers##*/}"
+        KDIR="$_kvers/build" make -j1
+        mv -v ./*.ko "_output/${_kvers##*/}"
+    done <<<"${_target_dirs%$'\n'}"
 }
 
 package() {
-	local _excl _confd _conf _docd _newest each tdir _multi
-	_excl=_bl # don't autoload chromeos_keyboard_bl.ko variant
-	_confd=$pkgdir/etc/modules-load.d
-	_conf=chromebook_keyboard_backlight_driver.conf
-	_docd=$pkgdir/usr/share/doc/$pkgname
-	_bin=$pkgdir/usr/bin
-	_newest=
-	cd "$srcdir/$pkgname"
-	_multi=skipped_kernels.log
-	echo "# Modules for these kernels were skipped during install" > "$_multi"
-	echo "# Modules for $pkgname" > "$_conf"
-	for each in *.ko; do
-		if [[ $(file "$each") != *BuildID* ]]; then
-			continue
-		fi
-		gzip --keep "$each"
-		for tdir in $(ls -d /usr/lib/modules/extramodules* | sort -Vr); do
-			[[ ! -f "$each.gz" || ! -d "$tdir" ]] && continue
-			if [[ -z "$_newest" || $_newest == "$tdir" ]]; then
-				install -Dm 644 "$each.gz" "$pkgdir/$tdir/$each.gz"
-				_newest=$tdir
-			else
-				# minor versions should probably match but aren't checked;
-				# this note gets deleted anyway if makepkg is run with -c
-				echo "$tdir" >> "$_multi"
-			fi
-		done
-		if [[ ! $each == *"$_excl"* ]]; then
-			basename "$each" '.ko' >> "$_conf"
-		else
-			echo "#$(basename "$each" '.ko')" >> "$_conf"
-		fi
-	done
-	install -Dm 644 README.markdown "$_docd/README.markdown"
-	install -Dm 644 "$_conf" "$_confd/$_conf"
-	install -Dm 6711 keyboard_brightness "$_bin/keyboard_brightness"
+    local _mod _path _target_dir _mod_dir
+    cd "$srcdir/$pkgname"
+    echo "chromeos_keyboard_leds" > _load.conf
+    install -Dm 644 _load.conf \
+        "$pkgdir/etc/modules-load.d/chromebook_keyboard_backlight_driver.conf"
+    for _path in _output/*; do
+        _kvers=${_path#*/}
+        _mod_dir=/usr/lib/modules/$_kvers
+        [[ -d $_mod_dir ]] || exit 12
+        _target_dir=$_mod_dir/kernel/drivers/platform/chrome
+        cd "$_path"
+        for _mod in *.ko; do
+            xz --force --keep "$_mod"
+            [[ $_mod == chromeos_keyboard_bl.ko ]] && continue
+            install -Dm 644 "$_mod.xz" "$pkgdir/$_target_dir/$_mod.xz"
+        done
+        cd "$srcdir/$pkgname"
+    done
+    install -Dm 644 README.markdown "$pkgdir/usr/share/doc/$pkgname/README.markdown"
+    install -Dm 6711 keyboard_brightness "$pkgdir/usr/bin/keyboard_brightness"
 }
 
-# vim:ft=sh:noet:list
+# vim:ft=sh
diff --git a/chromebook_keyboard_backlight_driver.install b/chromebook_keyboard_backlight_driver.install
index e870f27ce7b5..75c8c0be63d8 100644
--- a/chromebook_keyboard_backlight_driver.install
+++ b/chromebook_keyboard_backlight_driver.install
@@ -1,31 +1,18 @@
 
-_spit() {
-	local _zero _bd _bl _yl
-	if command -v tput &> /dev/null; then
-		_zero="$(tput sgr0 2> /dev/null)"
-		_bd=${_zero}"$(tput bold)"
-		_bl="$(tput setaf 4)"
-		_yl=${_bd}"$(tput setaf 3)"
-	fi
-	if (( $# == 2 )); then
-		echo "$_bl=>$_yl $1:$_bd ${2}$_zero"
-	else
-		echo "$_bl=>$_bd ${1}$_zero"
-	fi
-}
-
 post_install() {
-	local _confd=/etc/modules-load.d
-	local _conf=chromebook_keyboard_backlight_driver.conf
-	depmod -a
-	_spit "note" "Added $_conf to $_confd."
-	_spit "For 'backlight' variant, toggle commented lines where appropriate."
-	_spit "Or, delete file to prevent auto-loading entirely. Otherwise, reboot."
-	_spit "Afterwards, check dmesg, lsmod, or '/sys/class/leds' to verify."
+    source /usr/share/makepkg/util/message.sh
+    colorize
+    msg2 "$(gettext "The 'backlight' variant was not installed (this is normal).")"
+    msg2 "$(gettext "If needed, grab it from ./src/chromebook_keyboard_backlight_driver/_output/*/")"
+    depmod -a
+    modprobe -r cros_kbd_led_backlight || :
+    modprobe chromebook_kb_backlight
+    modprobe chromeos_keyboard_leds
+    msg2 "$(gettext "You may need to restart for changes to take effect")"
 }
 
 post_upgrade() {
-	post_install
+    post_install
 }
 
-# vim:ts=4:sw=4:sts=4:noet:list:ft=sh:
+# vim:ft=sh