Skip to content
Snippets Groups Projects
Commit 2ffd0535 authored by Matthias Schiffer's avatar Matthias Schiffer
Browse files

build: ensure the feeds are updated when modules or site modules change

parent 7c12de72
No related branches found
No related tags found
No related merge requests found
...@@ -177,6 +177,9 @@ GLUON_$(1)_MODEL_$(2)_ALIASES += $(3) ...@@ -177,6 +177,9 @@ GLUON_$(1)_MODEL_$(2)_ALIASES += $(3)
endef endef
export SHA512SUM := $(GLUONDIR)/scripts/sha512sum.sh
prereq: FORCE prereq: FORCE
+$(NO_TRACE_MAKE) prereq +$(NO_TRACE_MAKE) prereq
...@@ -209,7 +212,12 @@ gluon-tools: FORCE ...@@ -209,7 +212,12 @@ gluon-tools: FORCE
+$(GLUONMAKE_EARLY) package/lua/host/install package/usign/host/install +$(GLUONMAKE_EARLY) package/lua/host/install package/usign/host/install
early_prepared_stamp := $(GLUON_BUILDDIR)/prepared
early_prepared_stamp := $(GLUON_BUILDDIR)/prepared_$(shell \
( \
$(SHA512SUM) $(GLUONDIR)/modules; \
[ ! -r $(GLUON_SITEDIR)/modules ] || $(SHA512SUM) $(GLUON_SITEDIR)/modules \
) | $(SHA512SUM) )
prepare-early: FORCE prepare-early: FORCE
for dir in build_dir dl staging_dir; do \ for dir in build_dir dl staging_dir; do \
...@@ -222,7 +230,7 @@ prepare-early: FORCE ...@@ -222,7 +230,7 @@ prepare-early: FORCE
mkdir -p $$(dirname $(early_prepared_stamp)) mkdir -p $$(dirname $(early_prepared_stamp))
touch $(early_prepared_stamp) touch $(early_prepared_stamp)
$(early_prepared_stamp): $(early_prepared_stamp): $(GLUONDIR)/modules $(wildcard $(GLUON_SITEDIR)/modules)
+$(GLUONMAKE_EARLY) prepare-early +$(GLUONMAKE_EARLY) prepare-early
$(GLUON_OPKG_KEY): $(early_prepared_stamp) FORCE $(GLUON_OPKG_KEY): $(early_prepared_stamp) FORCE
...@@ -304,9 +312,6 @@ clean: FORCE ...@@ -304,9 +312,6 @@ clean: FORCE
rm -f $(gluon_prepared_stamp) rm -f $(gluon_prepared_stamp)
export SHA512SUM := $(GLUONDIR)/scripts/sha512sum.sh
download: FORCE download: FORCE
+$(SUBMAKE) tools/download +$(SUBMAKE) tools/download
+$(SUBMAKE) toolchain/download +$(SUBMAKE) toolchain/download
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment