Code Review
/
vpp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(parent:
1fd5d01
)
fix OS_ID test in root Makefile
19/4819/3
author
Gabriel Ganne
<
[email protected]
>
Mon, 23 Jan 2017 11:08:58 +0000
(12:08 +0100)
committer
Dave Wallace
<
[email protected]
>
Tue, 24 Jan 2017 16:11:44 +0000
(16:11 +0000)
fixup for
2ce7f9834ab55728520bff0dd15f8d82c10b95a0
redhat, centos -> rpm
debian, ubuntu -> deb
Change-Id: I0a07d3689b2bb5656d1bc688677680f83ac2e0bb
Signed-off-by: Gabriel Ganne <
[email protected]
>
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
71eec08
..
2af6340
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-30,9
+30,9
@@
OS_ID = $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"
OS_VERSION_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
endif
-ifeq ($(
OS_ID),ubuntu
)
+ifeq ($(
filter ubuntu debian,$(OS_ID)),$(OS_ID)
)
PKG=deb
-else ifeq ($(
OS_ID),centos
)
+else ifeq ($(
filter rhel centos,$(OS_ID)),$(OS_ID)
)
PKG=rpm
endif