diff options
| author |   Michal Skalski <mskalski@mirantis.com> | 2016-08-05 10:13:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-05 10:13:27 +0000 |
| commit | cf58d9d488fde91a5177ae01363844da8ec8441c (patch) | |
| tree | 60f35863935be9ff801338d14397aab3db08c4e2 /build/Makefile | |
| parent | f0463e6234cd27eaa2e0cd3ded0b035d89aa918c (diff) | |
| parent | 4b70e5e584213e14937ed1ea53b55958c751c006 (diff) | |
Merge "Allow to use Intel NICs for DPDK on Ericsson POD2"
Diffstat (limited to 'build/Makefile')
| -rw-r--r-- | build/Makefile | 8 |
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 . |