Merge "docs: Copy OPNFV docs dir as documentation base"

[armband.git] / patches / opnfv-fuel / upstream-backports / 0002-build-docker-Use-older-ffi-1.9.14.patch

diff --git a/patches/opnfv-fuel/upstream-backports/0002-build-docker-Use-older-ffi-1.9.14.patch b/patches/opnfv-fuel/upstream-backports/0002-build-docker-Use-older-ffi-1.9.14.patch
index ccc37cb..f87e853 100644 (file)
--- a/patches/opnfv-fuel/upstream-backports/0002-build-docker-Use-older-ffi-1.9.14.patch
+++ b/patches/opnfv-fuel/upstream-backports/0002-build-docker-Use-older-ffi-1.9.14.patch
@@ -1,3 +1,11 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2017 Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 Date: Fri, 13 Jan 2017 18:40:08 +0100
 Subject: [PATCH] build/docker: Use older ffi (1.9.14)
@@ -28,5 +36,5 @@ index 04c4d2b..54aca35 100644
 +# FIXME(armband): Newer ffi is broken - https://jira.opnfv.org/browse/ARMBAND-191
 +RUN gem install ffi -v 1.9.14
  RUN gem install fpm
-
- # Temporary: fpb needs to be built from sources
+ RUN pip install git+https://github.com/openstack/fuel-plugins
+ # fuel-infra key