From 48009e4c5732180ecc951ac6359b9b96d38b8dc2 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Thu, 20 Apr 2017 11:43:56 +0200 Subject: Move vagrant stuff to extras/ Change-Id: I7e3d6ecc3f23d862004c273e23e36e234ceb6015 Signed-off-by: Damjan Marion --- extras/vagrant/build.sh | 74 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100755 extras/vagrant/build.sh (limited to 'extras/vagrant/build.sh') diff --git a/extras/vagrant/build.sh b/extras/vagrant/build.sh new file mode 100755 index 00000000..76838e28 --- /dev/null +++ b/extras/vagrant/build.sh @@ -0,0 +1,74 @@ +#!/bin/bash + +# Get Command Line arguements if present +VPP_DIR=$1 +if [ "x$1" != "x" ]; then + VPP_DIR=$1 +else + VPP_DIR=`dirname $0`/../../ +fi + +if [ "x$2" != "x" ]; then + SUDOCMD="sudo -H -u $2" +fi +echo 0:$0 +echo 1:$1 +echo 2:$2 +echo VPP_DIR: $VPP_DIR +echo SUDOCMD: $SUDOCMD + +# Figure out what system we are running on +if [ -f /etc/lsb-release ];then + . /etc/lsb-release +elif [ -f /etc/redhat-release ];then + sudo yum install -y redhat-lsb + DISTRIB_ID=`lsb_release -si` + DISTRIB_RELEASE=`lsb_release -sr` + DISTRIB_CODENAME=`lsb_release -sc` + DISTRIB_DESCRIPTION=`lsb_release -sd` +fi +KERNEL_OS=`uname -o` +KERNEL_MACHINE=`uname -m` +KERNEL_RELEASE=`uname -r` +KERNEL_VERSION=`uname -v` + +echo KERNEL_OS: $KERNEL_OS +echo KERNEL_MACHINE: $KERNEL_MACHINE +echo KERNEL_RELEASE: $KERNEL_RELEASE +echo KERNEL_VERSION: $KERNEL_VERSION +echo DISTRIB_ID: $DISTRIB_ID +echo DISTRIB_RELEASE: $DISTRIB_RELEASE +echo DISTRIB_CODENAME: $DISTRIB_CODENAME +echo DISTRIB_DESCRIPTION: $DISTRIB_DESCRIPTION + +# Install dependencies +cd $VPP_DIR +make UNATTENDED=yes install-dep + +# Really really clean things up so we can be sure +# that the build works even when switching distros +$SUDOCMD make wipe +(cd build-root/;$SUDOCMD make distclean) +rm -f build-root/.bootstrap.ok + +if [ $DISTRIB_ID == "CentOS" ]; then + echo rpm -V apr-devel + rpm -V apr-devel + if [ $? != 0 ]; then sudo yum reinstall -y apr-devel;fi + echo rpm -V ganglia-devel + rpm -V ganglia-devel + if [ $? != 0 ]; then sudo yum reinstall -y ganglia-devel;fi + echo rpm -V libconfuse-devel + rpm -V libconfuse-devel + if [ $? != 0 ]; then sudo yum reinstall -y libconfuse-devel;fi +fi + +# Build and install packaging +$SUDOCMD make bootstrap +if [ $DISTRIB_ID == "Ubuntu" ]; then + $SUDOCMD make pkg-deb +elif [ $DISTRIB_ID == "CentOS" ]; then + (cd $VPP_DIR/vnet ;$SUDOCMD aclocal;$SUDOCMD automake -a) + $SUDOCMD make pkg-rpm +fi + -- cgit 1.2.3-korg From 28262a06d8ff36056ff62269a53d1f6bfcdda5e4 Mon Sep 17 00:00:00 2001 From: khers Date: Wed, 24 May 2017 15:43:54 +0430 Subject: Add debian 8 support in extras/vagrant/build.sh Change-Id: I03f73615f4355163afd9fb5062dcea7c2df5a49a Signed-off-by: khers --- extras/vagrant/build.sh | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'extras/vagrant/build.sh') diff --git a/extras/vagrant/build.sh b/extras/vagrant/build.sh index 76838e28..34873f96 100755 --- 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` +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` @@ -65,8 +71,11 @@ fi # Build and install packaging $SUDOCMD make bootstrap + 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 -- cgit 1.2.3-korg From dc33d4ccb3712ab313f9d471cde35ef208aa0e29 Mon Sep 17 00:00:00 2001 From: Marco Varlese Date: Fri, 22 Sep 2017 17:53:53 +0200 Subject: openSUSE build fix * Fixed package dependency * Fixed bash unary operation error Change-Id: I782dda8ffd807931241fa6034c110f5fedbeca8e Signed-off-by: Marco Varlese --- Makefile | 2 +- extras/vagrant/build.sh | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'extras/vagrant/build.sh') diff --git a/Makefile b/Makefile index b8aca470..cc26ea52 100644 --- a/Makefile +++ b/Makefile @@ -108,7 +108,7 @@ else ifeq ($(findstring y,$(AESNI)),y) endif RPM_SUSE_DEPENDS = autoconf automake bison ccache chrpath distribution-release gcc6 glibc-devel-static -RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool lsb-release make openssl-devel +RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool make openssl-devel RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm libnuma-devel python3 ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID)) diff --git a/extras/vagrant/build.sh b/extras/vagrant/build.sh index 34873f96..fcfd52aa 100755 --- a/extras/vagrant/build.sh +++ b/extras/vagrant/build.sh @@ -72,12 +72,14 @@ fi # Build and install packaging $SUDOCMD make bootstrap -if [ $DISTRIB_ID == "Ubuntu" ]; then +if [ "$DISTRIB_ID" == "Ubuntu" ]; then $SUDOCMD make pkg-deb -elif [ $DISTRIB_ID == "debian" ]; then +elif [ "$DISTRIB_ID" == "debian" ]; then $SUDOCMD make pkg-deb -elif [ $DISTRIB_ID == "CentOS" ]; then +elif [ "$DISTRIB_ID" == "CentOS" ]; then (cd $VPP_DIR/vnet ;$SUDOCMD aclocal;$SUDOCMD automake -a) $SUDOCMD make pkg-rpm +elif [ "$DISTRIB_ID" == "opensuse" ]; then + $SUDOCMD make build-release fi -- cgit 1.2.3-korg