diff mbox series

[1/2] package/nvme: add optional util-linux dependency

Message ID 20190407133643.20232-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [1/2] package/nvme: add optional util-linux dependency | expand

Commit Message

Fabrice Fontaine April 7, 2019, 1:36 p.m. UTC 
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/nvme/nvme.mk | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

Comments

Thomas Petazzoni April 7, 2019, 2:13 p.m. UTC | #1 
On Sun,  7 Apr 2019 15:36:42 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/nvme/nvme.mk | 16 +++++++++++++---
>  1 file changed, 13 insertions(+), 3 deletions(-)

Both applied. Thanks!

Thomas
diff mbox series

Patch

diff --git a/package/nvme/nvme.mk b/package/nvme/nvme.mk
index 8eab1dacfa..513720becb 100644
--- a/package/nvme/nvme.mk
+++ b/package/nvme/nvme.mk
@@ -9,13 +9,23 @@  NVME_SITE = $(call github,linux-nvme,nvme-cli,$(NVME_VERSION))
 NVME_LICENSE = GPL-2.0+
 NVME_LICENSE_FILES = LICENSE
 
+# 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
+else
+NVME_MAKE_OPTS += LIBUUID=1
+endif
+
 define NVME_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \
+		$(NVME_MAKE_OPTS) -C $(@D)
 endef
 
 define NVME_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) \
-		PREFIX=/usr install-bin
+	$(TARGET_MAKE_ENV) $(MAKE) $(NVME_MAKE_OPTS) -C $(@D) \
+		DESTDIR=$(TARGET_DIR) PREFIX=/usr install-bin
 endef
 
 $(eval $(generic-package))