Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] nvme-cli: update to 2.0, adopt
@ 2022-04-16 11:31 subnut
  2022-04-16 12:51 ` [PR PATCH] [Updated] " subnut
                   ` (19 more replies)
  0 siblings, 20 replies; 21+ messages in thread
From: subnut @ 2022-04-16 11:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]

There is a new pull request by subnut against master on the void-packages repository

https://github.com/subnut/void-packages nvme
https://github.com/void-linux/void-packages/pull/36718

nvme-cli: update to 2.0, adopt
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!-- 
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36718.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nvme-36718.patch --]
[-- Type: text/x-diff, Size: 5001 bytes --]

From 9c9720995d08acfe671900102af3777c98eb68b7 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 16 Apr 2022 16:17:52 +0530
Subject: [PATCH 1/2] New package: libnvme-0.1

---
 common/shlibs            |  1 +
 srcpkgs/libnvme-devel    |  1 +
 srcpkgs/libnvme-docs     |  1 +
 srcpkgs/libnvme/template | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 36 insertions(+)
 create mode 120000 srcpkgs/libnvme-devel
 create mode 120000 srcpkgs/libnvme-docs
 create mode 100644 srcpkgs/libnvme/template

diff --git a/common/shlibs b/common/shlibs
index 0d2a9fcc9b8e..12b4e9f7b2a2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4147,3 +4147,4 @@ librz_search.so.0.3.4 rizin-0.3.4_1
 librz_bin.so.0.3.4 rizin-0.3.4_1
 libaravis-0.8.so.0 libaravis-0.8.21_1
 libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
+libnvme.so.1 libnvme-1.0_1
diff --git a/srcpkgs/libnvme-devel b/srcpkgs/libnvme-devel
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/libnvme-devel
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file
diff --git a/srcpkgs/libnvme-docs b/srcpkgs/libnvme-docs
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/libnvme-docs
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
new file mode 100644
index 000000000000..ce37729fd4f6
--- /dev/null
+++ b/srcpkgs/libnvme/template
@@ -0,0 +1,33 @@
+# Template file for 'libnvme'
+pkgname=libnvme
+version=1.0
+revision=1
+build_style=meson
+configure_args="-Ddocs=man"
+hostmakedepends="pkg-config"
+makedepends="libuuid-devel json-c-devel openssl-devel"
+depends=""
+short_desc="C Library for NVM Express on Linux"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/linux-nvme/libnvme"
+distfiles="https://github.com/linux-nvme/libnvme/archive/v${version}.tar.gz"
+checksum=387524b1c24a4091a88bfb258c98c054f716da210e77702f0709164740370807
+
+libnvme-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	depends+=" json-c-devel libuuid-devel openssl-devel"	# otherwise `pkgconfig libnvme` doesn't work
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
+
+libnvme-docs_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share
+	}
+}

From b89c4fe035f5e36a16997040670b5afda983c3c2 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 16 Apr 2022 16:55:09 +0530
Subject: [PATCH 2/2] nvme-cli: update to 2.0, adopt

---
 srcpkgs/nvme-cli/patches/dracut-warning.patch |  5 ----
 srcpkgs/nvme-cli/template                     | 26 ++++++-------------
 2 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/nvme-cli/patches/dracut-warning.patch

diff --git a/srcpkgs/nvme-cli/patches/dracut-warning.patch b/srcpkgs/nvme-cli/patches/dracut-warning.patch
deleted file mode 100644
index ef0b0b4df244..000000000000
--- a/srcpkgs/nvme-cli/patches/dracut-warning.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in	2021-01-24 16:37:06.346511231 +0700
-+++ b/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in	2021-01-24 16:38:01.351158511 +0700
-@@ -1 +1 @@
--install_items+="@@UDEVRULESDIR@@/70-nvmf-autoconnect.rules"
-+install_items+=" @@UDEVRULESDIR@@/70-nvmf-autoconnect.rules "
diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index 0da50f2663ef..c70023311f35 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,28 +1,18 @@
 # Template file for 'nvme-cli'
 pkgname=nvme-cli
-version=1.13
-revision=2
-build_style=gnu-makefile
-# yeah, it must be 0 to enable
-make_build_args="LIBUUID=0"
-make_install_args="SBINDIR=/usr/bin UDEVDIR=/usr/lib/udev"
-make_install_target="install-spec"
-makedepends="libuuid-devel"
+version=2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="libnvme-devel zlib-devel json-c-devel libuuid-devel libhugetlbfs-devel"
 short_desc="NVMe management command line interface"
-maintainer="Peter Froehlich <peter.hans.froehlich@gmail.com>"
-license="GPL-2.0-only"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="LGPL-2.0-or-later"
 homepage="http://nvmexpress.org"
 distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz"
-checksum=03f4875f3e68d326b0280e16df2f027ca6b086cfa148c34e8569df61319b4b85
+checksum=471869b3bf643bb357dc9613ad14d24ff342fcd97e2db5a753c81c335ad8859c
 conf_files="/etc/nvme/*.conf"
 
 post_install() {
-	# these files are touch'd by install, remove so they aren't registered
-	# by the package (which would cause trouble during removal)
-	rm -f "${DESTDIR}/etc/nvme/hostnqn"
-	rm -f "${DESTDIR}/etc/nvme/hostid"
-	rm -rf "${DESTDIR}/etc/udev/rules.d"
-	rm -f "${DESTDIR}/usr/sbin/nvme"
-	# no need for systemd files
 	rm -rf "${DESTDIR}/usr/lib/systemd"
 }

^ permalink raw reply	[flat|nested] 21+ messages in thread
end of thread, other threads:[~2022-04-24 13:47 UTC | newest]

Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-16 11:31 [PR PATCH] nvme-cli: update to 2.0, adopt subnut
2022-04-16 12:51 ` [PR PATCH] [Updated] " subnut
2022-04-16 13:08 ` subnut
2022-04-16 13:22 ` subnut
2022-04-16 14:47 ` subnut
2022-04-18 12:56 ` [PR PATCH] [Updated] " subnut
2022-04-18 13:25 ` [PR REVIEW] " leahneukirchen
2022-04-18 13:55 ` subnut
2022-04-18 13:56 ` subnut
2022-04-18 14:16 ` leahneukirchen
2022-04-18 18:22 ` leahneukirchen
2022-04-19  5:31 ` [PR PATCH] [Updated] " subnut
2022-04-19 15:05 ` leahneukirchen
2022-04-19 15:06 ` leahneukirchen
2022-04-20  2:41 ` [PR PATCH] [Updated] " subnut
2022-04-20  2:43 ` subnut
2022-04-20  2:44 ` subnut
2022-04-20 12:18 ` leahneukirchen
2022-04-20 13:25 ` [PR PATCH] [Updated] " subnut
2022-04-20 13:25 ` subnut
2022-04-24 13:47 ` [PR PATCH] [Merged]: " leahneukirchen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).