* [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
* Re: [PR PATCH] [Updated] nvme-cli: update to 2.0, adopt
2022-04-16 11:31 [PR PATCH] nvme-cli: update to 2.0, adopt subnut
@ 2022-04-16 12:51 ` subnut
2022-04-16 13:08 ` subnut
` (18 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: subnut @ 2022-04-16 12:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]
There is an updated 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: 5757 bytes --]
From ed862d6fef5b2ea018f68bb190e0eeb7f7a87dbe 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/patches/SCOPE_DELIMITER.patch | 13 ++++++++
srcpkgs/libnvme/template | 32 +++++++++++++++++++
5 files changed, 48 insertions(+)
create mode 120000 srcpkgs/libnvme-devel
create mode 120000 srcpkgs/libnvme-docs
create mode 100644 srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
create mode 100644 srcpkgs/libnvme/template
diff --git a/common/shlibs b/common/shlibs
index ae4bb44c57a3..fb0239f14fca 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4148,3 +4148,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/patches/SCOPE_DELIMITER.patch b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
new file mode 100644
index 000000000000..c25df742e763
--- /dev/null
+++ b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
@@ -0,0 +1,13 @@
+SCOPE_DELIMITER not defined in musl
+
+--- a/src/nvme/fabrics.c
++++ b/src/nvme/fabrics.c
+@@ -325,7 +325,7 @@
+ nvme_msg(r, LOG_ERR, "cannot copy: %s\n", src);
+
+ const char *scope = NULL;
+- char *p = strchr(tmp, SCOPE_DELIMITER);
++ char *p = strchr(tmp, '%');
+ if (p) {
+ *p = '\0';
+ scope = src + (p - tmp) + 1;
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
new file mode 100644
index 000000000000..7c6194709839
--- /dev/null
+++ b/srcpkgs/libnvme/template
@@ -0,0 +1,32 @@
+# 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"
+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() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ depends+=" json-c-devel libuuid-devel openssl-devel" # otherwise 'pkgconf libnvme' doesn't work
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
+
+libnvme-doc_package() {
+ short_desc+=" - documentation"
+ pkg_install() {
+ vmove usr/share
+ }
+}
From e2833618ecf721d197fdfbde625da198f620b7c4 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
* Re: [PR PATCH] [Updated] nvme-cli: update to 2.0, adopt
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
` (17 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: subnut @ 2022-04-16 13:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]
There is an updated 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: 6221 bytes --]
From 1c5e80b48ae13bd5f43b8ec5e09b805a63c85d6d 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 packages: libnvme-0.1 python3-libnvme-0.1
---
common/shlibs | 1 +
srcpkgs/libnvme-devel | 1 +
srcpkgs/libnvme-doc | 1 +
srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch | 13 +++++++
srcpkgs/libnvme/template | 39 +++++++++++++++++++
srcpkgs/python3-libnvme | 1 +
6 files changed, 56 insertions(+)
create mode 120000 srcpkgs/libnvme-devel
create mode 120000 srcpkgs/libnvme-doc
create mode 100644 srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
create mode 100644 srcpkgs/libnvme/template
create mode 120000 srcpkgs/python3-libnvme
diff --git a/common/shlibs b/common/shlibs
index ae4bb44c57a3..fb0239f14fca 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4148,3 +4148,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-doc b/srcpkgs/libnvme-doc
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/libnvme-doc
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file
diff --git a/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
new file mode 100644
index 000000000000..c25df742e763
--- /dev/null
+++ b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
@@ -0,0 +1,13 @@
+SCOPE_DELIMITER not defined in musl
+
+--- a/src/nvme/fabrics.c
++++ b/src/nvme/fabrics.c
+@@ -325,7 +325,7 @@
+ nvme_msg(r, LOG_ERR, "cannot copy: %s\n", src);
+
+ const char *scope = NULL;
+- char *p = strchr(tmp, SCOPE_DELIMITER);
++ char *p = strchr(tmp, '%');
+ if (p) {
+ *p = '\0';
+ scope = src + (p - tmp) + 1;
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
new file mode 100644
index 000000000000..f69ab0da47d9
--- /dev/null
+++ b/srcpkgs/libnvme/template
@@ -0,0 +1,39 @@
+# Template file for 'libnvme'
+pkgname=libnvme
+version=1.0
+revision=1
+build_style=meson
+configure_args="-Ddocs=man"
+hostmakedepends="pkg-config swig"
+makedepends="libuuid-devel json-c-devel openssl-devel python3-devel"
+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() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ depends+=" json-c-devel libuuid-devel openssl-devel" # otherwise 'pkgconf libnvme' doesn't work
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
+
+libnvme-doc_package() {
+ short_desc+=" - documentation"
+ pkg_install() {
+ vmove usr/share
+ }
+}
+
+python3-libnvme_package() {
+ short_desc+=" - Python3 bindings"
+ pkg_install() {
+ vmove "usr/lib/python*"
+ }
+}
diff --git a/srcpkgs/python3-libnvme b/srcpkgs/python3-libnvme
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/python3-libnvme
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file
From e5f4677f4345ee2b80d5c55928ebef538d83de91 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
* Re: [PR PATCH] [Updated] nvme-cli: update to 2.0, adopt
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
` (16 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: subnut @ 2022-04-16 13:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]
There is an updated 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: 6200 bytes --]
From f45149c05a3f52db01359d965a6f107e1b9356f2 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-doc | 1 +
srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch | 13 +++++++
srcpkgs/libnvme/template | 39 +++++++++++++++++++
srcpkgs/python3-libnvme | 1 +
6 files changed, 56 insertions(+)
create mode 120000 srcpkgs/libnvme-devel
create mode 120000 srcpkgs/libnvme-doc
create mode 100644 srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
create mode 100644 srcpkgs/libnvme/template
create mode 120000 srcpkgs/python3-libnvme
diff --git a/common/shlibs b/common/shlibs
index ae4bb44c57a3..fb0239f14fca 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4148,3 +4148,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-doc b/srcpkgs/libnvme-doc
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/libnvme-doc
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file
diff --git a/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
new file mode 100644
index 000000000000..c25df742e763
--- /dev/null
+++ b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
@@ -0,0 +1,13 @@
+SCOPE_DELIMITER not defined in musl
+
+--- a/src/nvme/fabrics.c
++++ b/src/nvme/fabrics.c
+@@ -325,7 +325,7 @@
+ nvme_msg(r, LOG_ERR, "cannot copy: %s\n", src);
+
+ const char *scope = NULL;
+- char *p = strchr(tmp, SCOPE_DELIMITER);
++ char *p = strchr(tmp, '%');
+ if (p) {
+ *p = '\0';
+ scope = src + (p - tmp) + 1;
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
new file mode 100644
index 000000000000..f69ab0da47d9
--- /dev/null
+++ b/srcpkgs/libnvme/template
@@ -0,0 +1,39 @@
+# Template file for 'libnvme'
+pkgname=libnvme
+version=1.0
+revision=1
+build_style=meson
+configure_args="-Ddocs=man"
+hostmakedepends="pkg-config swig"
+makedepends="libuuid-devel json-c-devel openssl-devel python3-devel"
+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() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ depends+=" json-c-devel libuuid-devel openssl-devel" # otherwise 'pkgconf libnvme' doesn't work
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
+
+libnvme-doc_package() {
+ short_desc+=" - documentation"
+ pkg_install() {
+ vmove usr/share
+ }
+}
+
+python3-libnvme_package() {
+ short_desc+=" - Python3 bindings"
+ pkg_install() {
+ vmove "usr/lib/python*"
+ }
+}
diff --git a/srcpkgs/python3-libnvme b/srcpkgs/python3-libnvme
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/python3-libnvme
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file
From 7667a5bbbe568a96aae5b46f344a7286f6c4abb6 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
* Re: nvme-cli: update to 2.0, adopt
2022-04-16 11:31 [PR PATCH] nvme-cli: update to 2.0, adopt subnut
` (2 preceding siblings ...)
2022-04-16 13:22 ` subnut
@ 2022-04-16 14:47 ` subnut
2022-04-18 12:56 ` [PR PATCH] [Updated] " subnut
` (15 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: subnut @ 2022-04-16 14:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 277 bytes --]
New comment by subnut on void-packages repository
https://github.com/void-linux/void-packages/pull/36718#issuecomment-1100679760
Comment:
Since @phf seems to be inactive, I thought I'd adopt this package.
@phf, if you are reading this, is it okay if I adopt this package?
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] nvme-cli: update to 2.0, adopt
2022-04-16 11:31 [PR PATCH] nvme-cli: update to 2.0, adopt subnut
` (3 preceding siblings ...)
2022-04-16 14:47 ` subnut
@ 2022-04-18 12:56 ` subnut
2022-04-18 13:25 ` [PR REVIEW] " leahneukirchen
` (14 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: subnut @ 2022-04-18 12:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]
There is an updated 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: 6229 bytes --]
From f45149c05a3f52db01359d965a6f107e1b9356f2 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-doc | 1 +
srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch | 13 +++++++
srcpkgs/libnvme/template | 39 +++++++++++++++++++
srcpkgs/python3-libnvme | 1 +
6 files changed, 56 insertions(+)
create mode 120000 srcpkgs/libnvme-devel
create mode 120000 srcpkgs/libnvme-doc
create mode 100644 srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
create mode 100644 srcpkgs/libnvme/template
create mode 120000 srcpkgs/python3-libnvme
diff --git a/common/shlibs b/common/shlibs
index ae4bb44c57a3..fb0239f14fca 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4148,3 +4148,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-doc b/srcpkgs/libnvme-doc
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/libnvme-doc
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file
diff --git a/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
new file mode 100644
index 000000000000..c25df742e763
--- /dev/null
+++ b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
@@ -0,0 +1,13 @@
+SCOPE_DELIMITER not defined in musl
+
+--- a/src/nvme/fabrics.c
++++ b/src/nvme/fabrics.c
+@@ -325,7 +325,7 @@
+ nvme_msg(r, LOG_ERR, "cannot copy: %s\n", src);
+
+ const char *scope = NULL;
+- char *p = strchr(tmp, SCOPE_DELIMITER);
++ char *p = strchr(tmp, '%');
+ if (p) {
+ *p = '\0';
+ scope = src + (p - tmp) + 1;
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
new file mode 100644
index 000000000000..f69ab0da47d9
--- /dev/null
+++ b/srcpkgs/libnvme/template
@@ -0,0 +1,39 @@
+# Template file for 'libnvme'
+pkgname=libnvme
+version=1.0
+revision=1
+build_style=meson
+configure_args="-Ddocs=man"
+hostmakedepends="pkg-config swig"
+makedepends="libuuid-devel json-c-devel openssl-devel python3-devel"
+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() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ depends+=" json-c-devel libuuid-devel openssl-devel" # otherwise 'pkgconf libnvme' doesn't work
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
+
+libnvme-doc_package() {
+ short_desc+=" - documentation"
+ pkg_install() {
+ vmove usr/share
+ }
+}
+
+python3-libnvme_package() {
+ short_desc+=" - Python3 bindings"
+ pkg_install() {
+ vmove "usr/lib/python*"
+ }
+}
diff --git a/srcpkgs/python3-libnvme b/srcpkgs/python3-libnvme
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/python3-libnvme
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file
From f5ffdb9d3ffc9d0e5adc69ba3704e0968f96f891 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 | 27 +++++++------------
2 files changed, 9 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..f48879a391e2 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,28 +1,19 @@
# 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
+configure_args="-Ddocs=man"
+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
* Re: [PR REVIEW] nvme-cli: update to 2.0, adopt
2022-04-16 11:31 [PR PATCH] nvme-cli: update to 2.0, adopt subnut
` (4 preceding siblings ...)
2022-04-18 12:56 ` [PR PATCH] [Updated] " subnut
@ 2022-04-18 13:25 ` leahneukirchen
2022-04-18 13:55 ` subnut
` (13 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: leahneukirchen @ 2022-04-18 13:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 197 bytes --]
New review comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/36718#discussion_r852114369
Comment:
This doesn't match the LICENSE in the repo.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] nvme-cli: update to 2.0, adopt
2022-04-16 11:31 [PR PATCH] nvme-cli: update to 2.0, adopt subnut
` (5 preceding siblings ...)
2022-04-18 13:25 ` [PR REVIEW] " leahneukirchen
@ 2022-04-18 13:55 ` subnut
2022-04-18 13:56 ` subnut
` (12 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: subnut @ 2022-04-18 13:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 245 bytes --]
New review comment by subnut on void-packages repository
https://github.com/void-linux/void-packages/pull/36718#discussion_r852133855
Comment:
https://github.com/linux-nvme/nvme-cli/blob/5a36baba322e7979175ed9dfeede0a96e29efc37/meson.build#L5
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] nvme-cli: update to 2.0, adopt
2022-04-16 11:31 [PR PATCH] nvme-cli: update to 2.0, adopt subnut
` (6 preceding siblings ...)
2022-04-18 13:55 ` subnut
@ 2022-04-18 13:56 ` subnut
2022-04-18 14:16 ` leahneukirchen
` (11 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: subnut @ 2022-04-18 13:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 287 bytes --]
New review comment by subnut on void-packages repository
https://github.com/void-linux/void-packages/pull/36718#discussion_r852133855
Comment:
https://github.com/linux-nvme/nvme-cli/blob/5a36baba322e7979175ed9dfeede0a96e29efc37/meson.build#L5
```meson
license: 'LGPLv2+',
```
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] nvme-cli: update to 2.0, adopt
2022-04-16 11:31 [PR PATCH] nvme-cli: update to 2.0, adopt subnut
` (7 preceding siblings ...)
2022-04-18 13:56 ` subnut
@ 2022-04-18 14:16 ` leahneukirchen
2022-04-18 18:22 ` leahneukirchen
` (10 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: leahneukirchen @ 2022-04-18 14:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
New review comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/36718#discussion_r852147004
Comment:
https://github.com/linux-nvme/nvme-cli/blob/5a36baba322e7979175ed9dfeede0a96e29efc37/LICENSE
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] nvme-cli: update to 2.0, adopt
2022-04-16 11:31 [PR PATCH] nvme-cli: update to 2.0, adopt subnut
` (8 preceding siblings ...)
2022-04-18 14:16 ` leahneukirchen
@ 2022-04-18 18:22 ` leahneukirchen
2022-04-19 5:31 ` [PR PATCH] [Updated] " subnut
` (9 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: leahneukirchen @ 2022-04-18 18:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New review comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/36718#discussion_r852312244
Comment:
See https://github.com/linux-nvme/nvme-cli/issues/1508, revert this line,
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] nvme-cli: update to 2.0, adopt
2022-04-16 11:31 [PR PATCH] nvme-cli: update to 2.0, adopt subnut
` (9 preceding siblings ...)
2022-04-18 18:22 ` leahneukirchen
@ 2022-04-19 5:31 ` subnut
2022-04-19 15:05 ` leahneukirchen
` (8 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: subnut @ 2022-04-19 5:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]
There is an updated 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: 6200 bytes --]
From 565c33fed11fc39c75349ab7d9a63faf797bba20 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-doc | 1 +
srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch | 13 +++++++
srcpkgs/libnvme/template | 39 +++++++++++++++++++
srcpkgs/python3-libnvme | 1 +
6 files changed, 56 insertions(+)
create mode 120000 srcpkgs/libnvme-devel
create mode 120000 srcpkgs/libnvme-doc
create mode 100644 srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
create mode 100644 srcpkgs/libnvme/template
create mode 120000 srcpkgs/python3-libnvme
diff --git a/common/shlibs b/common/shlibs
index ae4bb44c57a3..fb0239f14fca 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4148,3 +4148,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-doc b/srcpkgs/libnvme-doc
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/libnvme-doc
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file
diff --git a/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
new file mode 100644
index 000000000000..c25df742e763
--- /dev/null
+++ b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
@@ -0,0 +1,13 @@
+SCOPE_DELIMITER not defined in musl
+
+--- a/src/nvme/fabrics.c
++++ b/src/nvme/fabrics.c
+@@ -325,7 +325,7 @@
+ nvme_msg(r, LOG_ERR, "cannot copy: %s\n", src);
+
+ const char *scope = NULL;
+- char *p = strchr(tmp, SCOPE_DELIMITER);
++ char *p = strchr(tmp, '%');
+ if (p) {
+ *p = '\0';
+ scope = src + (p - tmp) + 1;
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
new file mode 100644
index 000000000000..aafe21aa9aa5
--- /dev/null
+++ b/srcpkgs/libnvme/template
@@ -0,0 +1,39 @@
+# Template file for 'libnvme'
+pkgname=libnvme
+version=1.0
+revision=1
+build_style=meson
+configure_args="-Ddocs=man"
+hostmakedepends="pkg-config swig"
+makedepends="libuuid-devel json-c-devel openssl-devel python3-devel"
+short_desc="C Library for NVM Express on Linux"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="LGPL-2.1-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() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ depends+=" json-c-devel libuuid-devel openssl-devel" # otherwise 'pkgconf libnvme' doesn't work
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
+
+libnvme-doc_package() {
+ short_desc+=" - documentation"
+ pkg_install() {
+ vmove usr/share
+ }
+}
+
+python3-libnvme_package() {
+ short_desc+=" - Python3 bindings"
+ pkg_install() {
+ vmove "usr/lib/python*"
+ }
+}
diff --git a/srcpkgs/python3-libnvme b/srcpkgs/python3-libnvme
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/python3-libnvme
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file
From 1543fbc0151bc115cf802fcad86ef3cad82c7f4d 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 | 25 ++++++-------------
2 files changed, 8 insertions(+), 22 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..f96da1444095 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,28 +1,19 @@
# 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
+configure_args="-Ddocs=man"
+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>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
license="GPL-2.0-only"
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
* Re: nvme-cli: update to 2.0, adopt
2022-04-16 11:31 [PR PATCH] nvme-cli: update to 2.0, adopt subnut
` (10 preceding siblings ...)
2022-04-19 5:31 ` [PR PATCH] [Updated] " subnut
@ 2022-04-19 15:05 ` leahneukirchen
2022-04-19 15:06 ` leahneukirchen
` (7 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: leahneukirchen @ 2022-04-19 15:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 182 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/36718#issuecomment-1102766648
Comment:
`/usr/etc/udev/rules.d` is wrong.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: nvme-cli: update to 2.0, adopt
2022-04-16 11:31 [PR PATCH] nvme-cli: update to 2.0, adopt subnut
` (11 preceding siblings ...)
2022-04-19 15:05 ` leahneukirchen
@ 2022-04-19 15:06 ` leahneukirchen
2022-04-20 2:41 ` [PR PATCH] [Updated] " subnut
` (6 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: leahneukirchen @ 2022-04-19 15:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/36718#issuecomment-1102766648
Comment:
`/usr/etc/udev/rules.d` is wrong, and udev rules were previously not installed, please look into that.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] nvme-cli: update to 2.0, adopt
2022-04-16 11:31 [PR PATCH] nvme-cli: update to 2.0, adopt subnut
` (12 preceding siblings ...)
2022-04-19 15:06 ` leahneukirchen
@ 2022-04-20 2:41 ` subnut
2022-04-20 2:43 ` subnut
` (5 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: subnut @ 2022-04-20 2:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]
There is an updated 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: 6232 bytes --]
From 565c33fed11fc39c75349ab7d9a63faf797bba20 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-doc | 1 +
srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch | 13 +++++++
srcpkgs/libnvme/template | 39 +++++++++++++++++++
srcpkgs/python3-libnvme | 1 +
6 files changed, 56 insertions(+)
create mode 120000 srcpkgs/libnvme-devel
create mode 120000 srcpkgs/libnvme-doc
create mode 100644 srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
create mode 100644 srcpkgs/libnvme/template
create mode 120000 srcpkgs/python3-libnvme
diff --git a/common/shlibs b/common/shlibs
index ae4bb44c57a3..fb0239f14fca 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4148,3 +4148,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-doc b/srcpkgs/libnvme-doc
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/libnvme-doc
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file
diff --git a/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
new file mode 100644
index 000000000000..c25df742e763
--- /dev/null
+++ b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
@@ -0,0 +1,13 @@
+SCOPE_DELIMITER not defined in musl
+
+--- a/src/nvme/fabrics.c
++++ b/src/nvme/fabrics.c
+@@ -325,7 +325,7 @@
+ nvme_msg(r, LOG_ERR, "cannot copy: %s\n", src);
+
+ const char *scope = NULL;
+- char *p = strchr(tmp, SCOPE_DELIMITER);
++ char *p = strchr(tmp, '%');
+ if (p) {
+ *p = '\0';
+ scope = src + (p - tmp) + 1;
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
new file mode 100644
index 000000000000..aafe21aa9aa5
--- /dev/null
+++ b/srcpkgs/libnvme/template
@@ -0,0 +1,39 @@
+# Template file for 'libnvme'
+pkgname=libnvme
+version=1.0
+revision=1
+build_style=meson
+configure_args="-Ddocs=man"
+hostmakedepends="pkg-config swig"
+makedepends="libuuid-devel json-c-devel openssl-devel python3-devel"
+short_desc="C Library for NVM Express on Linux"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="LGPL-2.1-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() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ depends+=" json-c-devel libuuid-devel openssl-devel" # otherwise 'pkgconf libnvme' doesn't work
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
+
+libnvme-doc_package() {
+ short_desc+=" - documentation"
+ pkg_install() {
+ vmove usr/share
+ }
+}
+
+python3-libnvme_package() {
+ short_desc+=" - Python3 bindings"
+ pkg_install() {
+ vmove "usr/lib/python*"
+ }
+}
diff --git a/srcpkgs/python3-libnvme b/srcpkgs/python3-libnvme
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/python3-libnvme
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file
From 46e22ceae06c50a67e88d110018680870644519c 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 | 25 ++++++-------------
2 files changed, 8 insertions(+), 22 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..adcc3a69b9a8 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,28 +1,19 @@
# 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
+configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d"
+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>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
license="GPL-2.0-only"
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
* Re: [PR PATCH] [Updated] nvme-cli: update to 2.0, adopt
2022-04-16 11:31 [PR PATCH] nvme-cli: update to 2.0, adopt subnut
` (13 preceding siblings ...)
2022-04-20 2:41 ` [PR PATCH] [Updated] " subnut
@ 2022-04-20 2:43 ` subnut
2022-04-20 2:44 ` subnut
` (4 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: subnut @ 2022-04-20 2:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]
There is an updated 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: 6232 bytes --]
From 78a9c66c425e362a51926a450d0080ca45a6828a 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-doc | 1 +
srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch | 13 +++++++
srcpkgs/libnvme/template | 39 +++++++++++++++++++
srcpkgs/python3-libnvme | 1 +
6 files changed, 56 insertions(+)
create mode 120000 srcpkgs/libnvme-devel
create mode 120000 srcpkgs/libnvme-doc
create mode 100644 srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
create mode 100644 srcpkgs/libnvme/template
create mode 120000 srcpkgs/python3-libnvme
diff --git a/common/shlibs b/common/shlibs
index ae4bb44c57a3..fb0239f14fca 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4148,3 +4148,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-doc b/srcpkgs/libnvme-doc
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/libnvme-doc
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file
diff --git a/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
new file mode 100644
index 000000000000..c25df742e763
--- /dev/null
+++ b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
@@ -0,0 +1,13 @@
+SCOPE_DELIMITER not defined in musl
+
+--- a/src/nvme/fabrics.c
++++ b/src/nvme/fabrics.c
+@@ -325,7 +325,7 @@
+ nvme_msg(r, LOG_ERR, "cannot copy: %s\n", src);
+
+ const char *scope = NULL;
+- char *p = strchr(tmp, SCOPE_DELIMITER);
++ char *p = strchr(tmp, '%');
+ if (p) {
+ *p = '\0';
+ scope = src + (p - tmp) + 1;
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
new file mode 100644
index 000000000000..aafe21aa9aa5
--- /dev/null
+++ b/srcpkgs/libnvme/template
@@ -0,0 +1,39 @@
+# Template file for 'libnvme'
+pkgname=libnvme
+version=1.0
+revision=1
+build_style=meson
+configure_args="-Ddocs=man"
+hostmakedepends="pkg-config swig"
+makedepends="libuuid-devel json-c-devel openssl-devel python3-devel"
+short_desc="C Library for NVM Express on Linux"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="LGPL-2.1-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() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ depends+=" json-c-devel libuuid-devel openssl-devel" # otherwise 'pkgconf libnvme' doesn't work
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
+
+libnvme-doc_package() {
+ short_desc+=" - documentation"
+ pkg_install() {
+ vmove usr/share
+ }
+}
+
+python3-libnvme_package() {
+ short_desc+=" - Python3 bindings"
+ pkg_install() {
+ vmove "usr/lib/python*"
+ }
+}
diff --git a/srcpkgs/python3-libnvme b/srcpkgs/python3-libnvme
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/python3-libnvme
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file
From 3c229ea84e63a5e329f3a787255dd887a594bc72 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 | 25 ++++++-------------
2 files changed, 8 insertions(+), 22 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..adcc3a69b9a8 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,28 +1,19 @@
# 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
+configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d"
+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>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
license="GPL-2.0-only"
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
* Re: nvme-cli: update to 2.0, adopt
2022-04-16 11:31 [PR PATCH] nvme-cli: update to 2.0, adopt subnut
` (14 preceding siblings ...)
2022-04-20 2:43 ` subnut
@ 2022-04-20 2:44 ` subnut
2022-04-20 12:18 ` leahneukirchen
` (3 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: subnut @ 2022-04-20 2:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 163 bytes --]
New comment by subnut on void-packages repository
https://github.com/void-linux/void-packages/pull/36718#issuecomment-1103414325
Comment:
@leahneukirchen Fixed.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: nvme-cli: update to 2.0, adopt
2022-04-16 11:31 [PR PATCH] nvme-cli: update to 2.0, adopt subnut
` (15 preceding siblings ...)
2022-04-20 2:44 ` subnut
@ 2022-04-20 12:18 ` leahneukirchen
2022-04-20 13:25 ` [PR PATCH] [Updated] " subnut
` (2 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: leahneukirchen @ 2022-04-20 12:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/36718#issuecomment-1103865928
Comment:
Please remove 70-nvmf-autoconnect.rules it tries to call systemd.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] nvme-cli: update to 2.0, adopt
2022-04-16 11:31 [PR PATCH] nvme-cli: update to 2.0, adopt subnut
` (16 preceding siblings ...)
2022-04-20 12:18 ` leahneukirchen
@ 2022-04-20 13:25 ` subnut
2022-04-20 13:25 ` subnut
2022-04-24 13:47 ` [PR PATCH] [Merged]: " leahneukirchen
19 siblings, 0 replies; 21+ messages in thread
From: subnut @ 2022-04-20 13:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]
There is an updated 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: 6478 bytes --]
From 78a9c66c425e362a51926a450d0080ca45a6828a 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-doc | 1 +
srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch | 13 +++++++
srcpkgs/libnvme/template | 39 +++++++++++++++++++
srcpkgs/python3-libnvme | 1 +
6 files changed, 56 insertions(+)
create mode 120000 srcpkgs/libnvme-devel
create mode 120000 srcpkgs/libnvme-doc
create mode 100644 srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
create mode 100644 srcpkgs/libnvme/template
create mode 120000 srcpkgs/python3-libnvme
diff --git a/common/shlibs b/common/shlibs
index ae4bb44c57a3..fb0239f14fca 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4148,3 +4148,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-doc b/srcpkgs/libnvme-doc
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/libnvme-doc
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file
diff --git a/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
new file mode 100644
index 000000000000..c25df742e763
--- /dev/null
+++ b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
@@ -0,0 +1,13 @@
+SCOPE_DELIMITER not defined in musl
+
+--- a/src/nvme/fabrics.c
++++ b/src/nvme/fabrics.c
+@@ -325,7 +325,7 @@
+ nvme_msg(r, LOG_ERR, "cannot copy: %s\n", src);
+
+ const char *scope = NULL;
+- char *p = strchr(tmp, SCOPE_DELIMITER);
++ char *p = strchr(tmp, '%');
+ if (p) {
+ *p = '\0';
+ scope = src + (p - tmp) + 1;
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
new file mode 100644
index 000000000000..aafe21aa9aa5
--- /dev/null
+++ b/srcpkgs/libnvme/template
@@ -0,0 +1,39 @@
+# Template file for 'libnvme'
+pkgname=libnvme
+version=1.0
+revision=1
+build_style=meson
+configure_args="-Ddocs=man"
+hostmakedepends="pkg-config swig"
+makedepends="libuuid-devel json-c-devel openssl-devel python3-devel"
+short_desc="C Library for NVM Express on Linux"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="LGPL-2.1-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() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ depends+=" json-c-devel libuuid-devel openssl-devel" # otherwise 'pkgconf libnvme' doesn't work
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
+
+libnvme-doc_package() {
+ short_desc+=" - documentation"
+ pkg_install() {
+ vmove usr/share
+ }
+}
+
+python3-libnvme_package() {
+ short_desc+=" - Python3 bindings"
+ pkg_install() {
+ vmove "usr/lib/python*"
+ }
+}
diff --git a/srcpkgs/python3-libnvme b/srcpkgs/python3-libnvme
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/python3-libnvme
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file
From 4947dd26b7ea15ead0271c68a9bcc7fa9c3c1dc1 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 | 28 ++++++++-----------
2 files changed, 11 insertions(+), 22 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..9b142b02de0f 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,28 +1,22 @@
# 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
+configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d"
+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>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
license="GPL-2.0-only"
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
+ # remove files that are systemd-only
rm -rf "${DESTDIR}/usr/lib/systemd"
+ rm -rf "${DESTDIR}/usr/lib/udev/rules.d/70-nvmf-autoconnect.rules" # calls systemctl
+ rm -rf "${DESTDIR}/usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf" # needs 70-nvmf-autoconnect.rules
}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: nvme-cli: update to 2.0, adopt
2022-04-16 11:31 [PR PATCH] nvme-cli: update to 2.0, adopt subnut
` (17 preceding siblings ...)
2022-04-20 13:25 ` [PR PATCH] [Updated] " subnut
@ 2022-04-20 13:25 ` subnut
2022-04-24 13:47 ` [PR PATCH] [Merged]: " leahneukirchen
19 siblings, 0 replies; 21+ messages in thread
From: subnut @ 2022-04-20 13:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 162 bytes --]
New comment by subnut on void-packages repository
https://github.com/void-linux/void-packages/pull/36718#issuecomment-1103930213
Comment:
@leahneukirchen Done.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Merged]: nvme-cli: update to 2.0, adopt
2022-04-16 11:31 [PR PATCH] nvme-cli: update to 2.0, adopt subnut
` (18 preceding siblings ...)
2022-04-20 13:25 ` subnut
@ 2022-04-24 13:47 ` leahneukirchen
19 siblings, 0 replies; 21+ messages in thread
From: leahneukirchen @ 2022-04-24 13:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1093 bytes --]
There's a merged pull request on the void-packages repository
nvme-cli: update to 2.0, adopt
https://github.com/void-linux/void-packages/pull/36718
Description:
<!-- 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
-->
^ 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).