kernel: speed up building kernel packages by getting rid of unnecessary CompareKernel...
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 19 Aug 2010 12:49:56 +0000 (12:49 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 19 Aug 2010 12:49:56 +0000 (12:49 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22724 3c298f89-4303-0410-b956-a3cf2f4a3e73

package/kernel/modules/other.mk
package/kernel/modules/pcmcia.mk
package/kernel/modules/usb.mk

index f27e2ef..59ddde3 100644 (file)
@@ -552,7 +552,7 @@ define KernelPackage/rfkill
     CONFIG_RFKILL \
     CONFIG_RFKILL_INPUT=y \
     CONFIG_RFKILL_LEDS=y
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.31)),1)
+ifeq ($(CONFIG_LINUX_2_6_30),)
   FILES:= \
     $(LINUX_DIR)/net/rfkill/rfkill.ko
   AUTOLOAD:=$(call AutoLoad,20,rfkill)
index 9dee298..c7cc8f8 100644 (file)
@@ -54,7 +54,8 @@ define KernelPackage/pcmcia-yenta
   KCONFIG:= \
        CONFIG_PCCARD_NONSTATIC \
        CONFIG_YENTA
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.35)),1)
+# For Linux 2.6.35+
+ifneq ($(wildcard $(LINUX_DIR)/drivers/pcmcia/pcmcia_rsrc.ko),)
   FILES:= \
        $(LINUX_DIR)/drivers/pcmcia/pcmcia_rsrc.ko \
        $(LINUX_DIR)/drivers/pcmcia/yenta_socket.ko
index 7144833..45f69f6 100644 (file)
@@ -145,7 +145,8 @@ define KernelPackage/usb-audio
        CONFIG_SND_USB_AUDIO
   $(call AddDepends/usb)
   $(call AddDepends/sound)
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.35)),1)
+# For Linux 2.6.35+
+ifneq ($(wildcard $(LINUX_DIR)/sound/usb/snd-usbmidi-lib.ko),)
   FILES:= \
        $(LINUX_DIR)/sound/usb/snd-usbmidi-lib.ko \
        $(LINUX_DIR)/sound/usb/snd-usb-audio.ko