aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xsrc/build_base_machine.sh69
-rwxr-xr-xsrc/ubuntu/install_build_deps.sh75
-rwxr-xr-xsystems/build_base_machine.sh2
-rwxr-xr-xsystems/centos/7/build_base_machine.sh (renamed from src/centos/install_build_deps.sh)0
-rwxr-xr-xsystems/rhel/7/build_base_machine.sh (renamed from src/rhel/install_build_deps.sh)0
-rwxr-xr-xsystems/ubuntu/14.04/build_base_machine.sh104
-rwxr-xr-xsystems/ubuntu/16.04/build_base_machine.sh104
7 files changed, 121 insertions, 233 deletions
diff --git a/src/build_base_machine.sh b/src/build_base_machine.sh
deleted file mode 100755
index dfd8e470..00000000
--- a/src/build_base_machine.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-#
-# Top level scripts to build basic setup for the host
-#
-
-# Copyright 2017 OPNFV, Intel Corporation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Contributors:
-# Aihua Li, Huawei Technologies.
-# Abdul Halim, Intel Corporation.
-# Martin Klozik, Intel Corporation.
-# Maryam Tahhan, Intel Corporation.
-ROOT_UID=0
-SUDO=""
-
-# function to emit error message before quitting
-function die() {
- echo $1
- exit 1
-}
-
-# Detect OS name and version from systemd based os-release file
-. /etc/os-release
-
-# Get OS name (the First word from $NAME in /etc/os-release)
-OS_NAME="$ID"
-
-# check if root
-if [ "$UID" -ne "$ROOT_UID" ]
-then
- # installation must be run via sudo
- SUDO="sudo -E"
-fi
-
-# If there is version specific dir available then set distro_dir to that
-if [ -d "$OS_NAME/$VERSION_ID" ]; then
- distro_dir="$OS_NAME/$VERSION_ID"
-else
- # Fallback - Default distro_dir = OS name
- distro_dir="$OS_NAME"
-fi
-
-# build base system using OS specific scripts
-if [ -d "$distro_dir" ] && [ -e "$distro_dir/install_build_deps.sh" ]; then
- $SUDO $distro_dir/install_build_deps.sh || die "$distro_dir/install_build_deps.sh failed"
-else
- die "$distro_dir is not yet supported"
-fi
-
-# download and compile DPDK, OVS, RDT and Collectd
-if [ -f Makefile ] ; then
- make || die "Make failed"
-else
- die "Make failed; No Makefile"
-fi
-
diff --git a/src/ubuntu/install_build_deps.sh b/src/ubuntu/install_build_deps.sh
deleted file mode 100755
index 119bca22..00000000
--- a/src/ubuntu/install_build_deps.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-# Copyright 2016-2017 OPNFV
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-set -eux
-apt-get -y install build-essential dh-autoreconf fakeroot devscripts dpkg-dev git wget
-
-apt-get -y install \
- debhelper dpkg-dev po-debconf dh-systemd dh-strip-nondeterminism \
- bison flex autotools-dev libltdl-dev pkg-config \
- iptables-dev \
- javahelper \
- libatasmart-dev \
- libcap-dev \
- libcurl4-gnutls-dev \
- libdbi0-dev \
- libesmtp-dev \
- libganglia1-dev \
- libgcrypt11-dev \
- libglib2.0-dev \
- libgps-dev \
- libhiredis-dev \
- libi2c-dev \
- libldap2-dev \
- liblua5.3-dev \
- liblvm2-dev \
- libmemcached-dev \
- libmodbus-dev \
- libmnl-dev \
- libmosquitto-dev \
- libmysqlclient-dev \
- libnotify-dev \
- libopenipmi-dev \
- liboping-dev \
- libow-dev \
- libpcap0.8-dev \
- libpcap-dev\
- libperl-dev \
- libpq-dev \
- libprotobuf-c-dev \
- libriemann-client-dev \
- librdkafka-dev \
- librabbitmq-dev \
- librrd-dev \
- libsensors4-dev \
- libsigrok-dev \
- libsnmp-dev \
- libsnmp9-dev \
- perl \
- libtokyocabinet-dev \
- libtokyotyrant-dev \
- libudev-dev \
- libupsclient-dev \
- libvarnishapi-dev \
- libvirt-dev \
- libxen-dev \
- libxml2-dev \
- libyajl-dev \
- linux-libc-dev \
- default-jdk \
- protobuf-c-compiler \
- python-dev \
- openvswitch-switch \
- mcelog
-
diff --git a/systems/build_base_machine.sh b/systems/build_base_machine.sh
index 70a0d171..2537f958 100755
--- a/systems/build_base_machine.sh
+++ b/systems/build_base_machine.sh
@@ -70,7 +70,7 @@ if [ -f ../src/Makefile ] ; then
cd ../src
make clobber || die "Make clobber failed"
make || die "Make failed"
- make intsall || die "Make install failed"
+ make install || die "Make install failed"
cd -
else
die "Make failed; No Makefile"
diff --git a/src/centos/install_build_deps.sh b/systems/centos/7/build_base_machine.sh
index 438c1435..438c1435 100755
--- a/src/centos/install_build_deps.sh
+++ b/systems/centos/7/build_base_machine.sh
diff --git a/src/rhel/install_build_deps.sh b/systems/rhel/7/build_base_machine.sh
index 583089a5..583089a5 100755
--- a/src/rhel/install_build_deps.sh
+++ b/systems/rhel/7/build_base_machine.sh
diff --git a/systems/ubuntu/14.04/build_base_machine.sh b/systems/ubuntu/14.04/build_base_machine.sh
index 4e8a129c..119bca22 100755
--- a/systems/ubuntu/14.04/build_base_machine.sh
+++ b/systems/ubuntu/14.04/build_base_machine.sh
@@ -1,8 +1,5 @@
#!/bin/bash
-#
-# Build a base machine for Ubuntu 14.04
-#
-# Copyright 2015 OPNFV, Intel Corporation.
+# Copyright 2016-2017 OPNFV
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,45 +12,64 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
-# Contributors:
-# Aihua Li, Huawei Technologies.
-# Martin Klozik, Intel Corporation.
-# Abdul Halim, Intel Corporation.
-
-apt-get update
-apt-get -y install $(echo "
-# Make and Compilers
-make
-automake
-gcc
-g++
-libc6
-libc6-dev
-
-# Linux Kernel Source
-linux-source
-linux-headers-$(uname -r)
-pkg-config
+set -eux
+apt-get -y install build-essential dh-autoreconf fakeroot devscripts dpkg-dev git wget
-# tools
-curl
-libcurl4-openssl-dev
-automake
-autoconf
-libtool
-libpcap-dev
-libnet1
-libncurses5-dev
-vim
-wget
-git
-pciutils
-cifs-utils
-socat
-libpixman-1-0
-libpixman-1-dev
+apt-get -y install \
+ debhelper dpkg-dev po-debconf dh-systemd dh-strip-nondeterminism \
+ bison flex autotools-dev libltdl-dev pkg-config \
+ iptables-dev \
+ javahelper \
+ libatasmart-dev \
+ libcap-dev \
+ libcurl4-gnutls-dev \
+ libdbi0-dev \
+ libesmtp-dev \
+ libganglia1-dev \
+ libgcrypt11-dev \
+ libglib2.0-dev \
+ libgps-dev \
+ libhiredis-dev \
+ libi2c-dev \
+ libldap2-dev \
+ liblua5.3-dev \
+ liblvm2-dev \
+ libmemcached-dev \
+ libmodbus-dev \
+ libmnl-dev \
+ libmosquitto-dev \
+ libmysqlclient-dev \
+ libnotify-dev \
+ libopenipmi-dev \
+ liboping-dev \
+ libow-dev \
+ libpcap0.8-dev \
+ libpcap-dev\
+ libperl-dev \
+ libpq-dev \
+ libprotobuf-c-dev \
+ libriemann-client-dev \
+ librdkafka-dev \
+ librabbitmq-dev \
+ librrd-dev \
+ libsensors4-dev \
+ libsigrok-dev \
+ libsnmp-dev \
+ libsnmp9-dev \
+ perl \
+ libtokyocabinet-dev \
+ libtokyotyrant-dev \
+ libudev-dev \
+ libupsclient-dev \
+ libvarnishapi-dev \
+ libvirt-dev \
+ libxen-dev \
+ libxml2-dev \
+ libyajl-dev \
+ linux-libc-dev \
+ default-jdk \
+ protobuf-c-compiler \
+ python-dev \
+ openvswitch-switch \
+ mcelog
-# install git-review tool
-git-review
-" | grep -v ^#)
diff --git a/systems/ubuntu/16.04/build_base_machine.sh b/systems/ubuntu/16.04/build_base_machine.sh
index 440b3e78..119bca22 100755
--- a/systems/ubuntu/16.04/build_base_machine.sh
+++ b/systems/ubuntu/16.04/build_base_machine.sh
@@ -1,8 +1,5 @@
#!/bin/bash
-#
-# Build a base machine for Ubuntu 16.04
-#
-# Copyright 2015-2017 OPNFV, Intel Corporation.
+# Copyright 2016-2017 OPNFV
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,45 +12,64 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
-# Contributors:
-# Aihua Li, Huawei Technologies.
-# Martin Klozik, Intel Corporation.
-# Abdul Halim, Intel Corporation.
-
-apt-get update
-apt-get -y install $(echo "
-# Make and Compilers
-make
-automake
-gcc
-g++
-libc6
-libc6-dev
-
-# Linux Kernel Source
-linux-source
-linux-headers-$(uname -r)
-pkg-config
+set -eux
+apt-get -y install build-essential dh-autoreconf fakeroot devscripts dpkg-dev git wget
-# tools
-curl
-libcurl4-openssl-dev
-automake
-autoconf
-libtool
-libpcap-dev
-libnet1
-libncurses5-dev
-vim
-wget
-git
-pciutils
-cifs-utils
-socat
-libpixman-1-0
-libpixman-1-dev
+apt-get -y install \
+ debhelper dpkg-dev po-debconf dh-systemd dh-strip-nondeterminism \
+ bison flex autotools-dev libltdl-dev pkg-config \
+ iptables-dev \
+ javahelper \
+ libatasmart-dev \
+ libcap-dev \
+ libcurl4-gnutls-dev \
+ libdbi0-dev \
+ libesmtp-dev \
+ libganglia1-dev \
+ libgcrypt11-dev \
+ libglib2.0-dev \
+ libgps-dev \
+ libhiredis-dev \
+ libi2c-dev \
+ libldap2-dev \
+ liblua5.3-dev \
+ liblvm2-dev \
+ libmemcached-dev \
+ libmodbus-dev \
+ libmnl-dev \
+ libmosquitto-dev \
+ libmysqlclient-dev \
+ libnotify-dev \
+ libopenipmi-dev \
+ liboping-dev \
+ libow-dev \
+ libpcap0.8-dev \
+ libpcap-dev\
+ libperl-dev \
+ libpq-dev \
+ libprotobuf-c-dev \
+ libriemann-client-dev \
+ librdkafka-dev \
+ librabbitmq-dev \
+ librrd-dev \
+ libsensors4-dev \
+ libsigrok-dev \
+ libsnmp-dev \
+ libsnmp9-dev \
+ perl \
+ libtokyocabinet-dev \
+ libtokyotyrant-dev \
+ libudev-dev \
+ libupsclient-dev \
+ libvarnishapi-dev \
+ libvirt-dev \
+ libxen-dev \
+ libxml2-dev \
+ libyajl-dev \
+ linux-libc-dev \
+ default-jdk \
+ protobuf-c-compiler \
+ python-dev \
+ openvswitch-switch \
+ mcelog
-# install git-review tool
-git-review
-" | grep -v ^#)