Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
Simple PCIe FMC carrier SPEC - Software
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
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
Simple PCIe FMC carrier SPEC - Software
Commits
f569932b
Commit
f569932b
authored
Jan 11, 2017
by
Pat Riehecky
Committed by
Alessandro Rubini
Jun 27, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow override of GIT_VERSION, but preserve existing behavior
parent
1b419aa2
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
Makefile
Makefile
+4
-0
Makefile
kernel/Makefile
+1
-1
Makefile
tools/Makefile
+1
-1
No files found.
Makefile
View file @
f569932b
...
@@ -3,6 +3,10 @@
...
@@ -3,6 +3,10 @@
REPO_PARENT
=
$(
shell
/bin/pwd
)
/..
REPO_PARENT
=
$(
shell
/bin/pwd
)
/..
-include
$(REPO_PARENT)/parent_common.mk
-include
$(REPO_PARENT)/parent_common.mk
# export git tree for subdirs
GIT_VERSION
?=
$(
shell
git describe
--dirty
--long
--tags
)
export
GIT_VERSION
# by default use the fmc-bus within the repository
# by default use the fmc-bus within the repository
FMC_BUS
?=
fmc-bus
FMC_BUS
?=
fmc-bus
# FMC_BUS_ABS 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
...
...
kernel/Makefile
View file @
f569932b
...
@@ -10,7 +10,7 @@ FMC_BUS ?= ../fmc-bus/
...
@@ -10,7 +10,7 @@ FMC_BUS ?= ../fmc-bus/
# FMC_BUS_ABS 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_BUS_ABS
?=
$
(
abspath
$(FMC_BUS)
)
FMC_BUS_ABS
?=
$
(
abspath
$(FMC_BUS)
)
GIT_VERSION
=
$(
shell
git describe
--dirty
--long
--tags
)
GIT_VERSION
?
=
$(
shell
git describe
--dirty
--long
--tags
)
export
GIT_VERSION
export
GIT_VERSION
FMC_BUS_VERSION
?=
$(
shell
cd
$(FMC_BUS_ABS)
;
git describe
--always
--dirty
--long
--tags
)
FMC_BUS_VERSION
?=
$(
shell
cd
$(FMC_BUS_ABS)
;
git describe
--always
--dirty
--long
--tags
)
...
...
tools/Makefile
View file @
f569932b
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
REPO_PARENT
=
../..
REPO_PARENT
=
../..
-include
$(REPO_PARENT)/parent_common.mk
-include
$(REPO_PARENT)/parent_common.mk
GIT_VERSION
:
=
$(
shell
git describe
--dirty
--long
--tags
)
GIT_VERSION
?
=
$(
shell
git describe
--dirty
--long
--tags
)
CFLAGS
+=
-ggdb
-Wall
-fPIC
-I
../kernel
$(EXTRACFLAGS)
CFLAGS
+=
-ggdb
-Wall
-fPIC
-I
../kernel
$(EXTRACFLAGS)
CFLAGS
+=
-DGIT_VERSION
=
\"
$(GIT_VERSION)
\"
CFLAGS
+=
-DGIT_VERSION
=
\"
$(GIT_VERSION)
\"
...
...
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