From 5d57dbaebac08368eb84f3ece9a3ce845d86bdfd Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 7 Mar 2009 18:28:39 +0000 Subject: [PATCH] turn some of the kernel dependencies the other way around to make it easier to support new kernel. SVN-Revision: 14783 --- package/kernel/modules/netdevices.mk | 2 +- package/libertas/Makefile | 2 +- package/mac80211/Makefile | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk index da2d599662ee..2d63f17ad1c1 100644 --- a/package/kernel/modules/netdevices.mk +++ b/package/kernel/modules/netdevices.mk @@ -273,7 +273,7 @@ define KernelPackage/tg3 TITLE:=Broadcom Tigon3 Gigabit Ethernet FILES:=$(LINUX_DIR)/drivers/net/tg3.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_TIGON3 - DEPENDS:=@LINUX_2_6 +LINUX_2_6_27||LINUX_2_6_28:kmod-libphy + DEPENDS:=@LINUX_2_6 +LINUX_2_6_27||LINUX_2_6_28||LINUX_2_6_29:kmod-libphy SUBMENU:=$(NETWORK_DEVICES_MENU) AUTOLOAD:=$(call AutoLoad,50,tg3) endef diff --git a/package/libertas/Makefile b/package/libertas/Makefile index 66a90c80e957..3171caf9c3df 100644 --- a/package/libertas/Makefile +++ b/package/libertas/Makefile @@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk # XXX: current version needs 'get_unaligned_le16' helper introduced in 2.6.26 define KernelPackage/libertas SUBMENU:=Other modules - DEPENDS:=+kmod-ieee80211 @LINUX_2_6_26 @LINUX_2_6_27 @LINUX_2_6_28 + DEPENDS:=+kmod-ieee80211 @LINUX_2_6 @!LINUX_2_6_21||!LINUX_2_6_23||!LINUX_2_6_24||!LINUX_2_6_25 TITLE:=Marvell 88W8015 Wireless Driver FILES:= \ $(PKG_BUILD_DIR)/libertas.$(LINUX_KMOD_SUFFIX) \ diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index a7945a03fab0..142cd1bc8975 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -10,19 +10,19 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mac80211 -ifneq ($(CONFIG_LINUX_2_6_27)$(CONFIG_LINUX_2_6_28),) +ifneq ($(CONFIG_LINUX_2_6_21)$(CONFIG_LINUX_2_6_23)$(CONFIG_LINUX_2_6_24)$(CONFIG_LINUX_2_6_25)$(CONFIG_LINUX_2_6_26),) + PKG_VERSION:=2008-08-06 + PKG_RELEASE:=2 + PKG_SOURCE_URL:=http://www.orbit-lab.org/kernel/compat-wireless-2.6/2008/08 + PKG_MD5SUM:=9563ceeed86bca0859ad5f010623277c + PATCH_DIR:=./patches-old +else PKG_VERSION:=2009-03-05 PKG_RELEASE:=1 PKG_SOURCE_URL:= \ http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/03 \ http://wireless.kernel.org/download/compat-wireless-2.6 PKG_MD5SUM:=3e96bcca2be64536e206e425f0f26cfd -else - PKG_VERSION:=2008-08-06 - PKG_RELEASE:=2 - PKG_SOURCE_URL:=http://www.orbit-lab.org/kernel/compat-wireless-2.6/2008/08 - PKG_MD5SUM:=9563ceeed86bca0859ad5f010623277c - PATCH_DIR:=./patches-old endif PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2 @@ -201,7 +201,7 @@ endef define KernelPackage/rt2800-pci $(call KernelPackage/rt2x00/Default) - DEPENDS+= +kmod-rt2x00-pci +kmod-crc-ccitt @LINUX_2_6_27||@LINUX_2_6_28 + DEPENDS+= +kmod-rt2x00-pci +kmod-crc-ccitt @!LINUX_2_6_21||!LINUX_2_6_23||!LINUX_2_6_24||!LINUX_2_6_25||!LINUX_2_6_26 TITLE+= (RT2860 PCI) FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800pci.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,27,rt2800pci) @@ -209,7 +209,7 @@ endef define KernelPackage/rt2800-usb $(call KernelPackage/rt2x00/Default) - DEPENDS+= +kmod-rt2x00-usb +kmod-crc-ccitt @LINUX_2_6_27||@LINUX_2_6_28 + DEPENDS+= +kmod-rt2x00-usb +kmod-crc-ccitt @!LINUX_2_6_21||!LINUX_2_6_23||!LINUX_2_6_24||!LINUX_2_6_25||!LINUX_2_6_26 TITLE+= (RT2870 USB) FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800usb.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,27,rt2800usb) @@ -250,7 +250,7 @@ define KernelPackage/ath9k $(call KernelPackage/mac80211/Default) TITLE:=Atheros 802.11n wireless cards support URL:=http://linuxwireless.org/en/users/Drivers/ath9k - DEPENDS+= @PCI_SUPPORT +kmod-mac80211 @LINUX_2_6_27||@LINUX_2_6_28 + DEPENDS+= @PCI_SUPPORT +kmod-mac80211 @!LINUX_2_6_21||!LINUX_2_6_23||!LINUX_2_6_24||!LINUX_2_6_25||!LINUX_2_6_26 FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath9k/ath9k.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,27,ath9k) endef @@ -347,7 +347,7 @@ define KernelPackage/b43-common $(call KernelPackage/mac80211/Default) TITLE:=Generic stuff for Broadcom wireless devices URL:=http://linuxwireless.org/en/users/Drivers/b43 - DEPENDS+= +kmod-mac80211 @TARGET_brcm47xx||@TARGET_brcm63xx @LINUX_2_6_25||@LINUX_2_6_26||@LINUX_2_6_27||@LINUX_2_6_28 + DEPENDS+= +kmod-mac80211 @TARGET_brcm47xx||@TARGET_brcm63xx @!LINUX_2_6_21||!LINUX_2_6_23||!LINUX_2_6_24 endef define KernelPackage/b43 -- 2.30.2