diff options
| author |   Marco Varlese <marco.varlese@suse.com> | 2017-10-13 10:18:25 +0200 |
|---|---|---|
| committer |   Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org> | 2017-11-01 11:14:02 -0500 |
| commit | a36386373cd8d08103492dd25fe59b564653b929 (patch) | |
| tree | 20518505dabd2bb86e350b57e3fa99918acde3c1 /jjb/scripts | |
| parent | f0be775cdefaeb6887f136f82b8b9292cc153b8b (diff) | |
openSUSE support and some rework to identify OS
Rework to identify OS:
Same approach followed by Makefiles and building scripts in the VPP
repository. It is much cleaner and easier to simply use the environment
variables in /etc/os-release
openSUSE support:
Some of the code added to the scripts can be removed once a separate
patch from Vanessa is merged. The purpose here is to save the changes
made since they will be lost otherwise.
Change-Id: I06a041bbc5f5b7e3fa3510db43acf7d1462ec24c
Signed-off-by: Marco Varlese <marco.varlese@suse.com>
Signed-off-by: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
Diffstat (limited to 'jjb/scripts')
| -rw-r--r-- | jjb/scripts/setup_vpp_dpdk_dev_env.sh | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/jjb/scripts/setup_vpp_dpdk_dev_env.sh b/jjb/scripts/setup_vpp_dpdk_dev_env.sh index f36bcaad8..055082538 100644 --- a/jjb/scripts/setup_vpp_dpdk_dev_env.sh +++ b/jjb/scripts/setup_vpp_dpdk_dev_env.sh @@ -1,20 +1,8 @@ #!/bin/bash set -e -o pipefail -# 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 -echo DISTRIB_ID: $DISTRIB_ID -echo DISTRIB_RELEASE: $DISTRIB_RELEASE -echo DISTRIB_CODENAME: $DISTRIB_CODENAME -echo DISTRIB_DESCRIPTION: $DISTRIB_DESCRIPTION +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') function setup { if ! [ -z ${REPO_NAME} ]; then @@ -22,12 +10,12 @@ function setup { REPO_URL="${NEXUSPROXY}/content/repositories/fd.io.${REPO_NAME}" echo "REPO_URL: ${REPO_URL}" # Setup by installing vpp-dev and vpp-lib - if [ $DISTRIB_ID == "Ubuntu" ]; then + if [ "$DISTRIB_ID" == "ubuntu" ]; then echo "deb ${REPO_URL} ./" | sudo tee /etc/apt/sources.list.d/99fd.io.list sudo apt-get update || true sudo apt-get -y --force-yes install vpp-dpdk-dev || true sudo apt-get -y --force-yes install vpp-dpdk-dkms || true - elif [[ $DISTRIB_ID == "CentOS" ]]; then + elif [ "$DISTRIB_ID" == "centos" ]; then sudo cat << EOF > fdio-master.repo [fdio-master] name=fd.io master branch latest merge |