diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-18 01:09:27 +0200 |
|---|---|---|
| committer |   Michal Skalski <mskalski@mirantis.com> | 2016-08-02 09:56:47 +0000 |
| commit | 5bfea5d5b88a167b754384f07453a80d416d7337 (patch) | |
| tree | 9e762e5a8e734d1c3462440e9b2cb8903ebc637a /build/fuel-main_docker_version.patch | |
| parent | 7a02094add80d97be77754c3c404e9d1c1a769c6 (diff) | |
build: fuel-main: Decouple patches, Makefile.
Tested in armband, with very small adaptions.
Use `git apply` and/or `git am` in favor of `patch`.
Change patches from old context format to unified diff.
This change allows us to decouple Makefile and patches.
This means we no longer have to manually stage touched files
before committing them to git.
Possible improvements:
- move patches to separate dir and add ordering info (prefix);
- merge patches (currently we have one per touched file);
Remove obsolete (unused?) patch:
- fuel-main_docker_version.patch
Change-Id: I5b621370993b259779c813b47105f632948e6da7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'build/fuel-main_docker_version.patch')
| -rw-r--r-- | build/fuel-main_docker_version.patch | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/build/fuel-main_docker_version.patch b/build/fuel-main_docker_version.patch deleted file mode 100644 index 22b58249b..000000000 --- a/build/fuel-main_docker_version.patch +++ /dev/null @@ -1,20 +0,0 @@ -*** prepare-build-env.sh.orig 2016-01-11 14:55:50.615286910 +0100 ---- prepare-build-env.sh 2016-01-11 14:59:44.775308422 +0100 -*************** -*** 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 ---- 102,109 ---- - 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=\"--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 - - # Install software |