summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan K. Berg <stefan.k.berg@ericsson.com>2016-01-18 14:42:06 +0100
committerStefan Berg <stefan.k.berg@ericsson.com>2016-01-19 08:15:25 +0000
commit567c751216af815920caa7a495822aa902a3aa0a (patch)
tree5606b53ce3ed17b9b4cad1735054f30a54619639
parentbc8d77ae064f1e6ed910edaf37a0c27beed33026 (diff)
Revert "Fix build failure in fuel base & qemu"
This reverts commit 0a35e64026402a672af343427bf591142babb6be.
-rw-r--r--build/Makefile1
-rw-r--r--build/fuel-main_docker_dns.patch18
2 files changed, 0 insertions, 19 deletions
diff --git a/build/Makefile b/build/Makefile
index 6d252ce2b..84fddc3ae 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -92,7 +92,6 @@ $(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 -f -p0 < $(TOPDIR)/fuel-main_docker_version.patch
- # cd /tmp/fuel-main && patch -f -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/fuel-main_docker_dns.patch b/build/fuel-main_docker_dns.patch
deleted file mode 100644
index 4b2377e47..000000000
--- a/build/fuel-main_docker_dns.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
-