some essential changes

6 files changed, 24 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f87ed92384cf..2612d828677d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = hexagonrpcd
 	pkgdesc = Qualcomm HexagonFS daemon
-	pkgver = v0.1.0
+	pkgver = 0.1.0.r0.g23b7681
 	pkgrel = 1
 	url = https://gitlab.com/flamingradian/sensh/
-	install = hexagonrpcd.install
 	arch = any
 	license = GPL-3.0-or-later
 	makedepends = linux-headers
@@ -19,8 +18,8 @@ pkgbase = hexagonrpcd
 	sha256sums = SKIP
 	sha256sums = 41dfc4e8c4fd88f461a5a6e4a4e86849eb302f8bcb2b5ce2efa9690f5415d52d
 	sha256sums = 2b22f7c6ab7e9dce334aa219cd1b07f4fadab1679f5f39a0da5631e2ee0bc0fa
-	sha256sums = ca375937f6e3ad0a69f7418e479ebbb4e488bc26e8b8547df59f2196d5c30c20
-	sha256sums = c63e9df4b593b3445253b48fe6d386cfcba6123737d54469d7da5b46786004e7
-	sha256sums = b514cf5d6a8c35fc2b43fcac01f54145c75650784d6791835aadb596c033eb69
+	sha256sums = 545d9db944cd3237fa3aec6de69837c7d5091d290092846e561b73529964d46f
+	sha256sums = 8034ebd8d4a7301d29ba7badbd87c165379272c8d99a32d75c68715cbceb9ff1
+	sha256sums = 67a474836f161055dedcaf99ecc32a9995127fce5ecca2d25d7b9d460cdf7413
 
 pkgname = hexagonrpcd
diff --git a/PKGBUILD b/PKGBUILD
index e32a74ff9bfe..edbccf985d01 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=(hexagonrpcd)
 pkgdesc="Qualcomm HexagonFS daemon"
-pkgver=v0.1.0
+pkgver=0.1.0.r0.g23b7681
 pkgrel=1
 arch=(any)
 license=(GPL-3.0-or-later)
@@ -26,14 +26,14 @@ sha256sums=(
     SKIP
     41dfc4e8c4fd88f461a5a6e4a4e86849eb302f8bcb2b5ce2efa9690f5415d52d
     2b22f7c6ab7e9dce334aa219cd1b07f4fadab1679f5f39a0da5631e2ee0bc0fa
-    ca375937f6e3ad0a69f7418e479ebbb4e488bc26e8b8547df59f2196d5c30c20
-    c63e9df4b593b3445253b48fe6d386cfcba6123737d54469d7da5b46786004e7
-    b514cf5d6a8c35fc2b43fcac01f54145c75650784d6791835aadb596c033eb69
+    545d9db944cd3237fa3aec6de69837c7d5091d290092846e561b73529964d46f
+    8034ebd8d4a7301d29ba7badbd87c165379272c8d99a32d75c68715cbceb9ff1
+    67a474836f161055dedcaf99ecc32a9995127fce5ecca2d25d7b9d460cdf7413
 )
 
 pkgver() {
   cd sensh
-  git describe --tags | sed 's/-rc/rc/;s/[^-]*-g/r&/;s/-/+/g'
+  git describe --long --abbrev=7 --tags $_commit | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
@@ -50,6 +50,9 @@ build() {
 package() {
   DESTDIR="$pkgdir" meson install --no-rebuild -C build
 
+  echo -e 'g fastrpc\nu fastrpc - "Qualcomm HexagonFS service" /var/lib/fastrpc' |
+    install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/fastrpc.conf"
+
   # Allow access for FastRPC node for FastRPC user/group
   install -Dm 644 "$srcdir"/10-fastrpc.rules -t "$pkgdir"/usr/lib/udev/rules.d/
 
@@ -57,5 +60,3 @@ package() {
   install -Dm755 "$srcdir"/$pkgname-adsp-sensorspd.service "$pkgdir"/usr/lib/systemd/system/$pkgname-adsp-sensorspd.service
   install -Dm755 "$srcdir"/$pkgname-sdsp.service "$pkgdir"/usr/lib/systemd/system/$pkgname-sdsp.service
 }
-
-install=$pkgname.install
diff --git a/hexagonrpcd-adsp-rootpd.service b/hexagonrpcd-adsp-rootpd.service
index ad9148ede1e0..96668c33b39f 100644
--- a/hexagonrpcd-adsp-rootpd.service
+++ b/hexagonrpcd-adsp-rootpd.service
@@ -1,5 +1,8 @@
 [Unit]
-Description="Hexagonrpcd ADSP RootPD"
+Name=Hexagonrpcd ADSP RootPD
+Description=Daemon to support Qualcomm Hexagon ADSP virtual filesystem for RootPD
+Requires=dev-fastrpc\x2dadsp.device
+After=dev-fastrpc\x2dadsp.device
 
 [Service]
 User=fastrpc
diff --git a/hexagonrpcd-adsp-sensorspd.service b/hexagonrpcd-adsp-sensorspd.service
index e4270b2bfe3e..f7a7230f739f 100644
--- a/hexagonrpcd-adsp-sensorspd.service
+++ b/hexagonrpcd-adsp-sensorspd.service
@@ -1,5 +1,8 @@
 [Unit]
-Description="Hexagonrpcd ADSP SensorPD"
+Name=Hexagonrpcd ADSP SensorPD
+Description=Daemon to support Qualcomm Hexagon ADSP virtual filesystem for SensorPD
+Requires=dev-fastrpc\x2dadsp.device
+After=dev-fastrpc\x2dadsp.device
 
 [Service]
 User=fastrpc
diff --git a/hexagonrpcd-sdsp.service b/hexagonrpcd-sdsp.service
index 5813c4cde47b..8430189c905b 100644
--- a/hexagonrpcd-sdsp.service
+++ b/hexagonrpcd-sdsp.service
@@ -1,5 +1,8 @@
 [Unit]
-Description=Hexagonrpcd SDSP
+Name=Hexagonrpcd SDSP
+Description=Daemon to support Qualcomm Hexagon SDSP virtual filesystem
+Requires=dev-fastrpc\x2dsdsp.device
+After=dev-fastrpc\x2dsdsp.device
 
 [Service]
 User=fastrpc
diff --git a/hexagonrpcd.install b/hexagonrpcd.install
deleted file mode 100644
index d272da83e239..000000000000
--- a/hexagonrpcd.install
+++ /dev/null
@@ -1,7 +0,0 @@
-pre_install() {
-  useradd -r -U -d /var/lib/fastrpc -s /usr/bin/nologin fastrpc 2>/dev/null
-}
-
-post_remove() {
-  userdel -r fastrpc 2>/dev/null
-}