From 2c65ab1ada6bb4974cdd87f6a3a62016125c2e4c Mon Sep 17 00:00:00 2001 From: artoo Date: Wed, 4 May 2022 16:25:03 +0200 Subject: [PATCH] [trunk] -> [extra] 'ndctl-73-1' add --- trunk/PKGBUILD | 21 +++++++++++---------- x86_64/extra/PKGBUILD | 21 +++++++++++---------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index 50fdcda..e0ee472 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -1,30 +1,31 @@ # Maintainer: Felix Yan pkgname=ndctl -pkgver=72.1 +pkgver=73 pkgrel=1 pkgdesc='Utility library for managing the libnvdimm (non-volatile memory device) sub-system in the Linux kernel' arch=('x86_64') url="https://github.com/pmem/ndctl" license=('LGPL') depends=('iniparser' 'json-c' 'keyutils' 'kmod' 'libudev.so' 'util-linux-libs') -makedepends=('asciidoctor' 'bash-completion' 'udev' 'xmlto') +makedepends=('asciidoctor' 'bash-completion' 'meson' 'udev' 'xmlto') source=("https://github.com/pmem/ndctl/archive/v$pkgver/$pkgname-$pkgver.tar.gz") -sha512sums=('7304e23121c99457fa6e22a399fb636f6a66d6d07b090463ec41e424687b06e7e8a1a18623ab9dd5783aaccfa09ff964e3477b63aaa4614ac60f6e6050452f12') +sha512sums=('a52a1fb655f044e5cd48b95b3abd89b4f6a991d6439c02e66da6b55947b8a08c279fec873def0b5a18a4e0b670d40e246c333b619fb62f0c6808357d15d847a5') prepare() { # fix location of modprobe.d conf - sed -i 's|^modprobedir =.*|modprobedir = /usr/lib/modprobe.d/|' $pkgname-$pkgver/Makefile.am + sed -i "s|^modprobedatadir =.*|modprobedatadir = '/usr/lib/modprobe.d/'|" $pkgname-$pkgver/contrib/meson.build } build() { - cd "$srcdir"/$pkgname-$pkgver - ./autogen.sh - ./configure --prefix=/usr --sysconfdir=/etc --without-systemd - make + artix-meson $pkgname-$pkgver build -Dsystemd=disabled + meson compile -C build +} + +check() { + meson test -C build --print-errorlogs } package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install + meson install -C build --destdir "$pkgdir" } diff --git a/x86_64/extra/PKGBUILD b/x86_64/extra/PKGBUILD index 50fdcda..e0ee472 100644 --- a/x86_64/extra/PKGBUILD +++ b/x86_64/extra/PKGBUILD @@ -1,30 +1,31 @@ # Maintainer: Felix Yan pkgname=ndctl -pkgver=72.1 +pkgver=73 pkgrel=1 pkgdesc='Utility library for managing the libnvdimm (non-volatile memory device) sub-system in the Linux kernel' arch=('x86_64') url="https://github.com/pmem/ndctl" license=('LGPL') depends=('iniparser' 'json-c' 'keyutils' 'kmod' 'libudev.so' 'util-linux-libs') -makedepends=('asciidoctor' 'bash-completion' 'udev' 'xmlto') +makedepends=('asciidoctor' 'bash-completion' 'meson' 'udev' 'xmlto') source=("https://github.com/pmem/ndctl/archive/v$pkgver/$pkgname-$pkgver.tar.gz") -sha512sums=('7304e23121c99457fa6e22a399fb636f6a66d6d07b090463ec41e424687b06e7e8a1a18623ab9dd5783aaccfa09ff964e3477b63aaa4614ac60f6e6050452f12') +sha512sums=('a52a1fb655f044e5cd48b95b3abd89b4f6a991d6439c02e66da6b55947b8a08c279fec873def0b5a18a4e0b670d40e246c333b619fb62f0c6808357d15d847a5') prepare() { # fix location of modprobe.d conf - sed -i 's|^modprobedir =.*|modprobedir = /usr/lib/modprobe.d/|' $pkgname-$pkgver/Makefile.am + sed -i "s|^modprobedatadir =.*|modprobedatadir = '/usr/lib/modprobe.d/'|" $pkgname-$pkgver/contrib/meson.build } build() { - cd "$srcdir"/$pkgname-$pkgver - ./autogen.sh - ./configure --prefix=/usr --sysconfdir=/etc --without-systemd - make + artix-meson $pkgname-$pkgver build -Dsystemd=disabled + meson compile -C build +} + +check() { + meson test -C build --print-errorlogs } package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install + meson install -C build --destdir "$pkgdir" }