diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-10-28 15:18:31 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-10-28 13:23:43 +0000 |
| commit | 4ffa88c69d8e0f1980153af5556c01fdd7eee0c4 (patch) | |
| tree | 193c632347d5d08ba8d3e1e9679a4106c82d104e /patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch | |
| parent | 4c4c87b441e003572dfec3b95f5c4bcdb428d237 (diff) | |
build: Rebase after cirros bump / GPG addition
Slightly edit patch context to match upstream changes [1, 2].
[1] https://gerrit.opnfv.org/gerrit/#/c/22559/
[2] https://gerrit.opnfv.org/gerrit/#/c/21823/
Change-Id: Ibdb3b557f3e482f74d345a1e0e1eedda26879179
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch')
| -rw-r--r-- | patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch b/patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch index 35bef5c8..6fc8bdbe 100644 --- a/patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch +++ b/patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch @@ -30,10 +30,10 @@ index 624f233..ab0d0d3 100644 + (git fetch origin INSERT_FPB_CHANGE && git checkout FETCH_HEAD)) && \ + python setup.py sdist && pip install ./dist/fuel-plugin-builder-*.tar.gz && \ + cd .. && rm -rf fuel-plugins + # fuel-infra key + RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BCE5CC461FA22B08 RUN echo "ALL ALL=NOPASSWD: ALL" > /etc/sudoers.d/open-sudo - RUN echo "Defaults env_keep += \"ftp_proxy http_proxy https_proxy no_proxy RSYNC_PROXY RSYNC_CONNECT_PROG npm_config_registry\"" > /etc/sudoers.d/keep-proxies -diff --git a/build/docker/Makefile b/build/docker/Makefile index 783881e..74f6346 100644 --- a/build/docker/Makefile +++ b/build/docker/Makefile |