Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nvme-cli: update to 1.10.1 #19112

Merged
merged 1 commit into from
Feb 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 24 additions & 0 deletions srcpkgs/nvme-cli/patches/musl.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From d6d25017f28d39a3b6d096ab707d96e1a5d4dfe9 Mon Sep 17 00:00:00 2001
From: Neel Chotai <neel@chot.ai>
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 <sys/ioctl.h>
+#include <limits.h>

#define CREATE_CMD
#include "micron-nvme.h"
--
2.25.0

10 changes: 6 additions & 4 deletions srcpkgs/nvme-cli/template
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -14,7 +14,7 @@ maintainer="Peter Froehlich <peter.hans.froehlich@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=d7c3d56f36f81c0933f7b7c3f90c4196be0fec758affc8062c525b6bc5ea65f5
checksum=6be38485464e37fd822eba05eb3b47e792565350b2c0249a94528910cdc1ea31

CFLAGS="-Wno-error -I."

Expand All @@ -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"
}