diff options
| author |   Jonas Bjurel <jonas.bjurel@ericsson.com> | 2015-08-12 21:17:09 +0200 |
|---|---|---|
| committer | Jonas Bjurel <jonas.bjurel@ericsson.com> | 2015-08-12 23:34:48 +0200 |
| commit | 82b3389ae1907b04c1d57a8ce87708726b00277a (patch) | |
| tree | 303c9e04718fd4981c1d076858383d06c93bbcf4 /fuel/build/fuel-main_3.patch | |
| parent | 1a9d2532a3cf8bf01fbe829d38bc8988d43aca44 (diff) | |
Needed rebase after fuel dev-ops changes
Patch needed after updated fuel devops repo key change
Reference: https://github.com/stackforge/fuel-main/commit/82e77c7f476a23220f44b74c7f32fc04a7189a4e#diff-9d30c16c74e663e5cdb1dc7d9189ed2d
Patch needed after updated fuel devops python package versions
Reference: https://github.com/stackforge/fuel-main/commit/a765460d3fd69089e3b4d2b3a6b55e28e6fb53eb
Rebased site.pp
Change-Id: I138b383b0d57091a81f98acae3b6e7af6a189632
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Diffstat (limited to 'fuel/build/fuel-main_3.patch')
| -rw-r--r-- | fuel/build/fuel-main_3.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/fuel/build/fuel-main_3.patch b/fuel/build/fuel-main_3.patch new file mode 100644 index 0000000..b61c063 --- /dev/null +++ b/fuel/build/fuel-main_3.patch @@ -0,0 +1,11 @@ +--- prepare-build-env.sh.orig 2015-08-11 22:12:19.750626481 +0200 ++++ prepare-build-env.sh 2015-08-11 22:43:42.308300848 +0200 +@@ -43,7 +43,7 @@ + trusty) + GEMPKG="ruby ruby-dev" + # we need multistrap version 2.1.6, let's install it from devops mirror +- sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys D5A05778 ++ sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 1D2B45A2 + echo "deb http://mirror.fuel-infra.org/devops/ubuntu/ ./" | sudo tee /etc/apt/sources.list.d/fuel-devops.list + # be sure, that we will not update multistrap in future + sudo tee /etc/apt/preferences.d/fuel-pin-300 <<EOF |