kernel: always use absolute path of fmc-bus

FMC_BUS_ABS is passed to Kbuild, which uses different current directory. It is not trivial to handle FMC_BUS to be absolute or relative path. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

kernel: always use absolute path of fmc-bus
FMC_BUS_ABS is passed to Kbuild, which uses different current directory. It is not trivial to handle FMC_BUS to be absolute or relative path. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
3bce9901 · Adam Wujek · ed6f65c1 · 3bce9901 · 3bce9901 · 3bce9901
Commit 3bce9901 authored Oct 19, 2015 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 7 deletions

Makefile Makefile +3 -0

Kbuild kernel/Kbuild +2 -2

Makefile kernel/Makefile +3 -5

No files found.
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,9 @@ REPO_PARENT=$(shell /bin/pwd)/..
 # by default use the fmc-bus within the repository
 FMC_BUS ?= $(shell pwd)/fmc-bus/
 export FMC_BUS
+# FMC_BUS_ABS has to be absolut path, due to beeing passed to the Kbuild
+FMC_BUS_ABS ?= $(abspath $(FMC_BUS) )
+export FMC_BUS_ABS
 RUNME := $(shell test -d $(FMC_DRV) || git submodule update --init)

--- a/kernel/Kbuild
+++ b/kernel/Kbuild
-KBUILD_EXTRA_SYMBOLS := $(FMC_BUS)/kernel/Module.symvers
+KBUILD_EXTRA_SYMBOLS := $(FMC_BUS_ABS)/kernel/Module.symvers
 # For this CSM_VERSION, please see ohwr.org/csm documentation
 ifdef CONFIG_CSM_VERSION
@@ -9,7 +9,7 @@ endif
 # The library includes <sdb.h>, so point -I directtly there
 # include our header before to avoid conflicts with the kernel
-LINUXINCLUDE :=  -I$(FMC_BUS)/kernel/include -I$(src)/include/linux $(LINUXINCLUDE)
+LINUXINCLUDE :=  -I$(FMC_BUS_ABS)/kernel/include -I$(src)/include/linux $(LINUXINCLUDE)
 ccflags-y += -I$(src)/include
 ccflags-y += $(WR_NIC_CFLAGS)
 ccflags-y += -DGIT_VERSION=\"$(GIT_VERSION)\"

--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -7,16 +7,14 @@ LINUX ?= /lib/modules/$(shell uname -r)/build
 # by default use the fmc-bus within the repository
 FMC_BUS ?= $(shell pwd)/../fmc-bus/
-# FMC_DRV has to be absolut path, due to beeing passed to the Kbuild
+# FMC_BUS_ABS has to be absolut path, due to beeing passed to the Kbuild
-FMC_DRV = $(shell realpath -f $(FMC_DRV) )
+FMC_BUS_ABS ?= $(abspath $(FMC_BUS) )
-export FMC_BUS
 GIT_VERSION = $(shell git describe --dirty --long --tags)
 export GIT_VERSION
 all modules:
-	$(MAKE) -C $(LINUX) M=$(shell /bin/pwd) modules
+	$(MAKE) -C $(LINUX) M=$(shell /bin/pwd) FMC_BUS_ABS=$(FMC_BUS_ABS) modules
 install modules_install:
 	$(MAKE) -C $(LINUX) M=$(shell /bin/pwd) modules_install