aboutsummaryrefslogtreecommitdiffstats
path: root/build/Makefile
diff options
context:
space:
mode:
authorMichal Skalski <mskalski@mirantis.com>2016-08-03 16:56:31 +0200
committerMichal Skalski <mskalski@mirantis.com>2016-08-03 20:18:07 +0200
commit4b70e5e584213e14937ed1ea53b55958c751c006 (patch)
treef31a5a3811ed646ebe6a2301bbf268976146b921 /build/Makefile
parent5bfea5d5b88a167b754384f07453a80d416d7337 (diff)
Allow to use Intel NICs for DPDK on Ericsson POD2
JIRA: FUEL-161 Change-Id: I009ba7e9587f3c47d8e609c96b0666394887929e Signed-off-by: Michal Skalski <mskalski@mirantis.com>
Diffstat (limited to 'build/Makefile')
-rw-r--r--build/Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/build/Makefile b/build/Makefile
index f49947b88..c4775a3da 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -105,9 +105,8 @@ include cache.mk
$(ISOCACHE):
# Clone Fuel to non-persistent location and build
- if [ ! -d /tmp/fuel-main ]; then \
- cd /tmp && git clone $(FUEL_MAIN_REPO); \
- fi
+ sudo rm -rf /tmp/fuel-main
+ cd /tmp && git clone $(FUEL_MAIN_REPO)
cd /tmp/fuel-main && git checkout $(FUEL_MAIN_TAG)
@echo "fuel" `git -C /tmp/fuel-main rev-parse HEAD` >> $(VERSION_FILE)
# Remove Docker optimizations, otherwise multistrap will fail during
@@ -133,10 +132,9 @@ $(ISOCACHE):
# OPNFV patches at Fuel build time
# Need to be commited in order for them to be considered by the Fuel
# build system
- cd /tmp/fuel-main && git config user.name "Fuel OPNFV"
- 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
# Repeat build up to three times
sudo -E ./fuel_build_loop
cp /tmp/fuel-main/build/artifacts/fuel*.iso .