diff options
| author |   Jonas Bjurel <jonas.bjurel@ericsson.com> | 2016-08-31 12:01:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-31 12:01:24 +0000 |
| commit | 6222031ed4e195fee85d6e3bdb5f34845fa061e9 (patch) | |
| tree | 652ddbf39f7fc65905429b98ad30f0e13f36e277 /build/Makefile | |
| parent | 7cff3184b3cefae5894eeef78bb3490818bc8141 (diff) | |
| parent | 1fb86af4e4dc665e3b443ed8c6cfcb43f365ae6a (diff) | |
Merge changes from topic 'multiarch-mirrors'
* changes:
build: cache: Consider UBUNTU_ARCH in .cacheid
repo mirror: Allow multi-arch local mirrors
Diffstat (limited to 'build/Makefile')
| -rw-r--r-- | build/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build/Makefile b/build/Makefile index b3905e364..fa708696e 100644 --- a/build/Makefile +++ b/build/Makefile @@ -135,6 +135,7 @@ $(ISOCACHE): 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 cp /tmp/fuel-main/build/artifacts/fuel*.iso . |