summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSavely Krasovsky2022-07-07 00:12:15 +0300
committerSavely Krasovsky2022-07-07 00:12:15 +0300
commit478a593326eac78f752e1b0ba1ec08e8046cb989 (patch)
tree07710df38468be08baf7ed4d331a3dc45fab3c8a
parent4ff03553db07b43ba2a188b2103073bca2450755 (diff)
downloadaur-478a593326eac78f752e1b0ba1ec08e8046cb989.tar.gz
1.7 draft
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD48
-rw-r--r--reform-hw-setup.service10
-rw-r--r--reform-sleep.service14
4 files changed, 33 insertions, 51 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1288d2b1dd56..ee3868423db8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = reform-tools
pkgdesc = MNT Reform laptop tools
- pkgver = 1.0
- pkgrel = 8
+ pkgver = 1.7
+ pkgrel = 0
url = https://mntre.com/reform2/handbook/index.html
arch = x86_64
arch = aarch64
@@ -16,13 +16,9 @@ pkgbase = reform-tools
depends = busybox
optdepends = ircii
optdepends = pavucontrol
- source = reform-tools-1.0.tar.gz::https://source.mnt.re/reform/reform-debian-packages/-/archive/reform-tools-1.0-8/reform-debian-packages-reform-tools-1.0-8.tar.gz
- source = reform-hw-setup.service
- source = reform-sleep.service
+ source = reform-tools-1.7.tar.gz::https://source.mnt.re/reform/reform-tools/-/archive/2e0cff9b45d45237822a1d27e40dfd74af9476d0/reform-tools-2e0cff9b45d45237822a1d27e40dfd74af9476d0.tar.gz
source = motd
- sha256sums = 0770f3d260913b7fed25f2e5043749c9b1879150fa8ea8d4e9ca674b26f571cc
- sha256sums = dd22f0111a044af4a1b03017616a20bed9863d65ffd90670d764b559daf207ed
- sha256sums = 85a325247a4946c44fe01537756a0730a570c693944dda0f782c1d236adb419e
+ sha256sums = edfb6e261a4174b983bb27a1dab370e96800a6b545b1225c5715bef960305a05
sha256sums = 30f643cbe65b0cdfca24326c68bce1a4e8a66c39aad3a81deec1c9532f7e4914
pkgname = reform-tools
diff --git a/PKGBUILD b/PKGBUILD
index b3a7748989d2..61dd97294045 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Savely Krasovsky <savely@krasovs.ky>
pkgname=reform-tools
-pkgver=1.0
-pkgrel=8
+pkgver=1.7
+pkgrel=0
pkgdesc="MNT Reform laptop tools"
arch=('x86_64' 'aarch64')
url="https://mntre.com/reform2/handbook/index.html"
@@ -16,30 +16,40 @@ depends=('python'
makedepends=('git')
optdepends=('ircii'
'pavucontrol')
-source=("$pkgname-$pkgver.tar.gz::https://source.mnt.re/reform/reform-debian-packages/-/archive/reform-tools-1.0-8/reform-debian-packages-reform-tools-1.0-8.tar.gz"
- 'reform-hw-setup.service'
- 'reform-sleep.service'
+source=("$pkgname-$pkgver.tar.gz::https://source.mnt.re/reform/reform-tools/-/archive/2e0cff9b45d45237822a1d27e40dfd74af9476d0/reform-tools-2e0cff9b45d45237822a1d27e40dfd74af9476d0.tar.gz"
'motd')
-sha256sums=('0770f3d260913b7fed25f2e5043749c9b1879150fa8ea8d4e9ca674b26f571cc'
- 'dd22f0111a044af4a1b03017616a20bed9863d65ffd90670d764b559daf207ed'
- '85a325247a4946c44fe01537756a0730a570c693944dda0f782c1d236adb419e'
+sha256sums=('edfb6e261a4174b983bb27a1dab370e96800a6b545b1225c5715bef960305a05'
'30f643cbe65b0cdfca24326c68bce1a4e8a66c39aad3a81deec1c9532f7e4914')
prepare() {
- cd reform-debian-packages-reform-tools-1.0-8/reform-tools_1.0-8
- rm -rf etc/apt
- mv lib usr/
- mv sbin/* usr/bin
+ cd reform-tools-2e0cff9b45d45237822a1d27e40dfd74af9476d0
+
+ mv Iosevka-Term /usr/share/fonts
+
+ mv audio/99-reform.rules /lib/udev/rules.d
+ mv audio/analog-input-reform.conf /usr/share/pulseaudio/alsa-mixer/paths
+ mv audio/asound.state /var/lib/alsa
+ mv audio/reform.conf /usr/share/pulseaudio/alsa-mixer/profile-sets
+ rm -r audio/
+
+ mv bin/* /usr/bin
+ rm -r bin
+
+ mv etc/* /etc
+ rm -r etc
+
+ mv sbin/* /usr/sbin
rm -r sbin
- mv usr/sbin/* usr/bin/
- rm -r usr/sbin
+
+ mv systemd/reform-poweroff /lib/systemd/system-shutdown
+ mv systemd/reform-sleep.conf /usr/lib/systemd/sleep.conf.d
+ rm -r systemd
+
+ cd ..
+ rm -r reform-tools-2e0cff9b45d45237822a1d27e40dfd74af9476d0
}
package() {
- cd reform-debian-packages-reform-tools-1.0-8/reform-tools_1.0-8
- cp -dr --no-preserve=ownership {etc,usr} $pkgdir/
-
+ cp -dr --no-preserve=ownership . $pkgdir/
install -Dm644 "$srcdir"/motd -t "$pkgdir"/etc
- install -Dm644 "$srcdir"/reform-hw-setup.service -t "$pkgdir"/usr/lib/systemd/system
- install -Dm644 "$srcdir"/reform-sleep.service -t "$pkgdir"/usr/lib/systemd/system
}
diff --git a/reform-hw-setup.service b/reform-hw-setup.service
deleted file mode 100644
index 7a8e3ba5cf3f..000000000000
--- a/reform-hw-setup.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=MNT Reform Hardware Defaults Setup
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/reform-hw-setup.sh
-StandardOutput=journal
-
-[Install]
-WantedBy=sysinit.target
diff --git a/reform-sleep.service b/reform-sleep.service
deleted file mode 100644
index 40722348d72a..000000000000
--- a/reform-sleep.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Reform Suspend Helper
-Before=sleep.target
-StopWhenUnneeded=yes
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/sbin/reform-standby suspend
-ExecStop=/usr/sbin/reform-standby resume
-# Note: reform-standby comes with the reform-tools package.
-
-[Install]
-WantedBy=sleep.target