summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lambiris2021-08-04 22:29:26 -0400
committerTony Lambiris2021-08-04 22:29:26 -0400
commitb0a769bfefcd07c6cb43dd1a76802bfab293f978 (patch)
tree847135929fe9dd775abb24b044aed11bd34fa1e3
parent5458ff864be5c8379515823c71f52063d48e38d8 (diff)
downloadaur-b0a769bfefcd07c6cb43dd1a76802bfab293f978.tar.gz
Version bump
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
-rw-r--r--system76-firmware-daemon.install57
3 files changed, 4 insertions, 65 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e6c3eab31b88..b4316b01f251 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = system76-firmware-daemon-git
pkgdesc = System76 Firmware Daemon provides a daemon for installing firmware updates.
pkgver = 1.0.28.r0.g031b923
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/pop-os/system76-firmware
arch = any
license = GPL
@@ -13,8 +13,6 @@ pkgbase = system76-firmware-daemon-git
conflicts = system76-driver<=17.10.32
conflicts = system76-firmware-daemon
source = system76-firmware-daemon-git::git://github.com/pop-os/system76-firmware.git
- source = system76-firmware-daemon.install
sha256sums = SKIP
- sha256sums = 1d2604a2d4273adf05752529d6af917abba7e64d9e04e3519d9c438632cfcf5b
pkgname = system76-firmware-daemon-git
diff --git a/PKGBUILD b/PKGBUILD
index a49c244773c3..d395b33da91b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=system76-firmware-daemon-git
pkgver=1.0.28.r0.g031b923
-pkgrel=1
+pkgrel=2
pkgdesc="System76 Firmware Daemon provides a daemon for installing firmware updates."
arch=('any')
url="https://github.com/pop-os/system76-firmware"
@@ -11,10 +11,8 @@ depends=('dbus' 'systemd' 'openssl-1.0')
makedepends=('rust')
conflicts=('system76-driver<=17.10.32' 'system76-firmware-daemon')
provides=('system76-firmware-daemon')
-source=("${pkgname}::git://github.com/pop-os/system76-firmware.git"
- "system76-firmware-daemon.install")
-sha256sums=('SKIP'
- '1d2604a2d4273adf05752529d6af917abba7e64d9e04e3519d9c438632cfcf5b')
+source=("${pkgname}::git://github.com/pop-os/system76-firmware.git")
+sha256sums=('SKIP')
pkgver() {
cd "${srcdir}/${pkgname}"
diff --git a/system76-firmware-daemon.install b/system76-firmware-daemon.install
deleted file mode 100644
index 89f0bc8341cc..000000000000
--- a/system76-firmware-daemon.install
+++ /dev/null
@@ -1,57 +0,0 @@
-_service="system76-firmware-daemon.service"
-
-_stop_service() {
- /usr/bin/systemctl stop $_service &>/dev/null
-}
-
-_disable_service() {
- /usr/bin/systemctl disable $_service &>/dev/null
- /usr/bin/systemctl reset-failed $_service &>/dev/null
-}
-
-_restore_service() {
- /usr/bin/systemctl -q is-enabled $service &>/dev/null && \
- /usr/bin/systemctl restart $service &>/dev/null
-}
-
-_package_message() {
- cat <<-EOT
-
- The System76 Firmware package provides the following system services:
-
- system76-firmware-daemon.service -- System76 service that exposes a DBUS API for handling firmware updates.
-
- EOT
-}
-
-post_install() {
- /usr/bin/systemctl daemon-reload &>/dev/null
-
- _package_message
-}
-
-pre_upgrade() {
- _stop_service
-}
-
-post_upgrade() {
- /usr/bin/systemctl daemon-reload &>/dev/null
-
- _restore_service
- _package_message
-}
-
-pre_remove() {
- _stop_service
- _disable_service
-}
-
-post_remove() {
- /usr/bin/systemctl daemon-reload &>/dev/null
-
- cat <<-EOT
-
- Be sure to stop and disable all running System76 user services.
-
- EOT
-}