From d9ad647f1e683eb151d8a66b676fbca27f8a9297 Mon Sep 17 00:00:00 2001 From: Keith Busch Date: Thu, 4 Mar 2021 14:02:24 -0800 Subject: [PATCH] libnvme: Add libnvme submodule Signed-off-by: Keith Busch Signed-off-by: Hannes Reinecke --- .gitmodules | 3 +++ Makefile | 9 +++++++-- libnvme | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 .gitmodules create mode 160000 libnvme diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..90cf4e6c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "libnvme"] + path = libnvme + url = https://github.com/linux-nvme/libnvme diff --git a/Makefile b/Makefile index 86eb7c65..7fe731de 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ SYSTEMDDIR ?= $(LIBDIR)/systemd UDEVDIR ?= $(SYSCONFDIR)/udev UDEVRULESDIR ?= $(UDEVDIR)/rules.d DRACUTDIR ?= $(LIBDIR)/dracut +LIBNVMEDIR = libnvme/ LIB_DEPENDS = ifeq ($(LIBUUID),0) @@ -95,7 +96,10 @@ PLUGIN_OBJS := \ plugins/nvidia/nvidia-nvme.o \ plugins/ymtc/ymtc-nvme.o -nvme: nvme.c nvme.h $(OBJS) $(PLUGIN_OBJS) $(UTIL_OBJS) NVME-VERSION-FILE +libnvme: + $(MAKE) -C $(LIBNVMEDIR) + +nvme: nvme.c nvme.h libnvme $(OBJS) $(PLUGIN_OBJS) $(UTIL_OBJS) NVME-VERSION-FILE $(QUIET_CC)$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) $< -o $(NVME) $(OBJS) $(PLUGIN_OBJS) $(UTIL_OBJS) $(LDFLAGS) verify-no-dep: nvme.c nvme.h $(OBJS) $(UTIL_OBJS) NVME-VERSION-FILE @@ -121,6 +125,7 @@ all: doc clean: $(RM) $(NVME) $(OBJS) $(PLUGIN_OBJS) $(UTIL_OBJS) *~ a.out NVME-VERSION-FILE *.tar* nvme.spec version control nvme-*.deb 70-nvmf-autoconnect.conf $(MAKE) -C Documentation clean + $(MAKE) -C libnvme clean $(RM) tests/*.pyc $(RM) verify-no-dep @@ -249,4 +254,4 @@ rpm: dist -ta nvme-$(NVME_VERSION).tar.gz .PHONY: default doc all clean clobber install-man install-bin install -.PHONY: dist pkg dist-orig deb deb-light rpm FORCE test +.PHONY: dist pkg dist-orig deb deb-light rpm FORCE test libnvme diff --git a/libnvme b/libnvme new file mode 160000 index 00000000..8bd0e384 --- /dev/null +++ b/libnvme @@ -0,0 +1 @@ +Subproject commit 8bd0e3843d7be56edf5a64be8413d09c73b565ff -- 2.50.1