[arch-commits] Commit in nvme-cli/repos/community-x86_64 (4 files)

[Morten Linderud]

    Date: Saturday, April 9, 2022 @ 20:38:18
  Author: foxboron
Revision: 1183162

archrelease: copy trunk to community-x86_64

Added:
  nvme-cli/repos/community-x86_64/PKGBUILD
    (from rev 1183161, nvme-cli/trunk/PKGBUILD)
  nvme-cli/repos/community-x86_64/nvme-cli.install
    (from rev 1183161, nvme-cli/trunk/nvme-cli.install)
Deleted:
  nvme-cli/repos/community-x86_64/PKGBUILD
  nvme-cli/repos/community-x86_64/nvme-cli.install

------------------+
 PKGBUILD         |   84 +++++++++++++++++++++++++++--------------------------
 nvme-cli.install |   16 +++++-----
 2 files changed, 52 insertions(+), 48 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-09 20:38:11 UTC (rev 1183161)
+++ PKGBUILD	2022-04-09 20:38:18 UTC (rev 1183162)
@@ -1,40 +0,0 @@
-# Maintainer: Morten Linderud <foxboron at archlinux.org>
-# Contributor: Devin Cofer <ranguvar[at]ranguvar[dot]io>
-# Contributor: DriverX
-# Contributor: Nicolas Quiénot <niQo @ aur>
-# Contributor: Martin Schrodt <martin at schrodt.org>
-
-pkgname=nvme-cli
-pkgver=1.16
-pkgrel=2
-pkgdesc="NVM-Express user space tooling for Linux"
-arch=('i686' 'x86_64')
-url="https://github.com/linux-nvme/nvme-cli"
-license=('GPL')
-makedepends=('systemd')
-depends=('util-linux' 'libsystemd')
-options=(debug strip)
-install=nvme-cli.install
-# checkdepends=('python2-nose' 'python-nose')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linux-nvme/${pkgname}/archive/v${pkgver}.tar.gz")
-sha256sums=('40f741020ab5c490374901cd2c0c9b6cf98dd5ff5f182517a0aec12c0e9aef55')
-
-build() {
-	cd "${pkgname}-${pkgver}"
-	make PREFIX=/usr
-}
-
-# Tests require a working NVME disk.
-# check() {
-# 	cd "${pkgname}-${pkgver}"
-# 	make test
-# }
-
-package() {
-	cd "${pkgname}-${pkgver}"
-	make DESTDIR="$pkgdir" UDEVDIR=/usr/lib/udev PREFIX=/usr SBINDIR=/usr/bin install-spec
-
-	# This is done because we don't want the hostnqn and hostid files tracked.
-	# they are supposed to be unique
-	rm $pkgdir/etc/nvme/host{nqn,id}
-}

Copied: nvme-cli/repos/community-x86_64/PKGBUILD (from rev 1183161, nvme-cli/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-04-09 20:38:18 UTC (rev 1183162)
@@ -0,0 +1,44 @@
+# Maintainer: Morten Linderud <foxboron at archlinux.org>
+# Contributor: Devin Cofer <ranguvar[at]ranguvar[dot]io>
+# Contributor: DriverX
+# Contributor: Nicolas Quiénot <niQo @ aur>
+# Contributor: Martin Schrodt <martin at schrodt.org>
+
+pkgname=nvme-cli
+pkgver=2.0
+pkgrel=1
+pkgdesc="NVM-Express user space tooling for Linux"
+arch=('i686' 'x86_64')
+url="https://github.com/linux-nvme/nvme-cli"
+license=('GPL')
+makedepends=('systemd' 'meson' 'git')
+depends=('util-linux' 'libsystemd')
+options=(debug strip)
+install=nvme-cli.install
+# checkdepends=('python2-nose' 'python-nose')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linux-nvme/${pkgname}/archive/v${pkgver}.tar.gz")
+sha256sums=('471869b3bf643bb357dc9613ad14d24ff342fcd97e2db5a753c81c335ad8859c')
+
+build() {
+	cd "${pkgname}-${pkgver}"
+	meson setup \
+	--prefix /usr \
+	--libexecdir lib \
+	--sbindir bin \
+	--buildtype plain \
+	--auto-features enabled \
+	-D b_lto=true -D b_pie=true \
+	-D docs=man -D docs-build=true \
+	.build
+}
+
+# Tests require a working NVME disk.
+# check() {
+# 	cd "${pkgname}-${pkgver}"
+# 	make test
+# }
+
+package() {
+	cd "${pkgname}-${pkgver}"
+	DESTDIR="$pkgdir" meson install -C .build
+}

Deleted: nvme-cli.install
===================================================================
--- nvme-cli.install	2022-04-09 20:38:11 UTC (rev 1183161)
+++ nvme-cli.install	2022-04-09 20:38:18 UTC (rev 1183162)
@@ -1,8 +0,0 @@
-post_install(){
-	if [ ! -f /etc/nvme/hostnqn ]; then
-		nvme gen-hostnqn > /etc/nvme/hostnqn
-	fi
-	if [ ! -f /etc/nvme/hostid ]; then
-		uuidgen > /etc/nvme/hostid
-	fi
-}

Copied: nvme-cli/repos/community-x86_64/nvme-cli.install (from rev 1183161, nvme-cli/trunk/nvme-cli.install)
===================================================================
--- nvme-cli.install	                        (rev 0)
+++ nvme-cli.install	2022-04-09 20:38:18 UTC (rev 1183162)
@@ -0,0 +1,8 @@
+post_install(){
+	if [ ! -f /etc/nvme/hostnqn ]; then
+		nvme gen-hostnqn > /etc/nvme/hostnqn
+	fi
+	if [ ! -f /etc/nvme/hostid ]; then
+		uuidgen > /etc/nvme/hostid
+	fi
+}