diff options
author | Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-01-08 13:26:00 +0100 |
---|---|---|
committer | Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-01-17 12:10:12 +0100 |
commit | 8e599759ede512a773eccef59eb2824940307564 (patch) | |
tree | 645f1a95633dfa00ed4c64135cbc1ee7fe79519c /build/fuel-main_6.patch | |
parent | c14790e44122781b96b1b287f901c36645d7df7b (diff) |
Fuel 8 uplift
Introducing Fuel 8 with associated changes:
Improvements in usage of cgroups - they are now bind mounted from
the host which solved a Docker-in-Docker problem.
The cache tool (cache.mk) has a new argument "getbiweek" which is
used by the top Makefile when building the Fuel ISO. This makes sure
that there's a fresh build every second week even if the cache is not
purged automatically based on its meta data. This is something we
should add everywhere (in a separate change set).
And obviously, Fuel is now building from stable/8.0 upstream.
NOTE! f_repobuild has been disabled for now, it throws an error
when run. Will be fixed separately.
Change-Id: I7e2ee737fd3bedc75f58539fbc3c5fd1fa08cfa1
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Diffstat (limited to 'build/fuel-main_6.patch')
-rw-r--r-- | build/fuel-main_6.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/build/fuel-main_6.patch b/build/fuel-main_6.patch deleted file mode 100644 index 2659e2d17..000000000 --- a/build/fuel-main_6.patch +++ /dev/null @@ -1,30 +0,0 @@ -*** prepare-build-env.sh.orig Mon Oct 19 13:28:30 2015 ---- prepare-build-env.sh Mon Oct 19 13:29:10 2015 -*************** -*** 87,92 **** ---- 87,93 ---- - 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 -*************** -*** 102,108 **** - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9 - # Install docker - sudo apt-get update -! sudo apt-get -y install lxc-docker-1.5.0 - fi - - # Install software ---- 103,110 ---- - 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.5.0 - fi - - # Install software |