diff options
| author |   Marco Varlese <marco.varlese@suse.com> | 2017-10-06 15:07:08 +0200 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2017-10-09 02:41:01 +0000 |
| commit | c2e63feb6209ef504753fe2c975cf61b1c31b5cf (patch) | |
| tree | 3e7d73fd78cd195c8e5d7c43d4c51a1d8707e83e /extras/vagrant/build.sh | |
| parent | e9aebf9db548b940c77f7c5826a1260d1931e75d (diff) | |
Allow use of /etc/os-release file
The top-level Makefile in VPP already uses the file /etc/os-release to
recognize which OS the build is being performed on.
The scripts for vagrant images instead were still using different files
for different distros and adding a new distro to be supported causes
issues with the extra-logic to deal with it.
This patch aligns the vagrant scripts to use the same approach followed
by the top-level Makefile and simplifies the steps to identify / update
the OS and build / run VPP.
Change-Id: I539f4a7c27b3fef70ed1c12b0276049bc47dc289
Signed-off-by: Marco Varlese <marco.varlese@suse.com>
Diffstat (limited to 'extras/vagrant/build.sh')
| -rwxr-xr-x | extras/vagrant/build.sh | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/extras/vagrant/build.sh b/extras/vagrant/build.sh index fcfd52aa707..d317c31aca6 100755 --- a/extras/vagrant/build.sh +++ b/extras/vagrant/build.sh @@ -17,22 +17,11 @@ 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` -elif [ -f /etc/os-release ];then - . /etc/os-release - DISTRIB_ID=$ID - DISTRIB_RELEASE=$VERSION_ID - DISTRIB_CODENAME=$VERSION - DISTRIB_DESCRIPTION=$PRETTY_NAME +if [ "$(uname)" <> "Darwin" ]; then + OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') + OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') fi + KERNEL_OS=`uname -o` KERNEL_MACHINE=`uname -m` KERNEL_RELEASE=`uname -r` @@ -42,10 +31,8 @@ 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 +echo OS_ID: $OS_ID +echo OS_VERSION_ID: $OS_ID # Install dependencies cd $VPP_DIR @@ -57,7 +44,7 @@ $SUDOCMD make wipe (cd build-root/;$SUDOCMD make distclean) rm -f build-root/.bootstrap.ok -if [ $DISTRIB_ID == "CentOS" ]; then +if [ $OS_ID == "centos" ]; then echo rpm -V apr-devel rpm -V apr-devel if [ $? != 0 ]; then sudo yum reinstall -y apr-devel;fi @@ -72,14 +59,14 @@ fi # Build and install packaging $SUDOCMD make bootstrap -if [ "$DISTRIB_ID" == "Ubuntu" ]; then +if [ "$OS_ID" == "ubuntu" ]; then $SUDOCMD make pkg-deb -elif [ "$DISTRIB_ID" == "debian" ]; then +elif [ "$OS_ID" == "debian" ]; then $SUDOCMD make pkg-deb -elif [ "$DISTRIB_ID" == "CentOS" ]; then +elif [ "$OS_ID" == "centos" ]; then (cd $VPP_DIR/vnet ;$SUDOCMD aclocal;$SUDOCMD automake -a) $SUDOCMD make pkg-rpm -elif [ "$DISTRIB_ID" == "opensuse" ]; then +elif [ "$OS_ID" == "opensuse" ]; then $SUDOCMD make build-release fi |