Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
Z
ZIO
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
1
Merge Requests
1
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
ZIO
Commits
14f5bc88
Commit
14f5bc88
authored
Sep 02, 2019
by
Federico Vaga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
zio: fix building system get correct version everywhere
Signed-off-by:
federico.vaga@cern.ch
<
federico.vaga@cern.ch
>
parent
e571218f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
17 deletions
+8
-17
Makefile
Makefile
+2
-17
Makefile
tools/Makefile
+6
-0
No files found.
Makefile
View file @
14f5bc88
...
@@ -4,22 +4,10 @@
...
@@ -4,22 +4,10 @@
REPO_PARENT
?=
..
REPO_PARENT
?=
..
-include
$(REPO_PARENT)/parent_common.mk
-include
$(REPO_PARENT)/parent_common.mk
LINUX
?=
/lib/modules/
$(
shell
uname
-r
)
/build
GIT_VERSION
:=
$(
shell
git describe
--dirty
--long
--tags
)
# Extract major, minor and patch number
ZIO_VERSION
:=
-D__ZIO_MAJOR_VERSION
=
$(
shell
echo
$(GIT_VERSION)
|
cut
-d
'-'
-f
2 |
cut
-d
'.'
-f
1
;
)
ZIO_VERSION
+=
-D__ZIO_MINOR_VERSION
=
$(
shell
echo
$(GIT_VERSION)
|
cut
-d
'-'
-f
2 |
cut
-d
'.'
-f
2
;
)
ZIO_VERSION
+=
-D__ZIO_PATCH_VERSION
=
$(
shell
echo
$(GIT_VERSION)
|
cut
-d
'-'
-f
3
)
export
GIT_VERSION
export
ZIO_VERSION
all
:
modules tools
all
:
modules tools
modules
:
modules
:
$(MAKE)
-C
drivers/zio
M
=
$(
shell
/bin/pwd
)
$(MAKE)
-C
drivers/zio
.PHONY
:
tools
.PHONY
:
tools
...
@@ -29,8 +17,5 @@ tools:
...
@@ -29,8 +17,5 @@ tools:
# this make clean is ugly, I'm aware...
# this make clean is ugly, I'm aware...
clean
:
clean
:
rm
-rf
`
find
.
-name
\*
.o
-o
-name
\*
.ko
-o
-name
\*
~
`
$(MAKE)
-C
drivers/zio clean
rm
-rf
`
find
.
-name
Module.
\*
-o
-name
\*
.mod.c
`
rm
-rf
`
find
.
-name
\*
.ko.cmd
-o
-name
\*
.o.cmd
`
rm
-rf
.tmp_versions modules.order
$(MAKE)
-C
tools clean
$(MAKE)
-C
tools clean
tools/Makefile
View file @
14f5bc88
# build user-space tools for zio
# build user-space tools for zio
GIT_VERSION
:=
$(
shell
git describe
--dirty
--long
--tags
|
grep
-o
-E
"[^v]*"
)
# Extract major, minor and patch number
ZIO_VERSION
:=
-D__ZIO_MAJOR_VERSION
=
$(
shell
echo
$(GIT_VERSION)
|
cut
-d
'-'
-f
1 |
cut
-d
'.'
-f
1
;
)
ZIO_VERSION
+=
-D__ZIO_MINOR_VERSION
=
$(
shell
echo
$(GIT_VERSION)
|
cut
-d
'-'
-f
1 |
cut
-d
'.'
-f
2
;
)
ZIO_VERSION
+=
-D__ZIO_PATCH_VERSION
=
$(
shell
echo
$(GIT_VERSION)
|
cut
-d
'-'
-f
1 |
cut
-d
'.'
-f
3
;
)
CFLAGS
=
-I
$(M)
/include/
-Wall
$(ZIO_VERSION)
$(EXTRACFLAGS)
CFLAGS
=
-I
$(M)
/include/
-Wall
$(ZIO_VERSION)
$(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