[arch-commits] Commit in stratisd/trunk (PKGBUILD)

[Jiachen Yang]

    Date: Friday, May 14, 2021 @ 07:05:04
  Author: farseerfc
Revision: 933945

upgpkg: stratisd 2.4.0-1: stratis 2.4.0

Modified:
  stratisd/trunk/PKGBUILD

----------+
 PKGBUILD |   49 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-14 06:51:20 UTC (rev 933944)
+++ PKGBUILD	2021-05-14 07:05:04 UTC (rev 933945)
@@ -2,26 +2,33 @@
 # Contributor: Dan Beste <dan.ray.beste at gmail.com>
 
 pkgname='stratisd'
-pkgver=2.3.0
-pkgrel=2
+pkgver=2.4.0
+pkgrel=1
 pkgdesc='Easy to use local storage management for Linux.'
 arch=('x86_64')
 url='https://stratis-storage.github.io/'
 license=('MPL2')
 makedepends=('asciidoc' 'cargo' 'rust' 'clang')
-depends=('dbus' 'cryptsetup' 'util-linux-libs' 'clevis')
-optdepends=('stratis-cli: command line interface')
+depends=('dbus' 'cryptsetup' 'util-linux-libs' 'clevis' 'systemd')
+optdepends=('stratis-cli: command line interface'
+            'dracut: stratis as root filesystem support')
 checkdepends=('python-pyudev')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/stratis-storage/stratisd/archive/v${pkgver}.tar.gz")
-b2sums=('6ff63dad45c4a160017ece60dca399f3c9f635103576b0028b657e94dbf7e5156ae6a41cf417dd43a1eb3735eb728b1352b045185742a3de8b26b4bca833e144')
+b2sums=('f6e0cf98b5c320d4766e157f2fab158167b8ebd8ac24a0ecd99f13154697693d0f54a2eacac1138a977a448b203e19c32d3bf4b696cc93515e7b9038559f713a')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
 
-  # patch systemd config
-  sed -i 's,/usr/libexec,/usr/bin,g' stratisd.service
-  # patch dbus config
-  sed -i 's, --debug,,g' org.storage.stratis2.service
+  # patch libexec path in configs
+  configs=(systemd/stratisd.service
+           dracut/90stratis/module-setup.sh
+           org.storage.stratis2.service
+           dracut/90stratis/stratisd-min.service
+           systemd/stratisd-min-postinitrd.service)
+  for file in ${configs[@]}; do
+      echo "Patching libexec in $file"
+      sed -i 's,/usr/libexec,/usr/lib,g' $file 
+  done
 }
 
 build() {
@@ -29,7 +36,8 @@
 
   # Release
   make release
-  make stratisd.8
+  make release-min
+  make docs/stratisd.8
 }
 
 check() {
@@ -41,15 +49,18 @@
 package() {
   cd "${pkgname}-${pkgver}"
 
-  install -D -m755 "target/release/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
-  install -D -m755 "target/release/stratis_dbusquery_version" "${pkgdir}/usr/bin/stratis_dbusquery_version"
-  install -D -m755 "target/release/stratis_uuids_to_names" "${pkgdir}/usr/lib/udev/stratis_uuids_to_names"
-  install -D -m755 "developer_tools/stratis_migrate_symlinks.sh" "${pkgdir}/usr/bin/stratis_migrate_symlinks.sh"
-  install -D -m644 udev/11-stratisd.rules "${pkgdir}/usr/lib/udev/rules.d/11-stratisd.rules"
-  install -D -m644 stratisd.service "${pkgdir}/usr/lib/systemd/system/stratisd.service"
-  install -D -m644 org.storage.stratis2.service "${pkgdir}/usr/share/dbus-1/system-services/org.storage.stratis2.service"
-  install -D -m644 stratisd.conf "${pkgdir}/usr/share/dbus-1/system.d/stratisd.conf"
-  install -D -m644 docs/stratisd.8 "${pkgdir}/usr/share/man/man8/stratisd.8"
+  install -dm755 "${pkgdir}/usr/lib/systemd/system-generators"
+  install -dm755 "${pkgdir}/usr/bin"
+  make install DESTDIR="${pkgdir}" PREFIX="/usr" LIBEXECDIR="/usr/lib"
+  #install -D -m755 "target/release/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+  #install -D -m755 "target/release/stratis_dbusquery_version" "${pkgdir}/usr/bin/stratis_dbusquery_version"
+  #install -D -m755 "target/release/stratis_uuids_to_names" "${pkgdir}/usr/lib/udev/stratis_uuids_to_names"
+  #install -D -m755 "developer_tools/stratis_migrate_symlinks.sh" "${pkgdir}/usr/bin/stratis_migrate_symlinks.sh"
+  #install -D -m644 udev/11-stratisd.rules "${pkgdir}/usr/lib/udev/rules.d/11-stratisd.rules"
+  #install -D -m644 stratisd.service "${pkgdir}/usr/lib/systemd/system/stratisd.service"
+  #install -D -m644 org.storage.stratis2.service "${pkgdir}/usr/share/dbus-1/system-services/org.storage.stratis2.service"
+  #install -D -m644 stratisd.conf "${pkgdir}/usr/share/dbus-1/system.d/stratisd.conf"
+  #install -D -m644 docs/stratisd.8 "${pkgdir}/usr/share/man/man8/stratisd.8"
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }