Kernel headers trouble

Bernhard Fischer rep.nop at aon.at
Tue Dec 6 21:32:01 UTC 2005 

On Tue, Dec 06, 2005 at 03:49:11PM +0100, Tito wrote:

>CONFIG_TR conflicts with kernel headers
>
>/usr/src/kernel-headers/include/linux/autoconf.h:1482:#define CONFIG_TR 1
> /usr/src/kernel-headers/include/config/tr.h:1:#define CONFIG_TR 1
>
>CONFIG_WATCHDOG conflicts with kernel headers
>
>/usr/src/kernel-headers/include/linux/autoconf.h:1975:#define CONFIG_WATCHDOG 1 
>/usr/src/kernel-headers/include/config/watchdog.h:1:#define CONFIG_WATCHDOG 1

>So it seems a good idea to change CONFIG_TR and CONFIG_WATCHDOG to CONFIG_BB_*
>before the next release.
>Rob, if you want I can try to make a patch for it

Would something like the attached work for you (untested)


- switch from CONFIG_ to BB_CONFIG to avoid kconfig namespace pollution
  with the kernel.
-------------- next part --------------
diff -X /home/cow/src/excl -ruNp bb.en.oorig/coreutils/Config.in bb.en/coreutils/Config.in
--- bb.en.oorig/coreutils/Config.in	2005-10-09 20:30:45.000000000 +0200
+++ bb.en/coreutils/Config.in	2005-12-06 22:18:33.000000000 +0100
@@ -540,7 +540,7 @@ config CONFIG_TOUCH
 	  touch is used to create or change the access and/or
 	  modification timestamp of specified files.
 
-config CONFIG_TR
+config BB_CONFIG_TR
 	bool "tr"
 	default n
 	help
diff -X /home/cow/src/excl -ruNp bb.en.oorig/coreutils/Makefile.in bb.en/coreutils/Makefile.in
--- bb.en.oorig/coreutils/Makefile.in	2005-09-24 11:25:33.000000000 +0200
+++ bb.en/coreutils/Makefile.in	2005-12-06 22:18:33.000000000 +0100
@@ -67,7 +67,7 @@ COREUTILS-$(CONFIG_TAIL)      += tail.o
 COREUTILS-$(CONFIG_TEE)       += tee.o
 COREUTILS-$(CONFIG_TEST)      += test.o
 COREUTILS-$(CONFIG_TOUCH)     += touch.o
-COREUTILS-$(CONFIG_TR)        += tr.o
+COREUTILS-$(BB_CONFIG_TR)        += tr.o
 COREUTILS-$(CONFIG_TRUE)      += true.o
 COREUTILS-$(CONFIG_TTY)       += tty.o
 COREUTILS-$(CONFIG_UNAME)     += uname.o
diff -X /home/cow/src/excl -ruNp bb.en.oorig/debian/config-deb bb.en/debian/config-deb
--- bb.en.oorig/debian/config-deb	2005-09-20 22:30:07.000000000 +0200
+++ bb.en/debian/config-deb	2005-12-06 22:18:33.000000000 +0100
@@ -125,7 +125,7 @@ CONFIG_FEATURE_FANCY_TAIL=y
 # CONFIG_TEE is not set
 CONFIG_TEST=y
 CONFIG_TOUCH=y
-CONFIG_TR=y
+BB_CONFIG_TR=y
 CONFIG_TRUE=y
 CONFIG_TTY=y
 CONFIG_UNAME=y
@@ -249,7 +249,7 @@ CONFIG_REBOOT=y
 # CONFIG_MT is not set
 # CONFIG_STRINGS is not set
 # CONFIG_TIME is not set
-# CONFIG_WATCHDOG is not set
+# BB_CONFIG_WATCHDOG is not set
 
 #
 # Linux Module Utilities
diff -X /home/cow/src/excl -ruNp bb.en.oorig/debian/config-floppy-udeb-linux bb.en/debian/config-floppy-udeb-linux
--- bb.en.oorig/debian/config-floppy-udeb-linux	2005-09-20 22:30:07.000000000 +0200
+++ bb.en/debian/config-floppy-udeb-linux	2005-12-06 22:18:33.000000000 +0100
@@ -107,7 +107,7 @@ CONFIG_TEST=y
 # test (forced enabled for use with shell)
 #
 # CONFIG_TOUCH is not set
-# CONFIG_TR is not set
+# BB_CONFIG_TR is not set
 # CONFIG_TRUE is not set
 # CONFIG_TTY is not set
 # CONFIG_UNAME is not set
@@ -213,7 +213,7 @@ CONFIG_USE_BB_PWD_GRP=y
 # CONFIG_MT is not set
 # CONFIG_STRINGS is not set
 # CONFIG_TIME is not set
-# CONFIG_WATCHDOG is not set
+# BB_CONFIG_WATCHDOG is not set
 
 #
 # Linux Module Utilities
diff -X /home/cow/src/excl -ruNp bb.en.oorig/debian/config-static bb.en/debian/config-static
--- bb.en.oorig/debian/config-static	2005-09-20 22:30:07.000000000 +0200
+++ bb.en/debian/config-static	2005-12-06 22:18:33.000000000 +0100
@@ -140,7 +140,7 @@ CONFIG_TEST=y
 # test (forced enabled for use with shell)
 #
 CONFIG_TOUCH=y
-CONFIG_TR=y
+BB_CONFIG_TR=y
 CONFIG_TRUE=y
 CONFIG_TTY=y
 CONFIG_UNAME=y
@@ -287,7 +287,7 @@ CONFIG_MAKEDEVS=y
 CONFIG_MT=y
 CONFIG_STRINGS=y
 CONFIG_TIME=y
-CONFIG_WATCHDOG=y
+BB_CONFIG_WATCHDOG=y
 
 #
 # Linux Module Utilities
diff -X /home/cow/src/excl -ruNp bb.en.oorig/debian/config-udeb bb.en/debian/config-udeb
--- bb.en.oorig/debian/config-udeb	2005-09-20 22:30:07.000000000 +0200
+++ bb.en/debian/config-udeb	2005-12-06 22:18:33.000000000 +0100
@@ -128,7 +128,7 @@ CONFIG_TEST=y
 # test (forced enabled for use with shell)
 #
 CONFIG_TOUCH=y
-CONFIG_TR=y
+BB_CONFIG_TR=y
 CONFIG_TRUE=y
 # CONFIG_TTY is not set
 CONFIG_UNAME=y
@@ -252,7 +252,7 @@ CONFIG_USE_BB_PWD_GRP=y
 # CONFIG_MT is not set
 # CONFIG_STRINGS is not set
 # CONFIG_TIME is not set
-# CONFIG_WATCHDOG is not set
+# BB_CONFIG_WATCHDOG is not set
 
 #
 # Linux Module Utilities
diff -X /home/cow/src/excl -ruNp bb.en.oorig/debian/config-udeb-linux bb.en/debian/config-udeb-linux
--- bb.en.oorig/debian/config-udeb-linux	2005-09-20 22:30:07.000000000 +0200
+++ bb.en/debian/config-udeb-linux	2005-12-06 22:18:33.000000000 +0100
@@ -128,7 +128,7 @@ CONFIG_TEST=y
 # test (forced enabled for use with shell)
 #
 CONFIG_TOUCH=y
-CONFIG_TR=y
+BB_CONFIG_TR=y
 CONFIG_TRUE=y
 # CONFIG_TTY is not set
 CONFIG_UNAME=y
@@ -252,7 +252,7 @@ CONFIG_USE_BB_PWD_GRP=y
 # CONFIG_MT is not set
 # CONFIG_STRINGS is not set
 # CONFIG_TIME is not set
-# CONFIG_WATCHDOG is not set
+# BB_CONFIG_WATCHDOG is not set
 
 #
 # Linux Module Utilities
diff -X /home/cow/src/excl -ruNp bb.en.oorig/include/applets.h bb.en/include/applets.h
--- bb.en.oorig/include/applets.h	2005-10-29 13:07:35.000000000 +0200
+++ bb.en/include/applets.h	2005-12-06 22:20:16.000000000 +0100
@@ -637,7 +637,7 @@
 #ifdef CONFIG_SYNC
 	APPLET(sync, sync_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
-#ifdef CONFIG_BB_SYSCTL
+#ifdef BB_CONFIG_SYSCTL
 	APPLET(sysctl, sysctl_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_SYSLOGD
@@ -673,7 +673,7 @@
 #ifdef CONFIG_TOUCH
 	APPLET(touch, touch_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
-#ifdef CONFIG_TR
+#ifdef BB_CONFIG_TR
 	APPLET(tr, tr_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_TRACEROUTE
@@ -736,7 +736,7 @@
 #ifdef CONFIG_WATCH
 	APPLET(watch, watch_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
-#ifdef CONFIG_WATCHDOG
+#ifdef BB_CONFIG_WATCHDOG
 	APPLET(watchdog, watchdog_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_WC
diff -X /home/cow/src/excl -ruNp bb.en.oorig/miscutils/Config.in bb.en/miscutils/Config.in
--- bb.en.oorig/miscutils/Config.in	2005-10-29 13:07:35.000000000 +0200
+++ bb.en/miscutils/Config.in	2005-12-06 22:18:33.000000000 +0100
@@ -291,7 +291,7 @@ config CONFIG_TIME
 	  When the command finishes, time writes a message to standard output
 	  giving timing statistics about this program run.
 
-config CONFIG_WATCHDOG
+config BB_CONFIG_WATCHDOG
 	bool "watchdog"
 	default n
 	help
diff -X /home/cow/src/excl -ruNp bb.en.oorig/miscutils/Makefile.in bb.en/miscutils/Makefile.in
--- bb.en.oorig/miscutils/Makefile.in	2005-10-29 13:07:35.000000000 +0200
+++ bb.en/miscutils/Makefile.in	2005-12-06 22:18:33.000000000 +0100
@@ -29,7 +29,7 @@ MISCUTILS-$(CONFIG_RX)          += rx.o
 MISCUTILS-$(CONFIG_SETSID)      += setsid.o
 MISCUTILS-$(CONFIG_STRINGS)     += strings.o
 MISCUTILS-$(CONFIG_TIME)        += time.o
-MISCUTILS-$(CONFIG_WATCHDOG)    += watchdog.o
+MISCUTILS-$(BB_CONFIG_WATCHDOG)    += watchdog.o
 
 libraries-y+=$(MISCUTILS_DIR)$(MISCUTILS_AR)
 
diff -X /home/cow/src/excl -ruNp bb.en.oorig/procps/Config.in bb.en/procps/Config.in
--- bb.en.oorig/procps/Config.in	2005-10-28 19:35:16.000000000 +0200
+++ bb.en/procps/Config.in	2005-12-06 22:20:39.000000000 +0100
@@ -83,7 +83,7 @@ config CONFIG_RENICE
 	  Renice alters the scheduling priority of one or more running
 	  processes.
 
-config CONFIG_BB_SYSCTL
+config BB_CONFIG_SYSCTL
 	bool "sysctl"
 	default n
 	help
diff -X /home/cow/src/excl -ruNp bb.en.oorig/procps/Makefile.in bb.en/procps/Makefile.in
--- bb.en.oorig/procps/Makefile.in	2005-10-28 19:35:16.000000000 +0200
+++ bb.en/procps/Makefile.in	2005-12-06 22:20:28.000000000 +0100
@@ -16,7 +16,7 @@ PROCPS-$(CONFIG_KILL)		+= kill.o
 PROCPS-$(CONFIG_PIDOF)		+= pidof.o
 PROCPS-$(CONFIG_PS)		+= ps.o
 PROCPS-$(CONFIG_RENICE)		+= renice.o
-PROCPS-$(CONFIG_BB_SYSCTL)	+= sysctl.o
+PROCPS-$(BB_CONFIG_SYSCTL)	+= sysctl.o
 PROCPS-$(CONFIG_TOP)		+= top.o
 PROCPS-$(CONFIG_UPTIME)		+= uptime.o
 PROCPS-$(CONFIG_FUSER)		+= fuser.o
diff -X /home/cow/src/excl -ruNp bb.en.oorig/sysdeps/linux/defconfig bb.en/sysdeps/linux/defconfig
--- bb.en.oorig/sysdeps/linux/defconfig	2005-10-09 20:30:46.000000000 +0200
+++ bb.en/sysdeps/linux/defconfig	2005-12-06 22:20:53.000000000 +0100
@@ -134,7 +134,7 @@ CONFIG_TEST=y
 # test (forced enabled for use with shell)
 #
 CONFIG_TOUCH=y
-CONFIG_TR=y
+BB_CONFIG_TR=y
 CONFIG_TRUE=y
 CONFIG_TTY=y
 CONFIG_UNAME=y
@@ -267,7 +267,7 @@ CONFIG_REBOOT=y
 # CONFIG_RX is not set
 CONFIG_STRINGS=y
 CONFIG_TIME=y
-# CONFIG_WATCHDOG is not set
+# BB_CONFIG_WATCHDOG is not set
 
 #
 # Linux Module Utilities
@@ -334,7 +334,7 @@ CONFIG_PS=y
 # CONFIG_RENICE is not set
 # CONFIG_TOP is not set
 CONFIG_UPTIME=y
-# CONFIG_BB_SYSCTL is not set
+# BB_CONFIG_SYSCTL is not set
 
 #
 # Another Bourne-like Shell

More information about the busybox mailing list