From 220c0137d0430e265aaf6a58c4f0a1440cde03f7 Mon Sep 17 00:00:00 2001 From: Neel Date: Fri, 14 Feb 2020 00:00:47 +0000 Subject: [PATCH] nvme-cli: update to 1.10.1 --- srcpkgs/nvme-cli/patches/musl.patch | 24 ++++++++++++++++++++++++ srcpkgs/nvme-cli/template | 10 ++++++---- 2 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/nvme-cli/patches/musl.patch diff --git a/srcpkgs/nvme-cli/patches/musl.patch b/srcpkgs/nvme-cli/patches/musl.patch new file mode 100644 index 00000000000..dd31484467e --- /dev/null +++ b/srcpkgs/nvme-cli/patches/musl.patch @@ -0,0 +1,24 @@ +From d6d25017f28d39a3b6d096ab707d96e1a5d4dfe9 Mon Sep 17 00:00:00 2001 +From: Neel Chotai +Date: Fri, 14 Feb 2020 17:56:23 +0000 +Subject: [PATCH] fix musl compilation + +--- + plugins/micron/micron-nvme.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/micron/micron-nvme.c b/plugins/micron/micron-nvme.c +index 8240887..165fcf0 100644 +--- plugins/micron/micron-nvme.c ++++ plugins/micron/micron-nvme.c +@@ -13,6 +13,7 @@ + #include "nvme-print.h" + #include "nvme-ioctl.h" + #include ++#include + + #define CREATE_CMD + #include "micron-nvme.h" +-- +2.25.0 + diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template index fd13e89234e..c22599d7eb9 100644 --- a/srcpkgs/nvme-cli/template +++ b/srcpkgs/nvme-cli/template @@ -1,11 +1,11 @@ # Template file for 'nvme-cli' pkgname=nvme-cli -version=1.9 -revision=3 +version=1.10.1 +revision=1 build_style=gnu-makefile # yeah, it must be 0 to enable make_build_args="LIBUUID=0" -make_install_args="SBINDIR=/usr/bin" +make_install_args="SBINDIR=/usr/bin UDEVDIR=/usr/lib/udev" make_install_target="install-spec" makedepends="libuuid-devel" depends="util-linux" @@ -14,7 +14,7 @@ maintainer="Peter Froehlich " license="GPL-2.0-only" homepage="http://nvmexpress.org" distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz" -checksum=d7c3d56f36f81c0933f7b7c3f90c4196be0fec758affc8062c525b6bc5ea65f5 +checksum=6be38485464e37fd822eba05eb3b47e792565350b2c0249a94528910cdc1ea31 CFLAGS="-Wno-error -I." @@ -23,6 +23,8 @@ post_install() { # 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" }