From: Maryam Tahhan Date: Tue, 24 Oct 2017 14:21:40 +0000 (+0100) Subject: src: fix src build issues X-Git-Tag: opnfv-6.0.0~80 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ecf1ba1c5000718d1f0d90270af33039b488c835;p=barometer.git src: fix src build issues Change-Id: I8abf40a0034110dc504c227ffba1ff5e9ec6850b Signed-off-by: Maryam Tahhan Signed-off-by: Taras Chornyi --- diff --git a/src/Makefile b/src/Makefile index e7a472c1..4785e854 100644 --- a/src/Makefile +++ b/src/Makefile @@ -32,9 +32,12 @@ $(SUBBUILDS): with-dpdk: export WITH_DPDK + include mk/master.mk SUBDIRS = +ifdef WITH_DPDK SUBDIRS += dpdk +endif SUBDIRS += libpqos SUBDIRS += pmu-tools SUBDIRS += collectd diff --git a/src/collectd/Makefile b/src/collectd/Makefile index b7fc2a15..e09aca3b 100644 --- a/src/collectd/Makefile +++ b/src/collectd/Makefile @@ -52,7 +52,7 @@ CONFIG_CMD += --disable-perl .PHONY: install force_install config force_make # install depends on make -#force_install: force_make +force_install: force_make all: force_make @echo "Finished making $(WORK_DIR)" diff --git a/src/collectd/collectd_sample_configs/intel_pmu.conf b/src/collectd/collectd_sample_configs/intel_pmu.conf new file mode 100644 index 00000000..db83e4bb --- /dev/null +++ b/src/collectd/collectd_sample_configs/intel_pmu.conf @@ -0,0 +1,22 @@ +# Copyright 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. +LoadPlugin intel_pmu + + + ReportHardwareCacheEvents true + ReportKernelPMUEvents true + ReportSoftwareEvents true +# EventList "/var/cache/pmu/GenuineIntel-6-2D-core.json" +# HardwareEvents "L2_RQSTS.CODE_RD_HIT,L2_RQSTS.CODE_RD_MISS" "L2_RQSTS.ALL_CODE_RD" + diff --git a/src/collectd/collectd_sample_configs/mcelog.conf b/src/collectd/collectd_sample_configs/mcelog.conf index 649573dc..3e28f3f1 100644 --- a/src/collectd/collectd_sample_configs/mcelog.conf +++ b/src/collectd/collectd_sample_configs/mcelog.conf @@ -16,5 +16,10 @@ + McelogClientSocket "/var/run/mcelog-client" + PersistentNotification false + +## McelogLogfile "/var/log/mcelog" + diff --git a/src/collectd/snmp_mib_config.sh b/src/collectd/snmp_mib_config.sh index 179eb4ba..a2c44db1 100755 --- a/src/collectd/snmp_mib_config.sh +++ b/src/collectd/snmp_mib_config.sh @@ -17,8 +17,14 @@ export CURRENT_DIR=$(pwd) cp $CURRENT_DIR/../../mibs/* /usr/share/snmp/mibs/ -if [ -n "$(uname -a | grep Ubuntu)" ]; then +# 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" + +if [ "x$OS_NAME" == "xubuntu" ]; then cp $CURRENT_DIR/../../mibs/* /var/lib/mibs/ietf/ -else +elif [ "x${OS_NAME}" == "xfedora" ]; then cp $CURRENT_DIR/../../mibs/* /usr/share/mibs/ietf/ fi diff --git a/src/pmu-tools/Makefile b/src/pmu-tools/Makefile index e40521f5..6d080d70 100644 --- a/src/pmu-tools/Makefile +++ b/src/pmu-tools/Makefile @@ -22,7 +22,7 @@ include ../mk/master.mk include ../package-list.mk - +export XDG_CACHE_HOME=/usr/local/src WORK_DIR = pmu-tools TAG_DONE_FLAG = $(WORK_DIR)/.$(PMUTOOLS_TAG).done BUILD_CMD = @@ -42,7 +42,8 @@ force_make: $(WORK_DIR) $(TAG_DONE_FLAG) $(AT)cd $(WORK_DIR) && git pull $(PMUTOOLS_URL) $(PMUTOOLS_TAG) @echo "git pull done" $(AT)cd $(WORK_DIR)/jevents - $(AT)sed -i 's/CFLAGS += -g -Wall -O2 -Wno-unused-result -fPIC/CFLAGS += -g -Wall -O2 -Wno-unused-result -fPIC/' $(MAKEFILE) + $(AT)sed -i 's/lib64/lib/' $(WORK_DIR)/jevents/$(MAKEFILE) + $(AT)sed -i 's/CFLAGS := -g -Wall -O2 -Wno-unused-result/CFLAGS := -g -Wall -O2 -Wno-unused-result -fPIC/' $(WORK_DIR)/jevents/$(MAKEFILE) $(AT)$(MAKE) -C $(WORK_DIR)/jevents @echo "Make done" diff --git a/systems/build_base_machine.sh b/systems/build_base_machine.sh index 2537f958..cec82ebb 100755 --- a/systems/build_base_machine.sh +++ b/systems/build_base_machine.sh @@ -69,7 +69,6 @@ fi if [ -f ../src/Makefile ] ; then cd ../src make clobber || die "Make clobber failed" - make || die "Make failed" make install || die "Make install failed" cd - else diff --git a/systems/ubuntu/14.04/build_base_machine.sh b/systems/ubuntu/14.04/build_base_machine.sh index 4f62f302..a06cd517 100755 --- a/systems/ubuntu/14.04/build_base_machine.sh +++ b/systems/ubuntu/14.04/build_base_machine.sh @@ -40,6 +40,8 @@ apt-get -y install \ libmnl-dev \ libmosquitto0-dev \ libmysqlclient-dev \ + libncurses5 \ + libncurses5-dev \ libnotify-dev \ libopenipmi-dev \ liboping-dev \ @@ -47,6 +49,7 @@ apt-get -y install \ libpcap0.8-dev \ libpcap-dev\ libperl-dev \ + libpopt-dev \ libpq-dev \ libprotobuf-c0-dev \ libriemann-client-dev \ @@ -65,8 +68,8 @@ apt-get -y install \ libudev-dev \ libupsclient-dev \ libvarnishapi-dev \ + libvirt-bin \ libvirt-dev \ - libvirt-daemon \ libxen-dev \ libxml2-dev \ libyajl-dev \