Date: Sunday, October 30, 2022 @ 17:06:53
  Author: farseerfc
Revision: 1339554

upgpkg: stratisd 3.3.0-1

Modified:
  stratisd/trunk/PKGBUILD

----------+
 PKGBUILD |   29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-10-30 16:32:35 UTC (rev 1339553)
+++ PKGBUILD    2022-10-30 17:06:53 UTC (rev 1339554)
@@ -2,34 +2,22 @@
 # Contributor: Dan Beste <[email protected]>
 
 pkgname='stratisd'
-pkgver=2.4.4
+pkgver=3.3.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')
+makedepends=('asciidoc' 'cargo' 'rust' 'clang' 'dracut')
 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=('254edcf50be984294bb4d7323f274032410ff1e7064d102a921fcbd9f4e6fe7e7cd171a9c3d664712540b19522496a2bac53d1206521ce4892d80e67989b845e')
+b2sums=('e815b736129de78ca1e6b0a6bdb4a5ee60d93b6b24feb2af0470333f4c7f1157507af52bc724f88cee980b940c29c82c6e4481bb8f50289cb3a3af4ab541abfc')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
-
-  # patch libexec path in configs
-  configs=(systemd/stratisd.service
-           dracut/90stratis/module-setup.sh
-           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
-
-  sed -e 's|-D unused||' -e 's|-D warnings||' -i Makefile # Fix build
 }
 
 build() {
@@ -37,9 +25,10 @@
 
   # Release
   export LIBEXECDIR=/usr/lib
-  make release
-  make release-min
-  make docs/stratisd.8
+  cargo build --release --bin=stratisd
+  cargo build --release --bin=stratis-min --bin=stratisd-min 
--bin=stratis-utils --no-default-features --features min,systemd_compat
+
+  a2x -f manpage docs/stratisd.txt
 }
 
 check() {
@@ -46,7 +35,7 @@
   cd "${pkgname}-${pkgver}"
 
   export LIBEXECDIR=/usr/lib
-  make test
+  cargo test --no-run
 }
 
 package() {
@@ -55,7 +44,7 @@
   export LIBEXECDIR=/usr/lib
   install -dm755 "${pkgdir}/usr/lib/systemd/system-generators"
   install -dm755 "${pkgdir}/usr/bin"
-  make install DESTDIR="${pkgdir}" PREFIX="/usr" LIBEXECDIR="/usr/lib"
+  make install DESTDIR="${pkgdir}" PREFIX="/usr" LIBEXECDIR="/usr/lib" 
DRACUTDIR="/usr/lib/dracut" PROFILEDIR=release
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 

Reply via email to