Browse Source

Have Makefile.in call conf-header.sh instead of having kconfig call it
via system(). Also move it to extra/scripts since it's a uClibc
build script, not part of upstream kconfig. Adjust the "grabbing a new
kconfig snapshot" procedure accordingly.

Rob Landley 17 years ago
parent
commit
046781273e

+ 2 - 0
Makefile.in

@@ -39,6 +39,8 @@ include $(top_srcdir)libc/Makefile.in
 include/bits/uClibc_config.h: extra/config/conf .config
 	$(Q)$(INSTALL) -d $(dir $@)
 	$(Q)@$< -o $(top_srcdir)extra/Configs/Config.in
+	$(top_srcdir)extra/scripts/conf-header.sh .config > include/bits/uClibc_config.h
+
 
 # For the moment, we have to keep re-running this target
 # because the fix includes scripts rely on pre-processers

+ 1 - 1
extra/config/README.uClibc

@@ -6,7 +6,7 @@ To update:
 	cp /usr/src/linux/Documentation/kbuild/kconfig-language.txt .
 	mv Makefile Makefile.kconfig
 	patch -p1 < ../config/kconfig-to-uclibc.patch
-	cp ../config/conf-header.sh ../config/README.uClibc .
+	cp ../config/README.uClibc .
 	cd ..
 	rm -rf config
 	mv config.new config

+ 1 - 1
extra/config/confdata.c

@@ -649,7 +649,7 @@ int conf_write_autoconf(void)
 	time_t now;
 	int i, l;
 
-	return system("./extra/config/conf-header.sh .config > include/bits/uClibc_config.h");
+	return 0;
 
 	sym_clear_all_valid();
 

+ 1 - 1
extra/config/kconfig-to-uclibc.patch

@@ -172,7 +172,7 @@
  	time_t now;
  	int i, l;
  
-+	return system("./extra/config/conf-header.sh .config > include/bits/uClibc_config.h");
++	return 0;
 +
  	sym_clear_all_valid();
  

+ 0 - 0
extra/config/conf-header.sh → extra/scripts/conf-header.sh