diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-09-05 13:51:57 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-09-05 12:09:33 +0000 |
| commit | 957a16139281785c2a6685428f7b037d6578f08d (patch) | |
| tree | 61babc1151e3461ab1fb092c4702daa4d86af8a8 /patches/opnfv-fuel/0040-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch | |
| parent | 0ce564a34593b5c6ca80727c7fd32d6f62ad040e (diff) | |
Upstream: move patches to repo-patches dir
Upstream change: [1]
Slight rebase of our patches is now needed.
[1] https://gerrit.opnfv.org/gerrit/#/c/20043/
Change-Id: I955ae3c5c304d8c8da6e42680c81e9255487fb68
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0040-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch')
| -rw-r--r-- | patches/opnfv-fuel/0040-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/patches/opnfv-fuel/0040-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch b/patches/opnfv-fuel/0040-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch index 675b9815..5dde448f 100644 --- a/patches/opnfv-fuel/0040-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch +++ b/patches/opnfv-fuel/0040-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch @@ -8,26 +8,15 @@ Backported from [1]. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - build/Makefile | 1 + ...ce-dpkg-checkbuilddeps-with-mk-build-deps.patch | 38 ++++++++++++++++++++++ - 2 files changed, 39 insertions(+) + 1 files changed, 38 insertions(+) create mode 100644 build/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch -diff --git a/build/Makefile b/build/Makefile -index d917f26..ec5d27a 100644 ---- a/build/Makefile -+++ b/build/Makefile -@@ -140,4 +140,5 @@ $(ISOCACHE): - cd /tmp/fuel-main && git am $(TOPDIR)/repo-multi-arch-local-mirrors.patch -+ cd /tmp/fuel-main && git am $(TOPDIR)/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch - # Repeat build up to three times - sudo -E ./fuel_build_loop - cp /tmp/fuel-main/build/artifacts/fuel*.iso . -diff --git a/build/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch b/build/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch +diff --git a/build/patch-repos/0040-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch b/build/patch-repos/0040-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch new file mode 100644 index 0000000..896f3cf --- /dev/null -+++ b/build/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch ++++ b/build/patch-repos/0040-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch @@ -0,0 +1,38 @@ +From: Sergii Golovatiuk <sgolovatiuk@mirantis.com> +Date: Fri, 3 Jun 2016 12:26:19 +0200 |