Messages in this thread Patch in this message | | | Date | Sat, 23 Jun 2007 17:14:57 -0700 (PDT) | From | Trent Piepho <> | Subject | Re: [patch] 2.6.22-rc Kconfig troubles when using menuconfig |
| |
On Sat, 23 Jun 2007, Mauro Carvalho Chehab wrote: > Your patch seems OK to me, providing that we also add the Andreas patch:
>--- a/drivers/net/Kconfig >+++ b/drivers/net/Kconfig >menuconfig NETDEV_1000 >- bool "Ethernet (1000 Mbit)" >+ tristate "Ethernet (1000 Mbit)" > depends on !UML >- default y > > menuconfig NETDEV_10000 >- bool "Ethernet (10000 Mbit)" >+ tristate "Ethernet (10000 Mbit)" > depends on !UML >- default y
I don't think this part is necessary. The only thing NETDEV_1000[0] depend on is UML, which is a boolean.
Here is an alternate patch for this issue. I fix it by adding the dependencies of the menuconfig to the "if / endif" block the menuconfig controls. That way the menu doesn't turn into a tristate, which doesn't make a lot of sense. How can the menu be compiled as a module, when there is no code associated with it?
------------------------------------------------------------------ Fix Kconfig dependency problems wrt boolean menuconfigs
If one has a dependency chain (tristate)FOO depends on (bool)BAR depends on (tristate)BAZ, build problems will result. If BAZ=m, then BAR can be set y, which allows FOO=y. It's possible to have FOO=y && BAZ=m, which wouldn't be allowed if FOO depended directly on BAZ. In effect, the bool promotes the tristate from m to y.
This ends up causing a problem with several menuconfigs that look like:
menuconfig BAR bool depends on BAZ [tristate] if BAR config FOO tristate endif
The solution used here is to add the dependencies of BAR to the if statement, so that items in the if block will gain a direct non-bool-promoted dependency on BAZ. This is how it would work if a menu was used instead of an if block.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
diff -r dfbe7cc4e21e drivers/atm/Kconfig --- a/drivers/atm/Kconfig Thu Jun 21 16:02:50 2007 -0700 +++ b/drivers/atm/Kconfig Sat Jun 23 16:41:05 2007 -0700 @@ -7,7 +7,7 @@ menuconfig ATM_DRIVERS depends on NETDEVICES && ATM default y
-if ATM_DRIVERS +if ATM_DRIVERS && NETDEVICES && ATM
config ATM_DUMMY tristate "Dummy ATM driver" diff -r dfbe7cc4e21e drivers/media/dvb/Kconfig --- a/drivers/media/dvb/Kconfig Thu Jun 21 16:02:50 2007 -0700 +++ b/drivers/media/dvb/Kconfig Sat Jun 23 16:42:28 2007 -0700 @@ -11,7 +11,7 @@ menuconfig DVB_CAPTURE_DRIVERS ---help--- Say Y to select Digital TV adapters
-if DVB_CAPTURE_DRIVERS +if DVB_CAPTURE_DRIVERS && DVB_CORE
comment "Supported SAA7146 based PCI Adapters" depends on DVB_CORE && PCI && I2C diff -r dfbe7cc4e21e drivers/media/radio/Kconfig --- a/drivers/media/radio/Kconfig Thu Jun 21 16:02:50 2007 -0700 +++ b/drivers/media/radio/Kconfig Sat Jun 23 16:42:44 2007 -0700 @@ -9,7 +9,7 @@ menuconfig RADIO_ADAPTERS ---help--- Say Y here to enable selecting AM/FM radio adapters.
-if RADIO_ADAPTERS +if RADIO_ADAPTERS && VIDEO_DEV
config RADIO_CADET tristate "ADS Cadet AM/FM Tuner" diff -r dfbe7cc4e21e drivers/media/video/Kconfig --- a/drivers/media/video/Kconfig Thu Jun 21 16:02:50 2007 -0700 +++ b/drivers/media/video/Kconfig Sat Jun 23 17:10:17 2007 -0700 @@ -11,7 +11,7 @@ menuconfig VIDEO_CAPTURE_DRIVERS webcams, analog TV, and hybrid analog/digital TV. Some of those devices also supports FM radio.
-if VIDEO_CAPTURE_DRIVERS +if VIDEO_CAPTURE_DRIVERS && VIDEO_DEV
config VIDEO_ADV_DEBUG bool "Enable advanced debug functionality" @@ -347,7 +347,7 @@ endmenu # encoder / decoder chips
config VIDEO_VIVI tristate "Virtual Video Driver" - depends on VIDEO_V4L2 && !SPARC32 && !SPARC64 && PCI && VIDEO_DEV + depends on VIDEO_V4L2 && !SPARC32 && !SPARC64 && PCI select VIDEO_BUF default n ---help--- @@ -691,7 +691,7 @@ menuconfig V4L_USB_DRIVERS depends on USB default y
-if V4L_USB_DRIVERS +if V4L_USB_DRIVERS && USB
source "drivers/media/video/pvrusb2/Kconfig"
diff -r dfbe7cc4e21e drivers/net/pcmcia/Kconfig --- a/drivers/net/pcmcia/Kconfig Thu Jun 21 16:02:50 2007 -0700 +++ b/drivers/net/pcmcia/Kconfig Sat Jun 23 16:45:44 2007 -0700 @@ -19,7 +19,7 @@ menuconfig NET_PCMCIA
If unsure, say N.
-if NET_PCMCIA +if NET_PCMCIA && PCMCIA
config PCMCIA_3C589 tristate "3Com 3c589 PCMCIA support" - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |