summaryrefslogtreecommitdiff
path: root/extra/config
diff options
context:
space:
mode:
Diffstat (limited to 'extra/config')
-rw-r--r--extra/config/README.uClibc2
-rwxr-xr-xextra/config/conf-header.sh27
-rw-r--r--extra/config/confdata.c2
-rw-r--r--extra/config/kconfig-to-uclibc.patch2
4 files changed, 3 insertions, 30 deletions
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 <<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
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();