aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--Makefile24
2 files changed, 22 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 751b1d07..b7d93b2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
build.log
+config.mk
diff --git a/Makefile b/Makefile
index 922b72ea..df14ef68 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,18 @@
root:=$(shell pwd)
+include config.mk
all: build
+config.mk: submodules-init
+ @ln -s -f ${root}/upstream/fuel/build/config.mk ${root}/config.mk
+
.PHONY: submodules-init submodules-clean
submodules-init:
- @git submodule -q init
- @git submodule -q sync
- @git submodule update --remote
+ @if [ ! -d ${root}/upstream/fuel/build ]; then \
+ git submodule -q init; \
+ git submodule -q sync; \
+ git submodule update --remote; \
+ fi
# Cleans any changes made to submodules
submodules-clean:
@@ -28,6 +34,18 @@ patches-export:
# apply patches from patches/* to respective submodules
patches-import:
+ @cd ${root}/upstream/fuel-agent && \
+ git checkout -q ${FUEL_AGENT_COMMIT}
+ @cd ${root}/upstream/fuel-astute && \
+ git checkout -q ${ASTUTE_COMMIT}
+ @cd ${root}/upstream/fuel-library && \
+ git checkout -q ${FUELLIB_COMMIT}
+ @cd ${root}/upstream/fuel-mirror && \
+ git checkout -q ${FUEL_MIRROR_COMMIT}
+ @cd ${root}/upstream/fuel-nailgun-agent && \
+ git checkout -q ${FUEL_NAILGUN_AGENT_COMMIT}
+ @cd ${root}/upstream/fuel-web && \
+ git checkout -q ${NAILGUN_COMMIT}
@git submodule -q foreach 'mkdir -p ${root}/patches/$$name'
@git submodule -q foreach 'git tag armband-workbench-root'
@git submodule -q foreach 'git checkout -q -b armband-workbench'