svn commit: trunk/uClibc: extra/config extra/scripts

[landley at uclibc.org]

Author: landley
Date: 2007-03-16 19:45:59 -0700 (Fri, 16 Mar 2007)
New Revision: 18129

Log:
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.


Added:
   trunk/uClibc/extra/scripts/conf-header.sh

Removed:
   trunk/uClibc/extra/config/conf-header.sh

Modified:
   trunk/uClibc/Makefile.in
   trunk/uClibc/extra/config/README.uClibc
   trunk/uClibc/extra/config/confdata.c
   trunk/uClibc/extra/config/kconfig-to-uclibc.patch


Changeset:
Modified: trunk/uClibc/Makefile.in
===================================================================
--- trunk/uClibc/Makefile.in	2007-03-16 23:36:58 UTC (rev 18128)
+++ trunk/uClibc/Makefile.in	2007-03-17 02:45:59 UTC (rev 18129)
@@ -39,7 +39,9 @@
 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
 # in order to generate the headers correctly :(.  That

Modified: trunk/uClibc/extra/config/README.uClibc
===================================================================
--- trunk/uClibc/extra/config/README.uClibc	2007-03-16 23:36:58 UTC (rev 18128)
+++ trunk/uClibc/extra/config/README.uClibc	2007-03-17 02:45:59 UTC (rev 18129)
@@ -6,7 +6,7 @@
 	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

Deleted: trunk/uClibc/extra/config/conf-header.sh
===================================================================
--- trunk/uClibc/extra/config/conf-header.sh	2007-03-16 23:36:58 UTC (rev 18128)
+++ trunk/uClibc/extra/config/conf-header.sh	2007-03-17 02:45:59 UTC (rev 18129)
@@ -1,27 +0,0 @@
-#!/bin/sh -e
-
-# Turn .config into a header file
-
-if [ -z "$1" ] ; then
-	echo "Usage: conf-header.sh <.config>"
-	exit 1
-fi
-
-cat <<EOF
-#if !defined __FEATURES_H && !defined __need_uClibc_config_h
-# error Never include <bits/uClibc_config.h> directly; use <features.h> instead
-#endif
-
-#define __UCLIBC_MAJOR__ ${MAJOR_VERSION}
-#define __UCLIBC_MINOR__ ${MINOR_VERSION}
-#define __UCLIBC_SUBLEVEL__ ${SUBLEVEL}
-EOF
-
-exec \
-sed \
-	-e '/^#$/d' \
-	-e '/^[^#]/s:^\([^=]*\)=\(.*\):#define __\1__ \2:' \
-	-e '/^#define /s: y$: 1:' \
-	-e '/^# .* is not set$/s:^# \(.*\) is not set$:#undef __\1__:' \
-	-e 's:^# \(.*\)$:/* \1 */:' \
-	$1

Modified: trunk/uClibc/extra/config/confdata.c
===================================================================
--- trunk/uClibc/extra/config/confdata.c	2007-03-16 23:36:58 UTC (rev 18128)
+++ trunk/uClibc/extra/config/confdata.c	2007-03-17 02:45:59 UTC (rev 18129)
@@ -649,7 +649,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();
 

Modified: trunk/uClibc/extra/config/kconfig-to-uclibc.patch
===================================================================
--- trunk/uClibc/extra/config/kconfig-to-uclibc.patch	2007-03-16 23:36:58 UTC (rev 18128)
+++ trunk/uClibc/extra/config/kconfig-to-uclibc.patch	2007-03-17 02:45:59 UTC (rev 18129)
@@ -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();
  

Copied: trunk/uClibc/extra/scripts/conf-header.sh (from rev 18126, trunk/uClibc/extra/config/conf-header.sh)
===================================================================
--- trunk/uClibc/extra/scripts/conf-header.sh	                        (rev 0)
+++ trunk/uClibc/extra/scripts/conf-header.sh	2007-03-17 02:45:59 UTC (rev 18129)
@@ -0,0 +1,27 @@
+#!/bin/sh -e
+
+# Turn .config into a header file
+
+if [ -z "$1" ] ; then
+	echo "Usage: conf-header.sh <.config>"
+	exit 1
+fi
+
+cat <<EOF
+#if !defined __FEATURES_H && !defined __need_uClibc_config_h
+# error Never include <bits/uClibc_config.h> directly; use <features.h> instead
+#endif
+
+#define __UCLIBC_MAJOR__ ${MAJOR_VERSION}
+#define __UCLIBC_MINOR__ ${MINOR_VERSION}
+#define __UCLIBC_SUBLEVEL__ ${SUBLEVEL}
+EOF
+
+exec \
+sed \
+	-e '/^#$/d' \
+	-e '/^[^#]/s:^\([^=]*\)=\(.*\):#define __\1__ \2:' \
+	-e '/^#define /s: y$: 1:' \
+	-e '/^# .* is not set$/s:^# \(.*\) is not set$:#undef __\1__:' \
+	-e 's:^# \(.*\)$:/* \1 */:' \
+	$1