Changeset 4686fa6 in freewrt

Timestamp:

Dec 18, 2006, 8:01:30 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

f98018c

Parents:

1fe5e1e

Message:

implement splitting of .config into .cfg/* line by line
the files are only updated if their content changes, to
preserve mtime, except FWRT_HAVE_DOT_CONFIG which is magic

this will be used to forcefully rebuild packages during
an automatic build if their configuration options change

original idea by n0-1@, discussed on saturday

git-svn-id: ​svn://www.freewrt.org/branches/common-adk@1314 afb5a338-a214-0410-bd46-81f09a774fd1

Files:

• Config.in (modified) (4 diffs)
• GNUmakefile (modified) (2 diffs)
• mk/build.mk (modified) (3 diffs)
• mk/split-cfg.mk (added)
• scripts/split-cfg.sh (added)

Config.in

@@ +1 @@
+# $FreeWRT$
+#-
+# This file is part of the FreeWRT project. FreeWRT is copyrighted
+# material, please see the LICENCE file in the top-level directory
+# or at http://www.freewrt.org/licence for details.
+
 mainmenu "FreeWRT Configuration"
 
@@ -5 +11 @@
         default y
 
+# this line is magic; do not remove it
+# certain make rules depend on its existence
+# and the name FWRT_HAVE_DOT_CONFIG is hard-coded
 config FWRT_HAVE_DOT_CONFIG
         bool
@@ -16 +25 @@
 config FWRT_i386
         tristate
-        
+
 config FWRT_mips
         tristate
@@ -83 +92 @@
 
 config FWRT_WGET
-        string 
+        string
         default "wget --passive-ftp -nd"
 

GNUmakefile

@@ -10 +10 @@
 ifneq (${package},)
 subdir:=        package/${package}
+_subdir_dep:=   ${TOPDIR}/.cfg/FWRT_HAVE_DOT_CONFIG
 endif
 
@@ -15 +16 @@
 ${MAKECMDGOALS}: _subdir
 
-_subdir:
+_subdir: ${_subdir_dep}
         cd ${subdir} && TOPDIR=${TOPDIR} \
             ${TOPDIR}/lbin/gmake ${MAKEFLAGS} ${MAKECMDGOALS}
+
+include lbin/prereq.mk
+include mk/split-cfg.mk
 else
 include Makefile

mk/build.mk

@@ -20 +20 @@
 ifeq ($(strip $(FWRT_HAVE_DOT_CONFIG)),y)
 include $(TOPDIR)/rules.mk
+include mk/split-cfg.mk
 
 all: world
@@ -26 +27 @@
 .PHONY: all world clean cleandir distclean image_clean target_clean
 
-world: $(DL_DIR) $(BUILD_DIR)
+world: $(DL_DIR) $(BUILD_DIR) ${TOPDIR}/.cfg/FWRT_HAVE_DOT_CONFIG
         ${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
         $(MAKE) -f mk/build.mk tools/install toolchain/install target/compile package/compile root_clean package/install target/install package_index
@@ -39 +40 @@
         @mkdir -p $(BUILD_DIR)
 
-package/%:
+package/%: ${TOPDIR}/.cfg/FWRT_HAVE_DOT_CONFIG
         @$(TRACE) $@
         $(MAKE) -C package $(patsubst package/%,%,$@)
 
-target/%:
+target/%: ${TOPDIR}/.cfg/FWRT_HAVE_DOT_CONFIG
         @$(TRACE) $@
         $(MAKE) -C target $(patsubst target/%,%,$@)
 
-toolchain/%:
+toolchain/%: ${TOPDIR}/.cfg/FWRT_HAVE_DOT_CONFIG
         @$(TRACE) $@
         $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 
-tools/%:
+tools/%: ${TOPDIR}/.cfg/FWRT_HAVE_DOT_CONFIG
         @$(TRACE) $@
         $(MAKE) -C tools $(patsubst tools/%,%,$@)