Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
FMC DEL 1ns 4cha - Software
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
FMC DEL 1ns 4cha - Software
Commits
3d96996e
Commit
3d96996e
authored
Oct 27, 2015
by
Adam Wujek
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kernel: add versions of used submodules to the kernel module
Signed-off-by:
Adam Wujek
<
adam.wujek@cern.ch
>
parent
fcb1e15c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
7 deletions
+16
-7
Kbuild
kernel/Kbuild
+12
-5
Makefile
kernel/Makefile
+3
-1
fd-core.c
kernel/fd-core.c
+1
-1
No files found.
kernel/Kbuild
View file @
3d96996e
...
...
@@ -3,12 +3,19 @@ KBUILD_EXTRA_SYMBOLS := \
$(ZIO_ABS)/Module.symvers \
$(FMC_BUS_ABS)/kernel/Module.symvers
#
For this CSM_VERSION, please see ohwr.org/csm documentation
ifdef CONFIG_CSM_VERSION
ccflags-y += -D"CERN_SUPER_MODULE=MODULE_VERSION(\"$(CONFIG_CSM_VERSION)\")"
else
ccflags-y += -DCERN_SUPER_MODULE=""
#
add versions of supermodule. It is useful when fine-delay-sw is included as sub-module
# of a bigger project that we want to track
ifdef CONFIG_SUPER_REPO
ifdef CONFIG_SUPER_REPO_VERSION
SUBMODULE_VERSIONS += MODULE_INFO(version_$(CONFIG_SUPER_REPO),\"$(CONFIG_SUPER_REPO_VERSION)\");
endif
endif
# add versions of used submodules
SUBMODULE_VERSIONS += MODULE_INFO(version_fmc_bus,\"$(FMC_BUS_VERSION)\");
SUBMODULE_VERSIONS += MODULE_INFO(version_zio,\"$(ZIO_VERSION)\");
ccflags-y += -DADDITIONAL_VERSIONS="$(SUBMODULE_VERSIONS)"
# The library includes <sdb.h>, so point -I directtly there
# include our header before to avoid conflicts with the kernel
LINUXINCLUDE := -I$(FMC_BUS_ABS)/kernel/include -I$(FMC_BUS_ABS)/kernel/include/linux $(LINUXINCLUDE)
...
...
kernel/Makefile
View file @
3d96996e
...
...
@@ -16,7 +16,9 @@ ZIO_ABS ?= $(abspath $(ZIO) )
GIT_VERSION
=
$(
shell
git describe
--dirty
--long
--tags
)
export
GIT_VERSION
ZIO_VERSION
=
$(
shell
cd
$(ZIO_ABS)
;
git describe
--always
--dirty
--long
--tags
)
FMC_BUS_VERSION
?=
$(
shell
cd
$(FMC_BUS_ABS)
;
git describe
--always
--dirty
--long
--tags
)
ZIO_VERSION
?=
$(
shell
cd
$(ZIO_ABS)
;
git describe
--always
--dirty
--long
--tags
)
export
FMC_BUS_VERSION
export
ZIO_VERSION
all modules
:
...
...
kernel/fd-core.c
View file @
3d96996e
...
...
@@ -369,4 +369,4 @@ module_exit(fd_exit);
MODULE_VERSION
(
GIT_VERSION
);
MODULE_LICENSE
(
"GPL and additional rights"
);
/* LGPL */
CERN_SUPER_MODULE
;
ADDITIONAL_VERSIONS
;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment