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>

diff --git a/patches/opnfv-fuel/0036-repo-mirror-Allow-multi-arch-local-mirrors.patch b/patches/opnfv-fuel/0036-repo-mirror-Allow-multi-arch-local-mirrors.patch
index 0316e42..d48e9f0 100644 (file)
--- a/patches/opnfv-fuel/0036-repo-mirror-Allow-multi-arch-local-mirrors.patch
+++ b/patches/opnfv-fuel/0036-repo-mirror-Allow-multi-arch-local-mirrors.patch
@@ -27,9 +27,9 @@ index 2d33aa4..0490bab 100644
 --- a/build/Makefile
 +++ b/build/Makefile
 @@ -139,6 +139,7 @@ $(ISOCACHE):
-       cd /tmp/fuel-main && git config user.email "fuel@opnfv.org"
        cd /tmp/fuel-main && git am $(TOPDIR)/bootstrap_admin_node.sh.patch
        cd /tmp/fuel-main && git am $(TOPDIR)/isolinux.cfg.patch
+       cd /tmp/fuel-main/build/repos/fuel-nailgun && git am $(TOPDIR)/Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch
 +      cd /tmp/fuel-main && git am $(TOPDIR)/repo-multi-arch-local-mirrors.patch
        # Repeat build up to three times
        sudo -E ./fuel_build_loop

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 9d4a242..675b981 100644 (file)
--- 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