community/nvme-cli: upgrade to 1.3 and move to community

refs #5082
author: Carlo Landmeter <clandmeter@gmail.com> 2017-05-22 17:34:51 +0200
committer: Carlo Landmeter <clandmeter@gmail.com> 2017-05-22 17:35:27 +0200
commit: eef5ee88214fae9422e2069d93724d763ac5d174 (patch)
tree: 0238edee4199c62dea714e066573cd68f61744ca
parent: 9f9567bc4746ad714b8991695fb141688c7ec700 (diff)
download: alpine_aports-eef5ee88214fae9422e2069d93724d763ac5d174.tar.bz2
alpine_aports-eef5ee88214fae9422e2069d93724d763ac5d174.tar.xz
alpine_aports-eef5ee88214fae9422e2069d93724d763ac5d174.zip
2 files changed, 6 insertions, 40 deletions
diff --git a/testing/nvme-cli/APKBUILD b/community/nvme-cli/APKBUILD
index a83a3cf671..c687153575 100644
--- a/testing/nvme-cli/APKBUILD
+++ b/community/nvme-cli/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Florian Heigl <florian.heigl@gmail.com>
 # Maintainer: Florian Heigl <florian.heigl@gmail.com>
 pkgname=nvme-cli
-pkgver=1.1
+pkgver=1.3
-pkgrel=1
+pkgrel=0
 pkgdesc="NVM-Express user space tooling for Linux"
 arch="all"
 url="https://github.com/linux-nvme/nvme-cli"
@@ -11,7 +11,6 @@ depends=""
 makedepends="$depends_dev linux-headers coreutils"
 subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp"
 source="$pkgname-$pkgver.tar.gz::https://github.com/linux-nvme/nvme-cli/archive/v${pkgver}.tar.gz
-        musl-fix.patch
        "
 builddir="$srcdir"/$pkgname-$pkgver
@@ -32,13 +31,9 @@ bashcomp() {
        install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
        mkdir -p "$subpkgdir"/usr/share/bash-completion/completions
-        mv "$pkgdir"/etc/bash_completion.d/nvme \
+        mv "$pkgdir"/usr/share/bash_completion.d/nvme \
-                "$subpkgdir"/usr/share/bash-completion/completions/$pkgname || return 1
+                 "$subpkgdir"/usr/share/bash-completion/completions/$pkgname
+        rmdir "$pkgdir"/usr/share/bash_completion.d
 }
-md5sums="450b5c381c83df8f117824e7d0fe0076  nvme-cli-1.1.tar.gz
+sha512sums="0794e72124e73af619a71dd01879d178ad48d30155326e854fb5447e0bb5b879049a7a0a2e3b5301a0de1207034fbbdca07ecf647ff7d4085d56dc793271b576  nvme-cli-1.3.tar.gz"
-f8e92a9d93b8cde78b82ad40f89f2c19  musl-fix.patch"
-sha256sums="22883719cbab86d52e8d4755e86ebd70476416e87442385a79b31c981bd60de1  nvme-cli-1.1.tar.gz
-79328b8836c27c661f12fd8a719bf27559c4824c2dd9a10dcf698e1373a007de  musl-fix.patch"
-sha512sums="339da4385c5e8659a8f3c2e11afadf437d9cdf02c294674e5cc569cd817174c8ccbd4fc8858ce6f5b8f63ccba68790b2140fc87fdf33b7d394b67999ac4afad0  nvme-cli-1.1.tar.gz
-01cea64b9593b4aac5c13a18538a561b5d538437232dc67f17d955c1661d42cf62671924277449f9611e0fb543cddc7e4ba89e34ff764eb86929201f1e336faa  musl-fix.patch"
diff --git a/testing/nvme-cli/musl-fix.patch b/testing/nvme-cli/musl-fix.patch
deleted file mode 100644
index 873233bfc8..0000000000
--- a/testing/nvme-cli/musl-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 329df07e86c27308a3c3fee9054390bc0271e8b8 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 26 Dec 2016 23:12:58 +0100
-Subject: [PATCH] Include endian.h for byte/host order functions
-Fix the following error when building with musl libc:
-nvme.h:136:2: error: implicit declaration of function 'le16toh'
-[-Werror=implicit-function-declaration]
-  le16toh((__force __u16)(x))
-  ^
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
---
- nvme.h | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/nvme.h b/nvme.h
-index 6623505..5481916 100644
--- a/nvme.h
-+++ b/nvme.h
-@@ -16,6 +16,7 @@
- #define _NVME_H
- 
- #include <stdbool.h>
-+#include <endian.h>
- #include "plugin.h"
- 
- #define unlikely(x) x
author	Carlo Landmeter <clandmeter@gmail.com>	2017-05-22 17:34:51 +0200
committer	Carlo Landmeter <clandmeter@gmail.com>	2017-05-22 17:35:27 +0200
commit	eef5ee88214fae9422e2069d93724d763ac5d174 (patch)
tree	0238edee4199c62dea714e066573cd68f61744ca
parent	9f9567bc4746ad714b8991695fb141688c7ec700 (diff)
download	alpine_aports-eef5ee88214fae9422e2069d93724d763ac5d174.tar.bz2 alpine_aports-eef5ee88214fae9422e2069d93724d763ac5d174.tar.xz alpine_aports-eef5ee88214fae9422e2069d93724d763ac5d174.zip

diff --git a/testing/nvme-cli/APKBUILD b/community/nvme-cli/APKBUILD index a83a3cf671..c687153575 100644 --- a/testing/nvme-cli/APKBUILD +++ b/community/nvme-cli/APKBUILD
@@ -1,8 +1,8 @@
1	# Contributor: Florian Heigl <florian.heigl@gmail.com>	1	# Contributor: Florian Heigl <florian.heigl@gmail.com>
2	# Maintainer: Florian Heigl <florian.heigl@gmail.com>	2	# Maintainer: Florian Heigl <florian.heigl@gmail.com>
3	pkgname=nvme-cli	3	pkgname=nvme-cli
4	pkgver=1.1	4	pkgver=1.3
5	pkgrel=1	5	pkgrel=0
6	pkgdesc="NVM-Express user space tooling for Linux"	6	pkgdesc="NVM-Express user space tooling for Linux"
7	arch="all"	7	arch="all"
8	url="https://github.com/linux-nvme/nvme-cli"	8	url="https://github.com/linux-nvme/nvme-cli"
@@ -11,7 +11,6 @@ depends=""
11	makedepends="$depends_dev linux-headers coreutils"	11	makedepends="$depends_dev linux-headers coreutils"
12	subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp"	12	subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp"
13	source="$pkgname-$pkgver.tar.gz::https://github.com/linux-nvme/nvme-cli/archive/v${pkgver}.tar.gz	13	source="$pkgname-$pkgver.tar.gz::https://github.com/linux-nvme/nvme-cli/archive/v${pkgver}.tar.gz
14	musl-fix.patch
15	"	14	"
16		15
17	builddir="$srcdir"/$pkgname-$pkgver	16	builddir="$srcdir"/$pkgname-$pkgver
@@ -32,13 +31,9 @@ bashcomp() {
32	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"	31	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
33		32
34	mkdir -p "$subpkgdir"/usr/share/bash-completion/completions	33	mkdir -p "$subpkgdir"/usr/share/bash-completion/completions
35	mv "$pkgdir"/etc/bash_completion.d/nvme \	34	mv "$pkgdir"/usr/share/bash_completion.d/nvme \
36	"$subpkgdir"/usr/share/bash-completion/completions/$pkgname \|\| return 1	35	"$subpkgdir"/usr/share/bash-completion/completions/$pkgname
		36	rmdir "$pkgdir"/usr/share/bash_completion.d
37	}	37	}
38		38
39	md5sums="450b5c381c83df8f117824e7d0fe0076 nvme-cli-1.1.tar.gz	39	sha512sums="0794e72124e73af619a71dd01879d178ad48d30155326e854fb5447e0bb5b879049a7a0a2e3b5301a0de1207034fbbdca07ecf647ff7d4085d56dc793271b576 nvme-cli-1.3.tar.gz"
40	f8e92a9d93b8cde78b82ad40f89f2c19 musl-fix.patch"
41	sha256sums="22883719cbab86d52e8d4755e86ebd70476416e87442385a79b31c981bd60de1 nvme-cli-1.1.tar.gz
42	79328b8836c27c661f12fd8a719bf27559c4824c2dd9a10dcf698e1373a007de musl-fix.patch"
43	sha512sums="339da4385c5e8659a8f3c2e11afadf437d9cdf02c294674e5cc569cd817174c8ccbd4fc8858ce6f5b8f63ccba68790b2140fc87fdf33b7d394b67999ac4afad0 nvme-cli-1.1.tar.gz
44	01cea64b9593b4aac5c13a18538a561b5d538437232dc67f17d955c1661d42cf62671924277449f9611e0fb543cddc7e4ba89e34ff764eb86929201f1e336faa musl-fix.patch"


diff --git a/testing/nvme-cli/musl-fix.patch b/testing/nvme-cli/musl-fix.patch deleted file mode 100644 index 873233bfc8..0000000000 --- a/testing/nvme-cli/musl-fix.patch +++ /dev/null
@@ -1,29 +0,0 @@
1	From 329df07e86c27308a3c3fee9054390bc0271e8b8 Mon Sep 17 00:00:00 2001
2	From: Natanael Copa <ncopa@alpinelinux.org>
3	Date: Mon, 26 Dec 2016 23:12:58 +0100
4	Subject: [PATCH] Include endian.h for byte/host order functions
5
6	Fix the following error when building with musl libc:
7
8	nvme.h:136:2: error: implicit declaration of function 'le16toh'
9	[-Werror=implicit-function-declaration]
10	le16toh((__force __u16)(x))
11	^
12
13	Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
14	---
15	nvme.h \| 1 +
16	1 file changed, 1 insertion(+)
17
18	diff --git a/nvme.h b/nvme.h
19	index 6623505..5481916 100644
20	--- a/nvme.h
21	+++ b/nvme.h
22	@@ -16,6 +16,7 @@
23	#define _NVME_H
24
25	#include <stdbool.h>
26	+#include <endian.h>
27	#include "plugin.h"
28
29	#define unlikely(x) x