From 3967af352aeb8bf171af7be8d71dd84e46e8d4be Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Tue, 1 Dec 2015 23:37:52 +0100 Subject: [PATCH] mk: install kernel modules Add kernel modules to "make install". Nothing is done if there is no kernel module compiled. When using "make install T=", the default path is the same as before. The Linux path is based on host kernel version. Suggested-by: Mario Carrillo Signed-off-by: Thomas Monjalon Acked-by: Panu Matilainen --- mk/rte.sdkinstall.mk | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk index ec093d36d0..30dea0faba 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -43,9 +43,19 @@ O ?= build RTE_OUTPUT := $O endif +ifneq ($(MAKECMDGOALS),pre_install) +include $(RTE_SDK)/mk/rte.vars.mk +endif + ifdef T # defaults with T= will install an almost flat staging tree export prefix ?= +kerneldir ?= $(prefix)/kmod +else +ifeq ($(RTE_EXEC_ENV),linuxapp) +kerneldir ?= /lib/modules/$(shell uname -r)/extra/dpdk else +kerneldir ?= /boot/modules +endif prefix ?= /usr/local endif exec_prefix ?= $(prefix) @@ -94,6 +104,7 @@ ifeq ($(DESTDIR)$(if $T,,+),) else @echo ================== Installing $(DESTDIR)$(prefix)/ $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-runtime + $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-kmod $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-sdk @echo Installation in $(DESTDIR)$(prefix)/ complete endif @@ -110,6 +121,12 @@ install-runtime: $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) $(Q)cp -a $(RTE_SDK)/tools $(DESTDIR)$(datadir) +install-kmod: +ifneq ($(wildcard $O/kmod/*),) + $(Q)$(call rte_mkdir, $(DESTDIR)$(kerneldir)) + $(Q)cp -a $O/kmod/* $(DESTDIR)$(kerneldir) +endif + install-sdk: $(Q)$(call rte_mkdir, $(DESTDIR)$(includedir)) $(Q)tar -chf - -C $O include | \ -- 2.20.1