diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2015-10-07 11:17:10 +0200 |
|---|---|---|
| committer | Stefan K. Berg <stefan.k.berg@ericsson.com> | 2015-11-18 13:42:40 +0100 |
| commit | 4a6b1e8352731902fb9596176a510f4e24d7e965 (patch) | |
| tree | f945a647c9c084282bcd63d2c40ad8e836cec92e /fuel/build/fuel-main_3.patch | |
| parent | 27c12b01000ddaa12a57b3383c717fac65417db4 (diff) | |
EXPERIMENTAL; DO NOT MERGE! Fuel 7.0 rebase
This is work in progress, do not merge but feel free to experiment
with this commit changeset as a base.
Change-Id: Ifbe1db9c892a94e64abbcfaaf1c98abce0c03dd4
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Conflicts:
fuel/build/config.mk
Diffstat (limited to 'fuel/build/fuel-main_3.patch')
| -rw-r--r-- | fuel/build/fuel-main_3.patch | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/fuel/build/fuel-main_3.patch b/fuel/build/fuel-main_3.patch deleted file mode 100644 index 8341d72d6..000000000 --- a/fuel/build/fuel-main_3.patch +++ /dev/null @@ -1,19 +0,0 @@ -*** prepare-build-env.sh.orig Tue Sep 8 08:47:46 2015 ---- prepare-build-env.sh Tue Sep 8 08:48:22 2015 -*************** -*** 41,47 **** - - trusty) - GEMPKG="ruby ruby-dev" -! sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys D5A05778 - echo "deb http://mirror.fuel-infra.org/devops/ubuntu/ ./" | sudo tee /etc/apt/sources.list.d/fuel-devops.list - sudo apt-get update && sudo apt-get -y install nodejs nodejs-legacy npm - ;; ---- 41,47 ---- - - trusty) - GEMPKG="ruby ruby-dev" -! 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 - sudo apt-get update && sudo apt-get -y install nodejs nodejs-legacy npm - ;; |