From 0808b30cd00f307f182007d21a8be3a0866ccf83 Mon Sep 17 00:00:00 2001 From: Rahul Kumar Gupta Date: Fri, 18 Dec 2015 18:30:47 +0800 Subject: [PATCH] dpdk v2.2.0: add RTE_KERNELDIR_OUT to split kernel build artifact Introduce RTE_KERNELDIR_OUT to be the path to which kernel build artifacts are located. This is for matching the workflow change since Yocto Project v1.8 onwards whereby tmp/work-shared contains separate directories for kernel source and kernel artifacts. Upstream-Status: Inappropriate [configuration] Signed-off-by: Rahul Kumar Gupta --- mk/rte.module.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mk/rte.module.mk b/mk/rte.module.mk index 1ada528a00b1..da0538cd5321 100644 --- a/mk/rte.module.mk +++ b/mk/rte.module.mk @@ -48,7 +48,7 @@ build: _postbuild # build module $(MODULE).ko: $(SRCS_LINKS) @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi - @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \ + @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \ CC="$(KERNELCC)" CROSS_COMPILE=$(CROSS) V=$(if $V,1,0) # install module in $(RTE_OUTPUT)/kmod @@ -59,7 +59,7 @@ $(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko # install module modules_install: - @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \ + @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \ modules_install .PHONY: clean @@ -69,7 +69,7 @@ clean: _postclean .PHONY: doclean doclean: @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi - $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) clean + $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) clean @$(foreach FILE,$(SRCS-y) $(SRCS-n) $(SRCS-),\ if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;) @if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi