From 046781273ed3fe210aa6f22807622e955c225a8a Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Sat, 17 Mar 2007 02:45:59 +0000 Subject: 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. --- Makefile.in | 2 ++ extra/config/README.uClibc | 2 +- extra/config/conf-header.sh | 27 --------------------------- extra/config/confdata.c | 2 +- extra/config/kconfig-to-uclibc.patch | 2 +- extra/scripts/conf-header.sh | 27 +++++++++++++++++++++++++++ 6 files changed, 32 insertions(+), 30 deletions(-) delete mode 100755 extra/config/conf-header.sh create mode 100755 extra/scripts/conf-header.sh diff --git a/Makefile.in b/Makefile.in index a04e46256..f42a3927d 100644 --- a/Makefile.in +++ b/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 diff --git a/extra/config/README.uClibc b/extra/config/README.uClibc index a20d89963..a616b190b 100644 --- a/extra/config/README.uClibc +++ b/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 diff --git a/extra/config/conf-header.sh b/extra/config/conf-header.sh deleted file mode 100755 index 90dfa999a..000000000 --- a/extra/config/conf-header.sh +++ /dev/null @@ -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 < directly; use 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 diff --git a/extra/config/confdata.c b/extra/config/confdata.c index 0dbd14152..64af1ac82 100644 --- a/extra/config/confdata.c +++ b/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(); diff --git a/extra/config/kconfig-to-uclibc.patch b/extra/config/kconfig-to-uclibc.patch index 78921ec11..f8382882f 100644 --- a/extra/config/kconfig-to-uclibc.patch +++ b/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(); diff --git a/extra/scripts/conf-header.sh b/extra/scripts/conf-header.sh new file mode 100755 index 000000000..90dfa999a --- /dev/null +++ b/extra/scripts/conf-header.sh @@ -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 < directly; use 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 -- cgit v1.2.3