From 31b39677d53fe569820838f434cb99fe6537bfbf Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Sat, 16 Apr 2022 16:55:09 +0530 Subject: [PATCH] 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 ef0b0b4df24..00000000000 --- 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 0da50f2663e..9b142b02de0 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 " +maintainer="Subhaditya Nath " 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 }