diff options
| author |   Feng Pan <fpan@redhat.com> | 2017-09-20 02:27:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-20 02:27:11 +0000 |
| commit | b12062bf50f211efb8568d0643a9c8ae33c472f6 (patch) | |
| tree | 9f20f3114a99020e22a6ca63957e120ab6cccdc8 | |
| parent | bdd2822247a9b3ddf2a30a9de49c97aca4d8eb43 (diff) | |
| parent | e8666e078f94fdc48b340bc4466d35ce97551e0d (diff) | |
Merge "Removes building OVS 2.6.1 with NSH"
| -rwxr-xr-x | build/build_ovs_nsh.sh | 28 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 28 |
2 files changed, 0 insertions, 56 deletions
diff --git a/build/build_ovs_nsh.sh b/build/build_ovs_nsh.sh deleted file mode 100755 index 2fba43f5..00000000 --- a/build/build_ovs_nsh.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash -############################################################################## -# Copyright (c) 2016 Tim Rozet (Red Hat) and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -set -e - -yum -y install rpm-build autoconf automake libtool systemd-units \ -openssl openssl-devel python python-twisted-core python-zope-interface \ -python-six desktop-file-utils groff graphviz procps-ng libcap-ng \ -libcap-ng-devel PyQt4 selinux-policy-devel -./boot.sh -libtoolize --force -aclocal -autoheader -automake --force-missing --add-missing -autoconf -./configure -yum -y install rpmdevtools -# hack due to build pulling in kernel vxlan header -kernel_vxlan="/usr/src/kernels/$(rpm -q kernel | grep -Eo '[0-9].*x86_64')/include/net/vxlan.h" -sed -i '/struct vxlan_metadata {/a\ u32 gpe;' $kernel_vxlan -make rpm-fedora RPMBUILD_OPT="\"-D kversion `rpm -q kernel | rpmdev-sort | tail -n -1 | sed 's/^kernel-//'`\" --without check" -make rpm-fedora-kmod RPMBUILD_OPT="\"-D kversion `rpm -q kernel | rpmdev-sort | tail -n -1 | sed 's/^kernel-//'`\"" diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 6fdc32d6..cc335c82 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -152,34 +152,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \ # upload and install barometer packages barometer_pkgs overcloud-full_build.qcow2 - # Build OVS with NSH - rm -rf ovs_nsh_patches - rm -rf ovs - git clone https://github.com/yyang13/ovs_nsh_patches.git - git clone https://github.com/openvswitch/ovs.git - pushd ovs > /dev/null - git checkout v2.6.1 - cp ../ovs_nsh_patches/v2.6.1/*.patch ./ - cp ${BUILD_ROOT}/patches/ovs-fix-build-on-RHEL-7.3.patch ./ - # Hack for build servers that have no git config - git config user.email "apex@opnfv.com" - git config user.name "apex" - git am *.patch - popd > /dev/null - tar czf ovs.tar.gz ovs - - -LIBGUESTFS_BACKEND=direct virt-customize \ - --upload ${BUILD_ROOT}/CentOS-Updates.repo:/etc/yum.repos.d/ \ - --run-command "yum -y install kernel-devel-\$(rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel)" \ - --run-command "yum -y install kernel-headers-\$(rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel)" \ - --run-command "yum -y install kernel-tools-\$(rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel)" \ - --upload ${BUILD_ROOT}/build_ovs_nsh.sh:/root/ \ - --upload ovs.tar.gz:/root/ \ - --run-command "cd /root/ && tar xzf ovs.tar.gz" \ - --run-command "cd /root/ovs && /root/build_ovs_nsh.sh" \ - -a overcloud-full_build.qcow2 - fi # end x86_64 specific items mv -f overcloud-full_build.qcow2 overcloud-full.qcow2 |