Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add debian 8 support in extras/vagrant/build.sh
[vpp.git]
/
extras
/
vagrant
/
build.sh
diff --git
a/extras/vagrant/build.sh
b/extras/vagrant/build.sh
index
76838e2
..
34873f9
100755
(executable)
--- a/
extras/vagrant/build.sh
+++ b/
extras/vagrant/build.sh
@@
-26,6
+26,12
@@
elif [ -f /etc/redhat-release ];then
DISTRIB_RELEASE=`lsb_release -sr`
DISTRIB_CODENAME=`lsb_release -sc`
DISTRIB_DESCRIPTION=`lsb_release -sd`
DISTRIB_RELEASE=`lsb_release -sr`
DISTRIB_CODENAME=`lsb_release -sc`
DISTRIB_DESCRIPTION=`lsb_release -sd`
+elif [ -f /etc/os-release ];then
+ . /etc/os-release
+ DISTRIB_ID=$ID
+ DISTRIB_RELEASE=$VERSION_ID
+ DISTRIB_CODENAME=$VERSION
+ DISTRIB_DESCRIPTION=$PRETTY_NAME
fi
KERNEL_OS=`uname -o`
KERNEL_MACHINE=`uname -m`
fi
KERNEL_OS=`uname -o`
KERNEL_MACHINE=`uname -m`
@@
-65,8
+71,11
@@
fi
# Build and install packaging
$SUDOCMD make bootstrap
# Build and install packaging
$SUDOCMD make bootstrap
+
if [ $DISTRIB_ID == "Ubuntu" ]; then
$SUDOCMD make pkg-deb
if [ $DISTRIB_ID == "Ubuntu" ]; then
$SUDOCMD make pkg-deb
+elif [ $DISTRIB_ID == "debian" ]; then
+ $SUDOCMD make pkg-deb
elif [ $DISTRIB_ID == "CentOS" ]; then
(cd $VPP_DIR/vnet ;$SUDOCMD aclocal;$SUDOCMD automake -a)
$SUDOCMD make pkg-rpm
elif [ $DISTRIB_ID == "CentOS" ]; then
(cd $VPP_DIR/vnet ;$SUDOCMD aclocal;$SUDOCMD automake -a)
$SUDOCMD make pkg-rpm