diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2009-09-26 21:23:53 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2009-09-26 21:23:53 +0000 |
| commit | f8688b5d9016c8b0dfe20ae9af3a1f3f70983b04 (patch) | |
| tree | ae65eb0cfd084ca35fccc38b9da0397d6ffbcf53 /package | |
| parent | bedbad16bcca1d5b05bba71f146cd3582e05cf0e (diff) | |
| download | upstream-f8688b5d9016c8b0dfe20ae9af3a1f3f70983b04.tar.gz upstream-f8688b5d9016c8b0dfe20ae9af3a1f3f70983b04.tar.bz2 upstream-f8688b5d9016c8b0dfe20ae9af3a1f3f70983b04.zip | |
small fixes mostly for kernel 2.6.31
- libsas needs symbols from scsi_transport_sas
- autoload line in pppoe was missing
- rfkill-input does not exist in kernel 2.6.31
- password for download server of r8101 changed
- r8101 and siit do not build with kernel 2.6.31
- fix build of net sched esfq
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17752 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/kernel/modules/block.mk | 7 | ||||
| -rw-r--r-- | package/kernel/modules/netsupport.mk | 1 | ||||
| -rw-r--r-- | package/kernel/modules/other.mk | 6 | ||||
| -rw-r--r-- | package/r8101/Makefile | 4 | ||||
| -rw-r--r-- | package/siit/Makefile | 1 |
5 files changed, 15 insertions, 4 deletions
diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index 09450bf29f..908b9d6159 100644 --- a/package/kernel/modules/block.mk +++ b/package/kernel/modules/block.mk @@ -417,11 +417,14 @@ define KernelPackage/libsas TITLE:=SAS Domain Transport Attributes DEPENDS:=+kmod-scsi-core @TARGET_x86 KCONFIG:=CONFIG_SCSI_SAS_LIBSAS \ + CONFIG_SCSI_SAS_ATTRS \ CONFIG_SCSI_SAS_ATA=y \ CONFIG_SCSI_SAS_HOST_SMP=y \ CONFIG_SCSI_SAS_LIBSAS_DEBUG=y - FILES:=$(LINUX_DIR)/drivers/scsi/libsas/libsas.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,29,libsas) + FILES:= \ + $(LINUX_DIR)/drivers/scsi/scsi_transport_sas.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/scsi/libsas/libsas.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,29,scsi_transport_sas libsas) endef define KernelPackage/libsas/description diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index 35caad2353..78d77f0b14 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -445,6 +445,7 @@ define KernelPackage/pppoe FILES:= \ $(LINUX_DIR)/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/net/pppox.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,40,pppox pppoe) endef define KernelPackage/pppoe/description diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 3844068b79..1b8e533cdc 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -784,10 +784,16 @@ define KernelPackage/rfkill CONFIG_RFKILL \ CONFIG_RFKILL_INPUT \ CONFIG_RFKILL_LEDS=y +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.31)),1) + FILES:= \ + $(LINUX_DIR)/net/rfkill/rfkill.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,20,rfkill) +else FILES:= \ $(LINUX_DIR)/net/rfkill/rfkill.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/net/rfkill/rfkill-input.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,20,rfkill rfkill-input) +endif endef define KernelPackage/rfkill/description diff --git a/package/r8101/Makefile b/package/r8101/Makefile index e800e8ecc9..370a9aebf0 100644 --- a/package/r8101/Makefile +++ b/package/r8101/Makefile @@ -13,7 +13,7 @@ PKG_VERSION:=1.012.00 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=ftp://WebUser:DAx7h9V@202.65.194.212/cn/nic/ +PKG_SOURCE_URL:=ftp://WebUser:nQJ4P7b@202.65.194.212/cn/nic/ PKG_MD5SUM:=eb0645af023926f3ab8d0d40f68748ef include $(INCLUDE_DIR)/package.mk @@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/r8101 SUBMENU:=Network Devices TITLE:=RealTek RTL-8101E PCIe Fast Ethernet Adapter kernel support - DEPENDS:=@TARGET_x86 + DEPENDS:=@TARGET_x86 @!LINUX_2_6_31 URL:=http://www.realtek.com.tw/ FILES:= $(PKG_BUILD_DIR)/src/r8101.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,r8101) diff --git a/package/siit/Makefile b/package/siit/Makefile index affe89f104..f73e9584e5 100644 --- a/package/siit/Makefile +++ b/package/siit/Makefile @@ -16,6 +16,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/siit SUBMENU:=Network Devices TITLE:=Stateless IP ICMP Translation Algorithm + DEPENDS:=@!LINUX_2_6_31 FILES:=$(PKG_BUILD_DIR)/siit.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,siit) endef |