kernel: Make build working

--export ZIO_VERSION --correct getting GIT_VERSION --create link fmc-bus-link to the fmc-bus, -objs cannot take absolute path to the file Signen-off-by: Adam Wujek <adam.wujek@cern.ch>

kernel: Make build working
--export ZIO_VERSION --correct getting GIT_VERSION --create link fmc-bus-link to the fmc-bus, -objs cannot take absolute path to the file Signen-off-by: Adam Wujek <adam.wujek@cern.ch>
cc8e0fc0 · Adam Wujek · 4ec804a1 · cc8e0fc0 · cc8e0fc0
Commit cc8e0fc0 authored Oct 26, 2015 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 4 deletions

Kbuild kernel/Kbuild +2 -2

Makefile kernel/Makefile +9 -2

No files found.
--- a/kernel/Kbuild
+++ b/kernel/Kbuild
@@ -33,5 +33,5 @@ fmc-fine-delay-objs	=  fd-zio.o fd-irq.o fd-core.o
 fmc-fine-delay-objs	+= onewire.o spi.o i2c.o gpio.o
 fmc-fine-delay-objs	+= acam.o calibrate.o pll.o time.o
 fmc-fine-delay-objs	+= calibration.o fmc-util.o
-fmc-fine-delay-objs	+= ../fmc-bus/sdb-lib/access.o
+fmc-fine-delay-objs	+= fmc-bus-link/sdb-lib/access.o
-fmc-fine-delay-objs	+= ../fmc-bus/sdb-lib/glue.o
+fmc-fine-delay-objs	+= fmc-bus-link/sdb-lib/glue.o
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -3,12 +3,19 @@ LINUX ?= /lib/modules/$(shell uname -r)/build
 ZIO ?= $(src)/../zio
 FMC_BUS ?= $(src)/../fmc-bus
-GIT_VERSION = $(shell cd $(src); git describe --dirty --long --tags)
+GIT_VERSION = $(shell git describe --dirty --long --tags)
+export GIT_VERSION
+ZIO_VERSION = $(shell cd $(ZIO); git describe --always --dirty --long --tags)
+export ZIO_VERSION
 all modules:
+	rm -f fmc-bus-link
+	ln -s $(FMC_BUS) fmc-bus-link
 	$(MAKE) -C $(LINUX) M=$(shell /bin/pwd) modules
+	rm -f fmc-bus-link
-install modules_install:
+install modules_install: modules
 	$(MAKE) -C $(LINUX) M=$(shell /bin/pwd) modules_install
 # be able to run the "clean" rule even if $(LINUX) is not valid