fix KCONFIG in packages: move back all KCONFIG from package variants to the main package since we don't know the kernel version at dump time. keep old KCONFIG lines commented out, so we can switch back easily later.

SVN-Revision: 8721
2007-09-09 20:37:50 +00:00 · 2007-09-09 20:37:50 +00:00 · 7e4038434b
commit 7e4038434b
parent 94f23cf0da
5 changed files with 103 additions and 49 deletions
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@ -5,6 +5,7 @@ define KernelPackage/ide-core
  TITLE:=Kernel support for IDE
  KCONFIG:= \
 	CONFIG_IDE \
+	CONFIG_IDE_GENERIC \
 	CONFIG_BLK_DEV_IDE \
 	CONFIG_IDE_GENERIC \
 	CONFIG_BLK_DEV_IDEDISK
@ -20,6 +21,7 @@ define KernelPackage/ide-core/2.4
 endef

 define KernelPackage/ide-core/2.6
+#  KCONFIG+=CONFIG_IDE_GENERIC
  FILES+=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD+=$(call AutoLoad,30,ide-generic)
 endef
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@ -182,13 +182,15 @@ $(eval $(call KernelPackage,fs-nfs))
 define KernelPackage/fs-nfsd
  SUBMENU:=$(FSMENU)
  TITLE:=NFS kernel server support
-  KCONFIG:=CONFIG_NFSD
+  KCONFIG:= \
+	CONFIG_NFSD \
+	CONFIG_EXPORTFS
  FILES:=$(LINUX_DIR)/fs/nfsd/nfsd.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,40,nfsd)
 endef

 define KernelPackage/fs-nfsd/2.6
-  KCONFIG+=CONFIG_EXPORTFS
+#  KCONFIG+=CONFIG_EXPORTFS
  FILES+=$(LINUX_DIR)/fs/exportfs/exportfs.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD+=$(call AutoLoad,30,exportfs)
 endef
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@ -62,13 +62,15 @@ $(eval $(call KernelPackage,bonding))
 define KernelPackage/ipip
  SUBMENU:=$(NSMENU)
  TITLE:=IP in IP encapsulation support
-  KCONFIG:=CONFIG_NET_IPIP
+  KCONFIG:= \
+	CONFIG_NET_IPIP \
+	CONFIG_INET_TUNNEL
  FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,30,ipip)
 endef

 define KernelPackage/ipip/2.6
-  KCONFIG+=CONFIG_INET_TUNNEL
+#  KCONFIG+=CONFIG_INET_TUNNEL
  FILES+=$(LINUX_DIR)/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD+=$(call AutoLoad,31,tunnel4)
 endef
@ -159,13 +161,15 @@ $(eval $(call KernelPackage,ipsec6))
 define KernelPackage/ipv6
  SUBMENU:=$(NSMENU)
  TITLE:=IPv6 support
-  KCONFIG:=CONFIG_IPV6
+  KCONFIG:= \
+	CONFIG_IPV6 \
+  	CONFIG_IPV6_SIT
  FILES:=$(LINUX_DIR)/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,20,ipv6)
 endef

 define KernelPackage/ipv6/2.6
-  KCONFIG+=CONFIG_IPV6_SIT
+#  KCONFIG+=CONFIG_IPV6_SIT
  FILES+=$(LINUX_DIR)/net/ipv6/sit.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD+=$(call AutoLoad,21,sit)
 endef
@ -211,7 +215,9 @@ define KernelPackage/ppp
  TITLE:=PPP modules
  KCONFIG:= \
 	CONFIG_PPP \
-	CONFIG_PPP_ASYNC
+	CONFIG_PPP_ASYNC \
+	CONFIG_SLHC \
+	CONFIG_CRC_CCITT
  FILES:= \
 	$(LINUX_DIR)/drivers/net/ppp_async.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/net/ppp_generic.$(LINUX_KMOD_SUFFIX) \
@ -223,9 +229,9 @@ define KernelPackage/ppp/2.4
 endef

 define KernelPackage/ppp/2.6
-  KCONFIG+= \
-	CONFIG_SLHC \
-	CONFIG_CRC_CCITT
+#  KCONFIG+= \
+#	CONFIG_SLHC \
+#	CONFIG_CRC_CCITT
  FILES+= \
 	$(LINUX_DIR)/lib/crc-ccitt.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,30,crc-ccitt slhc ppp_generic ppp_async)
@ -291,16 +297,19 @@ define KernelPackage/mppe
  SUBMENU:=$(NSMENU)
  TITLE:=Microsoft PPP compression/encryption
  DEPENDS:=kmod-ppp
+  KCONFIG:= \
+	CONFIG_PPP_MPPE_MPPC \
+	CONFIG_PPP_MPPE
 endef

 define KernelPackage/mppe/2.4
-  KCONFIG:=CONFIG_PPP_MPPE_MPPC
+#  KCONFIG:=CONFIG_PPP_MPPE_MPPC
  FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe_mppc.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,31,ppp_mppe_mppc)
 endef

 define KernelPackage/mppe/2.6
-  KCONFIG:=CONFIG_PPP_MPPE
+#  KCONFIG:=CONFIG_PPP_MPPE
  FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,31,ppp_mppe)
 endef
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@ -89,7 +89,14 @@ $(eval $(call KernelPackage,lp))
 define KernelPackage/soundcore
  SUBMENU:=$(EMENU)
  TITLE:=Sound support
-  KCONFIG:=CONFIG_SOUND
+  KCONFIG:= \
+	CONFIG_SOUND \
+	CONFIG_SND \
+	CONFIG_SND_HWDEP \
+	CONFIG_SND_RAWMIDI \
+	CONFIG_SND_TIMER \
+	CONFIG_SND_PCM \
+	CONFIG_HOSTAUDIO
 endef

 define KernelPackage/soundcore/2.4
@ -98,12 +105,12 @@ define KernelPackage/soundcore/2.4
 endef

 define KernelPackage/soundcore/2.6
-  KCONFIG+= \
-	CONFIG_SND \
-	CONFIG_SND_HWDEP \
-	CONFIG_SND_RAWMIDI \
-	CONFIG_SND_TIMER \
-	CONFIG_SND_PCM
+#  KCONFIG+= \
+#	CONFIG_SND \
+#	CONFIG_SND_HWDEP \
+#	CONFIG_SND_RAWMIDI \
+#	CONFIG_SND_TIMER \
+#	CONFIG_SND_PCM
  FILES:= \
 	$(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/sound/core/snd.$(LINUX_KMOD_SUFFIX) \
@ -128,8 +135,8 @@ define KernelPackage/soundcore/2.6
 endef

 define KernelPackage/soundcore/uml-2.6
-  KCONFIG+= \
-	CONFIG_HOSTAUDIO
+#  KCONFIG+= \
+#	CONFIG_HOSTAUDIO
  FILES:= \
 	$(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/arch/um/drivers/hostaudio.$(LINUX_KMOD_SUFFIX)
@ -198,12 +205,19 @@ define KernelPackage/pcmcia-core
  SUBMENU:=$(EMENU)
  TITLE:=PCMCIA/CardBus support
  DEPENDS:=@PCMCIA_SUPPORT
-endef
-
-define KernelPackage/pcmcia-core/2.4
  KCONFIG:= \
 	CONFIG_PCMCIA \
 	CONFIG_CARDBUS
+	CONFIG_PCCARD \
+	CONFIG_YENTA \
+	CONFIG_PCCARD_NONSTATIC \
+	PCMCIA_DEBUG=n
+endef
+
+define KernelPackage/pcmcia-core/2.4
+#  KCONFIG:= \
+#	CONFIG_PCMCIA \
+#	CONFIG_CARDBUS
  FILES:= \
 	$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX) \
@ -212,12 +226,12 @@ define KernelPackage/pcmcia-core/2.4
 endef

 define KernelPackage/pcmcia-core/2.6
-  KCONFIG:= \
-	CONFIG_PCCARD \
-	CONFIG_PCMCIA \
-	CONFIG_YENTA \
-	CONFIG_PCCARD_NONSTATIC \
-	PCMCIA_DEBUG=n
+#  KCONFIG:= \
+#	CONFIG_PCCARD \
+#	CONFIG_PCMCIA \
+#	CONFIG_YENTA \
+#	CONFIG_PCCARD_NONSTATIC \
+#	PCMCIA_DEBUG=n
  FILES:= \
 	$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX) \
@ -246,16 +260,19 @@ define KernelPackage/pcmcia-serial
  SUBMENU:=$(EMENU)
  TITLE:=Serial devices support
  DEPENDS:=kmod-pcmcia-core
+  KCONFIG:= \
+	CONFIG_PCMCIA_SERIAL_CS \
+  	CONFIG_SERIAL_8250_CS
  AUTOLOAD:=$(call AutoLoad,45,serial_cs)
 endef

 define KernelPackage/pcmcia-serial/2.4
-  KCONFIG:=CONFIG_PCMCIA_SERIAL_CS
+#  KCONFIG:=CONFIG_PCMCIA_SERIAL_CS
  FILES:=$(LINUX_DIR)/drivers/char/pcmcia/serial_cs.$(LINUX_KMOD_SUFFIX)
 endef

 define KernelPackage/pcmcia-serial/2.6
-  KCONFIG:=CONFIG_SERIAL_8250_CS
+#  KCONFIG:=CONFIG_SERIAL_8250_CS
  FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.$(LINUX_KMOD_SUFFIX)
 endef

@ -270,9 +287,6 @@ define KernelPackage/bluetooth
  SUBMENU:=$(EMENU)
  TITLE:=Bluetooth support
  DEPENDS:=@USB_SUPPORT
-endef
-
-define KernelPackage/bluetooth/2.4
  KCONFIG:= \
 	CONFIG_BLUEZ \
 	CONFIG_BLUEZ_L2CAP \
@ -281,6 +295,24 @@ define KernelPackage/bluetooth/2.4
 	CONFIG_BLUEZ_BNEP \
 	CONFIG_BLUEZ_HCIUART \
 	CONFIG_BLUEZ_HCIUSB
+	CONFIG_BT \
+	CONFIG_BT_L2CAP \
+	CONFIG_BT_SCO \
+	CONFIG_BT_RFCOMM \
+	CONFIG_BT_BNEP \
+	CONFIG_BT_HCIUSB \
+	CONFIG_BT_HCIUART
+endef
+
+define KernelPackage/bluetooth/2.4
+#  KCONFIG:= \
+#	CONFIG_BLUEZ \
+#	CONFIG_BLUEZ_L2CAP \
+#	CONFIG_BLUEZ_SCO \
+#	CONFIG_BLUEZ_RFCOMM \
+#	CONFIG_BLUEZ_BNEP \
+#	CONFIG_BLUEZ_HCIUART \
+#	CONFIG_BLUEZ_HCIUSB
  FILES:= \
 	$(LINUX_DIR)/net/bluetooth/bluez.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \
@ -293,14 +325,14 @@ define KernelPackage/bluetooth/2.4
 endef

 define KernelPackage/bluetooth/2.6
-  KCONFIG:= \
-	CONFIG_BT \
-	CONFIG_BT_L2CAP \
-	CONFIG_BT_SCO \
-	CONFIG_BT_RFCOMM \
-	CONFIG_BT_BNEP \
-	CONFIG_BT_HCIUSB \
-	CONFIG_BT_HCIUART
+#  KCONFIG:= \
+#	CONFIG_BT \
+#	CONFIG_BT_L2CAP \
+#	CONFIG_BT_SCO \
+#	CONFIG_BT_RFCOMM \
+#	CONFIG_BT_BNEP \
+#	CONFIG_BT_HCIUSB \
+#	CONFIG_BT_HCIUART
  FILES:= \
 	$(LINUX_DIR)/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@ -54,16 +54,19 @@ $(eval $(call KernelPackage,usb-core))
 define KernelPackage/usb-uhci
  $(call usbdep,)
  TITLE:=Support for UHCI controllers
+  KCONFIG:= \
+	CONFIG_USB_UHCI_ALT \
+	CONFIG_USB_UHCI_HCD
 endef

 define KernelPackage/usb-uhci/2.4
-  KCONFIG:=CONFIG_USB_UHCI_ALT
+#  KCONFIG:=CONFIG_USB_UHCI_ALT
  FILES:=$(LINUX_DIR)/drivers/usb/host/uhci.o
  AUTOLOAD:=$(call AutoLoad,50,uhci)
 endef

 define KernelPackage/usb-uhci/2.6
-  KCONFIG:=CONFIG_USB_UHCI_HCD
+#  KCONFIG:=CONFIG_USB_UHCI_HCD
  FILES:=$(LINUX_DIR)/drivers/usb/host/uhci-hcd.ko
  AUTOLOAD:=$(call AutoLoad,50,uhci-hcd)
 endef
@ -93,16 +96,19 @@ $(eval $(call KernelPackage,usb-uhci-iv))
 define KernelPackage/usb-ohci
  $(call usbdep,)
  TITLE:=Support for OHCI controllers
+  KCONFIG:= \
+	CONFIG_USB_OHCI \
+	CONFIG_USB_OHCI_HCD
 endef

 define KernelPackage/usb-ohci/2.4
-  KCONFIG:=CONFIG_USB_OHCI
+#  KCONFIG:=CONFIG_USB_OHCI
  FILES:=$(LINUX_DIR)/drivers/usb/host/usb-ohci.o
  AUTOLOAD:=$(call AutoLoad,50,usb-ohci)
 endef

 define KernelPackage/usb-ohci/2.6
-  KCONFIG:=CONFIG_USB_OHCI_HCD
+#  KCONFIG:=CONFIG_USB_OHCI_HCD
  FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko
  AUTOLOAD:=$(call AutoLoad,50,ohci-hcd)
 endef
@ -170,16 +176,19 @@ $(eval $(call KernelPackage,usb-acm))
 define KernelPackage/usb-audio
  $(call usbdep,+kmod-soundcore)
  TITLE:=Support for audio devices
+  KCONFIG:= \
+	CONFIG_USB_AUDIO
+	CONFIG_SND_USB_AUDIO
 endef

 define KernelPackage/usb-audio/2.4
-  KCONFIG:=CONFIG_USB_AUDIO
+#  KCONFIG:=CONFIG_USB_AUDIO
  FILES:=$(LINUX_DIR)/drivers/usb/audio.o
  AUTOLOAD:=$(call AutoLoad,60,audio)
 endef

 define KernelPackage/usb-audio/2.6
-  KCONFIG:=CONFIG_SND_USB_AUDIO
+#  KCONFIG:=CONFIG_SND_USB_AUDIO
  FILES:= \
 	$(LINUX_DIR)/sound/usb/snd-usb-lib.ko \
 	$(LINUX_DIR)/sound/usb/snd-usb-audio.ko