summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--patches/opnfv-fuel/0036-repo-mirror-Allow-multi-arch-local-mirrors.patch2
-rw-r--r--patches/opnfv-fuel/0040-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch4
m---------upstream/fuel0
m---------upstream/vswitchperf0
m---------upstream/yardstick0
5 files changed, 2 insertions, 4 deletions
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 0316e42b..d48e9f07 100644
--- 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 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
diff --git a/upstream/fuel b/upstream/fuel
-Subproject f0463e6234cd27eaa2e0cd3ded0b035d89aa918
+Subproject cf58d9d488fde91a5177ae01363844da8ec8441
diff --git a/upstream/vswitchperf b/upstream/vswitchperf
-Subproject 40460b1fd291612cca316527c4366e83ae295ce
+Subproject 896f0fe61346916a560c01c0eae638894d653d7
diff --git a/upstream/yardstick b/upstream/yardstick
-Subproject 9d493a68b3df583a8875e22dbe58eaaa6151160
+Subproject e023a2ee7023588fda3e0d7cfebc693e4903beb