From 2ffd05357ccee120c5a0d9875079fe9df3e9d146 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 25 Nov 2015 02:28:37 +0100
Subject: [PATCH] build: ensure the feeds are updated when modules or site
 modules change

---
 Makefile | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index a1c2e7e64..387b38065 100644
--- a/Makefile
+++ b/Makefile
@@ -177,6 +177,9 @@ GLUON_$(1)_MODEL_$(2)_ALIASES += $(3)
 endef
 
 
+export SHA512SUM := $(GLUONDIR)/scripts/sha512sum.sh
+
+
 prereq: FORCE
 	+$(NO_TRACE_MAKE) prereq
 
@@ -209,7 +212,12 @@ gluon-tools: FORCE
 	+$(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
 	for dir in build_dir dl staging_dir; do \
@@ -222,7 +230,7 @@ prepare-early: FORCE
 	mkdir -p $$(dirname $(early_prepared_stamp))
 	touch $(early_prepared_stamp)
 
-$(early_prepared_stamp):
+$(early_prepared_stamp): $(GLUONDIR)/modules $(wildcard $(GLUON_SITEDIR)/modules)
 	+$(GLUONMAKE_EARLY) prepare-early
 
 $(GLUON_OPKG_KEY): $(early_prepared_stamp) FORCE
@@ -304,9 +312,6 @@ clean: FORCE
 	rm -f $(gluon_prepared_stamp)
 
 
-export SHA512SUM := $(GLUONDIR)/scripts/sha512sum.sh
-
-
 download: FORCE
 	+$(SUBMAKE) tools/download
 	+$(SUBMAKE) toolchain/download
-- 
GitLab