From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 23 Apr 2012 16:10:25 +0000 (+0000)
Subject: ensure that profile Makefiles are sourced in alphabetical order Since make 3.82 does... 
X-Git-Tag: reboot~14168
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=42c190ead8b626d4d74ff99b95fc08f361aaf5ee;p=oweals%2Fopenwrt.git

ensure that profile Makefiles are sourced in alphabetical order Since make 3.82 does not guarantee file ordering anymore, target profiles might get included in random order, leading to bad default values when only selecting the toplevel target and populating the .config with defconfig. This commit should also fix the ar71xx snapshot builds.

SVN-Revision: 31449
---

diff --git a/include/target.mk b/include/target.mk
index 097b275cf2..e5166fb784 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -84,12 +84,12 @@ endif
 
 ifneq ($(PLATFORM_DIR),$(PLATFORM_SUBDIR))
   define IncludeProfiles
-    -include $(PLATFORM_DIR)/profiles/*.mk
-    -include $(PLATFORM_SUBDIR)/profiles/*.mk
+    -include $(sort $(wildcard $(PLATFORM_DIR)/profiles/*.mk))
+    -include $(sort $(wildcard $(PLATFORM_SUBDIR)/profiles/*.mk))
   endef
 else
   define IncludeProfiles
-    -include $(PLATFORM_DIR)/profiles/*.mk
+    -include $(sort $(wildcard $(PLATFORM_DIR)/profiles/*.mk))
   endef
 endif