summaryrefslogtreecommitdiffstats
path: root/systems
diff options
context:
space:
mode:
authorMaryam Tahhan <maryam.tahhan@intel.com>2017-11-20 13:22:56 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-11-20 13:22:56 +0000
commitdde33f975509dc47fe580a59f5ce3b615be23116 (patch)
tree7314e2acd3bff3cf780359da022ceeded0efd833 /systems
parent8e44b29f6eca84e41aa8a5f3be5d006340d66d89 (diff)
parent810dac49e96193b447d231d25d6522eef2e62d02 (diff)
Merge "docker: Added docker container for running collectd"
Diffstat (limited to 'systems')
-rwxr-xr-xsystems/build_base_machine.sh17
1 files changed, 11 insertions, 6 deletions
diff --git a/systems/build_base_machine.sh b/systems/build_base_machine.sh
index a50baf2d..dab2e761 100755
--- a/systems/build_base_machine.sh
+++ b/systems/build_base_machine.sh
@@ -3,7 +3,7 @@
# Top level scripts to build basic setup for the host
#
-# Copyright 2015-2016 OPNFV, Intel Corporation.
+# Copyright 2015-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.
@@ -23,6 +23,7 @@
# Abdul Halim, Intel Corporation.
# Martin Klozik, Intel Corporation.
# Maryam Tahhan, Intel Corporation.
+# Taras Chornyi, Intel Corporation.
ROOT_UID=0
SUDO=""
@@ -60,16 +61,20 @@ if [ -d "$distro_dir" ] && [ -e "$distro_dir/build_base_machine.sh" ]; then
else
die "$distro_dir is not supported"
fi
-
-if [ ! -d /lib/modules/`uname -r`/build ] ; then
- die "Kernel devel is not available for active kernel. It can be caused by recent kernel update. Please reboot and run $0 again."
+if [ -z ${DOCKER+x} ]; then
+ if [ ! -d /lib/modules/`uname -r`/build ] ; then
+ die "Kernel devel is not available for active kernel. It can be caused by recent kernel update. Please reboot and run $0 again."
+ fi
fi
-
# download and compile DPDK and Collectd
if [ -f ../src/Makefile ] ; then
cd ../src
make clobber || die "Make clobber failed"
- make install || die "Make install failed"
+if [ -z ${DOCKER+x} ]; then
+ make DOCKER=y install || die "Make install failed";
+else
+ make install || die "Make install failed";
+fi
cd -
else
die "Make failed; No Makefile"