From 1c0a6ae932e3b8045b00ea3fcace268539a91449 Mon Sep 17 00:00:00 2001 From: june-fish Date: Sun, 18 Aug 2024 13:47:26 -0500 Subject: [PATCH 1/6] use preset and restart keyd --- anda/system/cros-keyboard-map/cros-keyboard-map.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/anda/system/cros-keyboard-map/cros-keyboard-map.spec b/anda/system/cros-keyboard-map/cros-keyboard-map.spec index 7fd51f6900..15027bb1cb 100644 --- a/anda/system/cros-keyboard-map/cros-keyboard-map.spec +++ b/anda/system/cros-keyboard-map/cros-keyboard-map.spec @@ -6,7 +6,7 @@ Name: cros-keyboard-map Version: %commit_date.%shortcommit -Release: 1%?dist +Release: 2%?dist License: BSD-3-Clause Summary: Utility to generate keyd configurations for use on Chromebooks @@ -59,9 +59,15 @@ After=tmp.mount [Service] Type=oneshot ExecStart=/bin/bash /usr/bin/um-generate-cros-keymap +ExecStartPost=+/usr/bin/systemctl restart keyd.service [Install] -WantedBy=sysinit.target +WantedBy=multi-user.target +EOF +mkdir -p %buildroot/etc/systemd/system-preset +tee %buildroot/etc/systemd/system-preset/00-cros-keyboard-map.preset < Date: Sun, 18 Aug 2024 14:18:46 -0500 Subject: [PATCH 2/6] do not need before=keyd --- anda/system/cros-keyboard-map/cros-keyboard-map.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/anda/system/cros-keyboard-map/cros-keyboard-map.spec b/anda/system/cros-keyboard-map/cros-keyboard-map.spec index 15027bb1cb..ae789c0817 100644 --- a/anda/system/cros-keyboard-map/cros-keyboard-map.spec +++ b/anda/system/cros-keyboard-map/cros-keyboard-map.spec @@ -53,7 +53,6 @@ mkdir -p %buildroot/etc/systemd/system tee %buildroot/etc/systemd/system/cros-keyboard-map.service < Date: Sun, 18 Aug 2024 15:02:28 -0500 Subject: [PATCH 3/6] move systemd presets to ultramarine linux edition package --- anda/system/cros-keyboard-map/cros-keyboard-map.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/anda/system/cros-keyboard-map/cros-keyboard-map.spec b/anda/system/cros-keyboard-map/cros-keyboard-map.spec index ae789c0817..c67b7b7134 100644 --- a/anda/system/cros-keyboard-map/cros-keyboard-map.spec +++ b/anda/system/cros-keyboard-map/cros-keyboard-map.spec @@ -63,11 +63,6 @@ ExecStartPost=+/usr/bin/systemctl restart keyd.service [Install] WantedBy=multi-user.target EOF -mkdir -p %buildroot/etc/systemd/system-preset -tee %buildroot/etc/systemd/system-preset/00-cros-keyboard-map.preset < Date: Sat, 24 Aug 2024 13:27:38 -0500 Subject: [PATCH 4/6] use keyd reload after install --- anda/system/cros-keyboard-map/cros-keyboard-map.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/cros-keyboard-map/cros-keyboard-map.spec b/anda/system/cros-keyboard-map/cros-keyboard-map.spec index c67b7b7134..b05e0e0c32 100644 --- a/anda/system/cros-keyboard-map/cros-keyboard-map.spec +++ b/anda/system/cros-keyboard-map/cros-keyboard-map.spec @@ -58,7 +58,7 @@ After=tmp.mount [Service] Type=oneshot ExecStart=/bin/bash /usr/bin/um-generate-cros-keymap -ExecStartPost=+/usr/bin/systemctl restart keyd.service +ExecStartPost=+/usr/bin/keyd reload [Install] WantedBy=multi-user.target From 5a03f2bb9f357cbf8bd014d62e1d3ad64ff8dc44 Mon Sep 17 00:00:00 2001 From: junefish Date: Sat, 24 Aug 2024 14:54:00 -0500 Subject: [PATCH 5/6] split scripts into seperate repo --- .../cros-keyboard-map/cros-keyboard-map.spec | 80 +++++++------------ anda/system/cros-keyboard-map/update.rhai | 4 +- 2 files changed, 32 insertions(+), 52 deletions(-) diff --git a/anda/system/cros-keyboard-map/cros-keyboard-map.spec b/anda/system/cros-keyboard-map/cros-keyboard-map.spec index b05e0e0c32..dc696b210b 100644 --- a/anda/system/cros-keyboard-map/cros-keyboard-map.spec +++ b/anda/system/cros-keyboard-map/cros-keyboard-map.spec @@ -1,69 +1,45 @@ -%global commit b2e69368f96bdf7562dc1a95a0d863c794756842 -%global commit_date 20240814 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global tree_commit b2e69368f96bdf7562dc1a95a0d863c794756842 +%global tree_commit_date 20240814 +%global tree_shortcommit %(c=%{tree_commit}; echo ${c:0:7}) + +%global um_commit 46892acafb2fff3f3ace425d4694382c92645feb +%global um_commit_date 20240824 +%global um_shortcommit %(c=%{um_commit}; echo ${c:0:7}) + %global debug_package %{nil} %define __os_install_post %{nil} Name: cros-keyboard-map -Version: %commit_date.%shortcommit -Release: 2%?dist +Version: %tree_commit_date.%tree_shortcommit.%um_commit_date.%um_shortcommit +Release: 1%?dist License: BSD-3-Clause Summary: Utility to generate keyd configurations for use on Chromebooks -URL: https://github.com/WeirdTreeThing/cros-keyboard-map -Source0: https://github.com/WeirdTreeThing/cros-keyboard-map/archive/%commit/cros-keyboard-map-%commit.tar.gz +URL: https://github.com/Ultramarine-Linux/cros-keyboard-map +Source0: https://github.com/WeirdTreeThing/cros-keyboard-map/archive/%{tree_commit}/cros-keyboard-map-%{tree_commit}.tar.gz +Source1: https://github.com/Ultramarine-Linux/cros-keyboard-map/archive/%{um_commit}/cros-keyboard-map-%{um_commit}.tar.gz %{?systemd_requires} BuildRequires: systemd-rpm-macros Requires: keyd python3 python3-libfdt %description -Set of tools designed to help develop and debug software and firmware on Intel platforms with AudioDSP onboard. - -Related to alsa-utils which is also set of utilities but targets AdvancedLinuxSoundArchitecture (ALSA) audience in more general fashion. +Bash script and systemd service to apply WeirdTreeThing's Chromebook keyboard maps. %prep -%autosetup -n cros-keyboard-map-%commit +%autosetup -n cros-keyboard-map-%tree_commit +tar --strip-components=1 -zxvf %{SOURCE1} %install -mkdir -p %buildroot/etc/cros-keyboard-map/configs -install -Dm755 cros-keyboard-map.py %buildroot/etc/cros-keyboard-map/cros-keyboard-map.py -cp configs/* %buildroot/etc/cros-keyboard-map/configs - -mkdir -p %buildroot/usr/bin -tee %buildroot/usr/bin/um-generate-cros-keymap < /dev/null) -then - cp /etc/cros-keyboard-map/configs/cros-pixel.conf /etc/cros-keyboard-map/current.config -elif (grep -E "^(Sarien|Arcada)$" /sys/class/dmi/id/product_name &> /dev/null) -then - cp /etc/cros-keyboard-map/configs/cros-sarien.conf /etc/cros-keyboard-map/current.config -else - python3 /etc/cros-keyboard-map/cros-keyboard-map.py --file /etc/cros-keyboard-map/current.config -fi - -mkdir -p /etc/keyd -if [[ -f /etc/keyd/default.conf ]]; then - rm /etc/keyd/default.conf -fi -ln -s /etc/cros-keyboard-map/current.config /etc/keyd/default.conf -EOF - -mkdir -p %buildroot/etc/systemd/system -tee %buildroot/etc/systemd/system/cros-keyboard-map.service < +- Split off into seperate git repo. * Sat May 4 2024 Owen-sz - Initial package. diff --git a/anda/system/cros-keyboard-map/update.rhai b/anda/system/cros-keyboard-map/update.rhai index 46a9eeca30..8b659b08cd 100644 --- a/anda/system/cros-keyboard-map/update.rhai +++ b/anda/system/cros-keyboard-map/update.rhai @@ -1,7 +1,9 @@ if filters.contains("nightly") { + rpm.global("tree_commit", gh_commit("WeirdTreeThing/cros-keyboard-map")); rpm.global("commit", gh_commit("WeirdTreeThing/cros-keyboard-map")); if rpm.changed() { rpm.release(); - rpm.global("commit_date", date()); + rpm.global("tree_commit_date", date()); + rpm.global("um_commit_date", date()); } } From f30a6b4cac9a75d8b2daa1839ae40925c4534fbd Mon Sep 17 00:00:00 2001 From: junefish Date: Sat, 24 Aug 2024 14:56:05 -0500 Subject: [PATCH 6/6] fix license --- anda/system/cros-keyboard-map/cros-keyboard-map.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/cros-keyboard-map/cros-keyboard-map.spec b/anda/system/cros-keyboard-map/cros-keyboard-map.spec index dc696b210b..f65c2b72b2 100644 --- a/anda/system/cros-keyboard-map/cros-keyboard-map.spec +++ b/anda/system/cros-keyboard-map/cros-keyboard-map.spec @@ -13,7 +13,7 @@ Name: cros-keyboard-map Version: %tree_commit_date.%tree_shortcommit.%um_commit_date.%um_shortcommit Release: 1%?dist -License: BSD-3-Clause +License: BSD-3-Clause and GPLv3 Summary: Utility to generate keyd configurations for use on Chromebooks URL: https://github.com/Ultramarine-Linux/cros-keyboard-map Source0: https://github.com/WeirdTreeThing/cros-keyboard-map/archive/%{tree_commit}/cros-keyboard-map-%{tree_commit}.tar.gz