diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-08-04 11:36:39 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-08-04 11:38:36 +0200 |
| commit | d25f79d1cacc298d58e2abf185e17551d1192acc (patch) | |
| tree | 8adf0b3e1bf9d2c1aa6002c1044ad7b37b2895ef /patches/opnfv-fuel/0040-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch | |
| parent | 38af865df6bb03eb350dfa4651616d224d6d1716 (diff) | |
Rebase: adapt patches after ovs/dpdk fix
Upstream change [1] requires us to to adapt our Fuel@OPNFV patches.
[1] https://gerrit.opnfv.org/gerrit/#/c/17969/
Change-Id: I9823469df575cc929e399a6025aca6066a16e98d
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 | 4 |
1 files changed, 1 insertions, 3 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 9d4a2424..675b9815 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 @@ -17,9 +17,7 @@ diff --git a/build/Makefile b/build/Makefile index d917f26..ec5d27a 100644 --- a/build/Makefile +++ b/build/Makefile -@@ -140,6 +140,7 @@ $(ISOCACHE): - cd /tmp/fuel-main && git am $(TOPDIR)/bootstrap_admin_node.sh.patch - cd /tmp/fuel-main && git am $(TOPDIR)/isolinux.cfg.patch +@@ -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 |