[Buildroot] [git commit] package/nvme: bump version to 2.15

[Julien Olivain]

commit: https://git.buildroot.net/buildroot/commit/?id=f75faf43506e5090857eb4a9d876d430ff34a972
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Switched build system to meson and added dependency to libnvme:
https://github.com/linux-nvme/nvme-cli/releases/tag/v2.0-rc0

Signed-off-by: Bernd Kuhls <bernd at kuhls.net>
Signed-off-by: Julien Olivain <ju.o at free.fr>
---
 package/nvme/Config.in |  2 ++
 package/nvme/nvme.hash |  2 +-
 package/nvme/nvme.mk   | 34 +++++++---------------------------
 3 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/package/nvme/Config.in b/package/nvme/Config.in
index dd8655fa1a..16b8726144 100644
--- a/package/nvme/Config.in
+++ b/package/nvme/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_NVME
 	bool "nvme"
+	depends on BR2_USE_MMU # libnvme
+	select BR2_PACKAGE_LIBNVME
 	help
 	  NVME utility, a utility for interacting with standard NVM
 	  Express (optimized PCI Express SSD interface) devices.
diff --git a/package/nvme/nvme.hash b/package/nvme/nvme.hash
index a7ce51ca74..c6fb9c9aa8 100644
--- a/package/nvme/nvme.hash
+++ b/package/nvme/nvme.hash
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256  a75270e65a4a7a6add48f748ba216d8f68d78f90f8cb77e88e9753b74d527991  nvme-1.12.tar.gz
+sha256  93282c426f22dd1ea6d172dec8af043c4e9ff80189becfbbb5378fe1ca0a74ad  nvme-2.15.tar.gz
 sha256  a45d0bb572ed792ed34627a72621834b3ba92aab6e2cc4e04301dee7a728d753  LICENSE
diff --git a/package/nvme/nvme.mk b/package/nvme/nvme.mk
index 53f9dff753..9f2b086d2a 100644
--- a/package/nvme/nvme.mk
+++ b/package/nvme/nvme.mk
@@ -4,37 +4,17 @@
 #
 ################################################################################
 
-NVME_VERSION = 1.12
+NVME_VERSION = 2.15
 NVME_SITE = $(call github,linux-nvme,nvme-cli,v$(NVME_VERSION))
 NVME_LICENSE = GPL-2.0+
 NVME_LICENSE_FILES = LICENSE
+NVME_DEPENDENCIES = libnvme
 
-# Yes, LIBUUID=0 means libuuid support enabled.
-# LIBUUID=1 means libuuid support disabled.
-ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y)
-NVME_DEPENDENCIES += util-linux
-NVME_MAKE_OPTS += LIBUUID=0
+ifeq ($(BR2_PACKAGE_JSON_C),y)
+NVME_CONF_OPTS += -Djson-c=enabled
+NVME_DEPENDENCIES += json-c
 else
-NVME_MAKE_OPTS += LIBUUID=1
+NVME_CONF_OPTS += -Djson-c=disabled
 endif
 
-# Yes, HAVE_SYSTEMD=0 means systemd support enabled.
-# HAVE_SYSTEMD=1 means systemd support disabled.
-ifeq ($(BR2_PACKAGE_SYSTEMD),y)
-NVME_DEPENDENCIES += systemd
-NVME_MAKE_OPTS += HAVE_SYSTEMD=0
-else
-NVME_MAKE_OPTS += HAVE_SYSTEMD=1
-endif
-
-define NVME_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \
-		$(NVME_MAKE_OPTS) -C $(@D)
-endef
-
-define NVME_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) $(NVME_MAKE_OPTS) -C $(@D) \
-		DESTDIR=$(TARGET_DIR) PREFIX=/usr install-bin
-endef
-
-$(eval $(generic-package))
+$(eval $(meson-package))