From fda5ae2e55e009d395ab9eadbea1785f6cff9776 Mon Sep 17 00:00:00 2001
From: egon0 <ms@resonar.de>
Date: Tue, 1 Nov 2011 23:51:44 +0100
Subject: generate persistent .config


diff --git a/Makefile b/Makefile
index 3f42c94..0394d80 100644
--- a/Makefile
+++ b/Makefile
@@ -14,17 +14,32 @@ update/%: openwrt/%/.repo_access
 	cd $< && $(MAKE) package/symlinks
 	touch $</.repo_access
 
-# format image/($repo)/openwrt-$(platform)-$(model).bin
+# format config/($repo)-$(platform)-$(model).config
+.SECONDEXPANSION:
+config/%.config: REPO=$(shell echo $(@F) | cut -f1 -d-)
+config/%.config: PLATFORM=$(shell echo $(@F) | cut -f2 -d- | cut -f1 -d.)
+config/%.config: MODEL=$(shell echo $(@F) | cut -f3- -d- | cut -f1 -d.)
+config/%.config: $$(shell find config -iname '$$(REPO).config') \
+			     $$(shell find config -iname '$$(REPO)-$$(PLATFORM).patch') \
+				 $$(shell find config -iname '$$(REPO)-$$(PLATFORM)-$$(MODEL).patch')
+	cp config/$(REPO).config $@~
+	if [ -n "$(MODEL)" ]; then 	\
+		patch $@~ <config/$(REPO)-$(PLATFORM).patch; \
+		patch $@~ <config/$(REPO)-$(PLATFORM)-$(MODEL).patch; \
+	else \
+		patch $@~ <config/$(REPO)-$(PLATFORM).patch; \
+	fi
+	mv $@~ $@
+
+# format image/($repo)/openwrt-$(platform)-$(model)
 .SECONDEXPANSION:
 image/%: REPO=$(shell basename $(@D))
 image/%: PLATFORM=$(shell echo $(@F) | cut -f2 -d-)
 image/%: MODEL=$(shell echo $(@F) | cut -f3- -d-)
-image/%: openwrt/$$(REPO)/.repo_access config/$$(REPO).config \
-             config/$$(REPO)-$$(PLATFORM).patch config/$$(REPO)-$$(PLATFORM)-$$(MODEL).patch
+image/%: config/$$(REPO)-$$(PLATFORM)-$$(MODEL).config \
+			 openwrt/$$(REPO)/.repo_access 
 	@echo === Building $(REPO), $(PLATFORM), $(MODEL) ===
-	cp config/$(REPO).config openwrt/$(REPO)/.config
-	patch openwrt/$(REPO)/.config <config/$(REPO)-$(PLATFORM).patch 
-	patch openwrt/$(REPO)/.config <config/$(REPO)-$(PLATFORM)-$(MODEL).patch
+	cp $< openwrt/$(REPO)/.config
 	-rm -r openwrt/$(REPO)/files openwrt/$(REPO)/bin/$(PLATFORM)
 	cp -a files/common openwrt/$(REPO)/files
 	rsync -a files/$(PLATFORM)/ openwrt/$(REPO)/files/
-- 
cgit v0.10.1