diff options
| -rw-r--r-- | build/Makefile | 1 | ||||
| -rw-r--r-- | build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile | 9 | ||||
| -rw-r--r-- | build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk | 5 | ||||
| -rw-r--r-- | build/fuel-main_docker_dns.patch | 18 |
4 files changed, 27 insertions, 6 deletions
diff --git a/build/Makefile b/build/Makefile index 542269617..d58f3ad76 100644 --- a/build/Makefile +++ b/build/Makefile @@ -94,6 +94,7 @@ $(ISOCACHE): # Need to replace the old Docker v. 1.5.0 with a later version to be # able to access the Docker remote repository! cd /tmp/fuel-main && patch -p0 < $(TOPDIR)/fuel-main_docker_version.patch + cd /tmp/fuel-main && patch -p0 < $(TOPDIR)/fuel-main_docker_dns.patch # cd /tmp/fuel-main && ./prepare-build-env.sh cd /tmp/fuel-main && make repos diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile index 6b76fbe50..70fd22409 100644 --- a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile +++ b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile @@ -37,15 +37,16 @@ release:.ovsnfvbuild @rm -rf fuel-plugin-ovsnfv sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev sudo pip install fuel-plugin-builder - git clone $(OVSNFV_DPDK_REPO) - cd fuel-plugin-ovsnfv; \ + git clone $(OVSNFV_DPDK_REPO) ovsnfv + cd ovsnfv; \ git checkout $(OVSNFV_DPDK_BRANCH); \ if [ ! -z $(OVSNFV_DPDK_CHANGE) ]; then \ git fetch $(OVSNFV_DPDK_REPO) $(OVSNFV_DPDK_CHANGE); \ git checkout FETCH_HEAD; \ fi - INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin-ovsnfv/ - @mv fuel-plugin-ovsnfv/fuel-plugin-ovsnfv*.rpm . + cd ovsnfv; \ + INCLUDE_DEPENDENCIES=true fpb --debug --build $(OVSNFV_DPDK_DIR) + @mv ovsnfv/$(OVSNFV_DPDK_DIR)/fuel-plugin-ovsnfv*.rpm . $(REPOINFO) -r . > gitinfo_ovsnfv-dpdk-plugin.txt @rm -rf fuel-plugin-ovsnfv @touch .ovsnfvbuild diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk index cfaa4f723..1893fce4a 100644 --- a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk +++ b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk @@ -7,6 +7,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -OVSNFV_DPDK_BRANCH=d13417a93c4df1d4db8f86f23ae4d42a056b5de8 -OVSNFV_DPDK_REPO=https://github.com/mrmarkgray/fuel-plugin-ovsnfv +OVSNFV_DPDK_BRANCH=stable/brahmaputra +OVSNFV_DPDK_REPO=https://gerrit.opnfv.org/gerrit/p/ovsnfv.git +OVSNFV_DPDK_DIR=fuel-plugin-ovsnfv OVSNFV_DPDK_CHANGE= diff --git a/build/fuel-main_docker_dns.patch b/build/fuel-main_docker_dns.patch new file mode 100644 index 000000000..4b2377e47 --- /dev/null +++ b/build/fuel-main_docker_dns.patch @@ -0,0 +1,18 @@ +--- prepare-build-env.sh.orig 2016-01-06 08:11:29.749933262 +0000 ++++ prepare-build-env.sh 2016-01-06 08:11:41.785790127 +0000 +@@ -87,7 +87,6 @@ + echo "Docker is running." + else + echo "Process is not running, starting it..." +- sudo sh -c 'echo DOCKER_OPTS=\"--dns 8.8.8.8 --dns 8.8.4.4 --bip 172.45.0.1/24\" >> /etc/default/docker*' + sudo service docker start + fi + else +@@ -103,7 +102,6 @@ + sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9 + # Install docker + sudo apt-get update +- sudo sh -c 'echo DOCKER_OPTS=\"--dns 8.8.8.8 --dns 8.8.4.4 --bip 172.45.0.1/24\" > /etc/default/docker' + sudo apt-get -y -o Dpkg::Options::="--force-confold" install lxc-docker-1.7.1 + fi + |