From 9e260ddd301915ee0417d7676170534b79ad2ad6 Mon Sep 17 00:00:00 2001 From: Maryam Tahhan Date: Tue, 23 May 2017 15:58:19 +0100 Subject: install: remove unused scripts in src Remove unused scripts in src. Relocate relavent scripts to system. Tested on CentOS 7 and Ubuntu 16.04. Change-Id: Id6bb00df854760c6bbf8d47011a9f6f7fe2c230b Signed-off-by: Maryam Tahhan --- systems/build_base_machine.sh | 2 +- systems/centos/7/build_base_machine.sh | 59 ++++++++++++++++ systems/rhel/7/build_base_machine.sh | 59 ++++++++++++++++ systems/ubuntu/14.04/build_base_machine.sh | 104 +++++++++++++++++------------ systems/ubuntu/16.04/build_base_machine.sh | 104 +++++++++++++++++------------ 5 files changed, 239 insertions(+), 89 deletions(-) create mode 100755 systems/centos/7/build_base_machine.sh create mode 100755 systems/rhel/7/build_base_machine.sh (limited to 'systems') 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/systems/centos/7/build_base_machine.sh b/systems/centos/7/build_base_machine.sh new file mode 100755 index 00000000..438c1435 --- /dev/null +++ b/systems/centos/7/build_base_machine.sh @@ -0,0 +1,59 @@ +#!/bin/bash +# +# Build a base machine for CentOS distro +# +# 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. +# +# Contributors: +# Aihua Li, Huawei Technologies. +# Martin Klozik, Intel Corporation. +# Maryam Tahhan, Intel Corporation. +# Synchronize package index files +yum -y update + +# For collectd +yum install -y yum-utils +yum install -y epel-release +yum-builddep -y collectd + +# Install required packages +yum -y install $(echo " + +kernel-devel +kernel-headers +make +gcc +gcc-c++ +autoconf +automake +flex +bison +libtool +pkg-config +git +rpm-build +libcap-devel +xfsprogs-devel +iptables-devel +libmemcached-devel +gtk2-devel +libvirt-devel +mcelog +wget + +# install epel release required for git-review +epel-release +" | grep -v ^#) + diff --git a/systems/rhel/7/build_base_machine.sh b/systems/rhel/7/build_base_machine.sh new file mode 100755 index 00000000..583089a5 --- /dev/null +++ b/systems/rhel/7/build_base_machine.sh @@ -0,0 +1,59 @@ +#!/bin/bash +# +# Build a base machine for RHEL distro +# +# 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. +# +# Contributors: +# Aihua Li, Huawei Technologies. +# Martin Klozik, Intel Corporation. +# Maryam Tahhan, Intel Corporation. +# Synchronize package index files +yum -y update + +# For collectd +yum install -y yum-utils +yum install -y epel-release +yum-builddep -y collectd + +# Install required packages +yum -y install $(echo " + +kernel-devel +kernel-headers +make +gcc +gcc-c++ +autoconf +automake +flex +bison +libtool +pkg-config +git +rpm-build +libcap-devel +xfsprogs-devel +iptables-devel +libmemcached-devel +gtk2-devel +libvirt-devel +mcelog +wget + +# install epel release required for git-review +epel-release +" | grep -v ^#) + 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 ^#) -- cgit 1.2.3-korg