KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

port more modules over to the new system

Browse source 
SVN-Revision: 5220
This commit is contained in:
Felix Fietkau 2006-10-19 02:05:17 +00:00
parent 144572780b
commit d2e30add61
5 changed files with 185 additions and 250 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
include/modules-2.4.mk
View file

@ -6,55 +6,6 @@
# #
include $(INCLUDE_DIR)/netfilter.mk include $(INCLUDE_DIR)/netfilter.mk
# Block devices
$(eval $(call KMOD_template,LOOP,loop,\
$(MODULES_DIR)/kernel/drivers/block/loop.o \
,CONFIG_BLK_DEV_LOOP,,20,loop))
$(eval $(call KMOD_template,NBD,nbd,\
$(MODULES_DIR)/kernel/drivers/block/nbd.o \
,CONFIG_BLK_DEV_NBD,,20,nbd))
# Filesystems
$(eval $(call KMOD_template,FS_CIFS,fs-cifs,\
$(MODULES_DIR)/kernel/fs/cifs/cifs.o \
,CONFIG_CIFS,,30,cifs))
$(eval $(call KMOD_template,FS_MINIX,fs-minix,\
$(MODULES_DIR)/kernel/fs/minix/*.o \
,CONFIG_MINIX_FS,,30,minix))
$(eval $(call KMOD_template,FS_EXT2,fs-ext2,\
$(MODULES_DIR)/kernel/fs/ext2/*.o \
,CONFIG_EXT2_FS,,30,ext2))
$(eval $(call KMOD_template,FS_EXT3,fs-ext3,\
$(MODULES_DIR)/kernel/fs/ext3/*.o \
$(MODULES_DIR)/kernel/fs/jbd/*.o \
,CONFIG_EXT3_FS,,30,jbd ext3))
$(eval $(call KMOD_template,FS_HFSPLUS,fs-hfsplus,\
$(MODULES_DIR)/kernel/fs/hfsplus/*.o \
,CONFIG_HFSPLUS_FS,,30,hfsplus))
$(eval $(call KMOD_template,FS_NFS,fs-nfs,\
$(MODULES_DIR)/kernel/fs/lockd/*.o \
$(MODULES_DIR)/kernel/fs/nfs/*.o \
$(MODULES_DIR)/kernel/net/sunrpc/*.o \
,CONFIG_NFS_FS,,30,sunrpc lockd nfs))
$(eval $(call KMOD_template,FS_VFAT,fs-vfat,\
$(MODULES_DIR)/kernel/fs/vfat/vfat.o \
$(MODULES_DIR)/kernel/fs/fat/fat.o \
,CONFIG_VFAT_FS,,30,fat vfat))
$(eval $(call KMOD_template,FS_XFS,fs-xfs,\
$(MODULES_DIR)/kernel/fs/xfs/*.o \
,CONFIG_XFS_FS,,30,xfs))
# Multimedia # Multimedia

76
include/modules-2.6.mk
View file

@ -7,55 +7,6 @@
NF_2_6:=1 NF_2_6:=1
include $(INCLUDE_DIR)/netfilter.mk include $(INCLUDE_DIR)/netfilter.mk
# Block devices
$(eval $(call KMOD_template,LOOP,loop,\
$(MODULES_DIR)/kernel/drivers/block/loop.ko \
,CONFIG_BLK_DEV_LOOP,,20,loop))
$(eval $(call KMOD_template,NBD,nbd,\
$(MODULES_DIR)/kernel/drivers/block/nbd.ko \
,CONFIG_BLK_DEV_NBD,,20,nbd))
# Filesystems
$(eval $(call KMOD_template,FS_CIFS,fs-cifs,\
$(MODULES_DIR)/kernel/fs/cifs/cifs.ko \
,CONFIG_CIFS,kmod-nls-base,30,cifs))
$(eval $(call KMOD_template,FS_MINIX,fs-minix,\
$(MODULES_DIR)/kernel/fs/minix/minix.ko \
,CONFIG_MINIX_FS,,30,minix))
$(eval $(call KMOD_template,FS_EXT2,fs-ext2,\
$(MODULES_DIR)/kernel/fs/ext2/ext2.ko \
,CONFIG_EXT2_FS,,30,ext2))
$(eval $(call KMOD_template,FS_EXT3,fs-ext3,\
$(MODULES_DIR)/kernel/fs/ext3/ext3.ko \
$(MODULES_DIR)/kernel/fs/jbd/jbd.ko \
,CONFIG_EXT3_FS,,30,jbd ext3))
$(eval $(call KMOD_template,FS_HFSPLUS,fs-hfsplus,\
$(MODULES_DIR)/kernel/fs/hfsplus/hfsplus.ko \
,CONFIG_HFSPLUS_FS,kmod-nls-base,30,hfsplus))
$(eval $(call KMOD_template,FS_NFS,fs-nfs,\
$(MODULES_DIR)/kernel/fs/lockd/lockd.ko \
$(MODULES_DIR)/kernel/fs/nfs/nfs.ko \
$(MODULES_DIR)/kernel/net/sunrpc/sunrpc.ko \
,CONFIG_NFS_FS,,30,sunrpc lockd nfs))
$(eval $(call KMOD_template,FS_VFAT,fs-vfat,\
$(MODULES_DIR)/kernel/fs/fat/fat.ko \
$(MODULES_DIR)/kernel/fs/vfat/vfat.ko \
,CONFIG_VFAT_FS,kmod-nls-base,30,fat vfat))
$(eval $(call KMOD_template,FS_XFS,fs-xfs,\
$(MODULES_DIR)/kernel/fs/xfs/xfs.ko \
,CONFIG_XFS_FS,,30,xfs))
# Multimedia # Multimedia
$(eval $(call KMOD_template,PWC,pwc,\ $(eval $(call KMOD_template,PWC,pwc,\
@ -69,33 +20,6 @@ $(eval $(call KMOD_template,VIDEODEV,videodev,\
,CONFIG_VIDEO_DEV,,62,videodev)) ,CONFIG_VIDEO_DEV,,62,videodev))
# NLS
$(eval $(call KMOD_template,NLS_BASE,nls-base,\
$(MODULES_DIR)/kernel/fs/nls/nls_base.ko \
,CONFIG_NLS,,20,nls_base))
$(eval $(call KMOD_template,NLS_CP437,nls-cp437,\
$(MODULES_DIR)/kernel/fs/nls/nls_cp437.ko \
,CONFIG_NLS_CODEPAGE_437,,20,nls_cp437))
$(eval $(call KMOD_template,NLS_CP850,nls-cp850,\
$(MODULES_DIR)/kernel/fs/nls/nls_cp850.ko \
,CONFIG_NLS_CODEPAGE_850,,20,nls_cp850))
$(eval $(call KMOD_template,NLS_ISO8859_1,nls-iso8859-1,\
$(MODULES_DIR)/kernel/fs/nls/nls_iso8859-1.ko \
,CONFIG_NLS_ISO8859_1,,20,nls_iso8859-1))
$(eval $(call KMOD_template,NLS_ISO8859_15,nls-iso8859-15,\
$(MODULES_DIR)/kernel/fs/nls/nls_iso8859-15.ko \
,CONFIG_NLS_ISO8859_15,,20,nls_iso8859-15))
$(eval $(call KMOD_template,NLS_UTF8,nls-utf8,\
$(MODULES_DIR)/kernel/fs/nls/nls_utf8.ko \
,CONFIG_NLS_UTF8,,20,nls_utf8))
# Network devices # Network devices
$(eval $(call KMOD_template,NET_AIRO,net-airo,\ $(eval $(call KMOD_template,NET_AIRO,net-airo,\

163
package/kernel/modules/fs.mk Normal file
View file

@ -0,0 +1,163 @@
FSMENU:=Filesystems
define KernelPackage/fs-cifs
TITLE:=CIFS support
DESCRIPTION:=Kernel module for CIFS support
KCONFIG:=$(CONFIG_CIFS)
SUBMENU:=$(FSMENU)
AUTOLOAD:=$(call AutoLoad,30,cifs)
FILES:=$(MODULES_DIR)/kernel/fs/cifs/cifs.$(LINUX_KMOD_SUFFIX)
endef
$(eval $(call KernelPackage,fs-cifs))
define KernelPackage/fs-minix
TITLE:=Minix filesystem support
DESCRIPTION:=Kernel module for Minix filesystem support
KCONFIG:=$(CONFIG_MINIX_FS)
SUBMENU:=$(FSMENU)
AUTOLOAD:=$(call AutoLoad,30,minix)
FILES:=$(MODULES_DIR)/kernel/fs/minix/minix.$(LINUX_KMOD_SUFFIX)
endef
$(eval $(call KernelPackage,fs-minix))
define KernelPackage/fs-ext2
TITLE:=EXT2 filesystem support
DESCRIPTION:=Kernel module for EXT2 filesystem support
KCONFIG:=$(CONFIG_EXT2_FS)
SUBMENU:=$(FSMENU)
AUTOLOAD:=$(call AutoLoad,30,ext2)
FILES:=$(MODULES_DIR)/kernel/fs/ext2/ext2.$(LINUX_KMOD_SUFFIX)
endef
$(eval $(call KernelPackage,fs-ext2))
define KernelPackage/fs-ext3
TITLE:=EXT3 filesystem support
DESCRIPTION:=Kernel module for EXT3 filesystem support
KCONFIG:=$(CONFIG_EXT3_FS)
SUBMENU:=$(FSMENU)
AUTOLOAD:=$(call AutoLoad,30,jbd ext3)
FILES:= \
$(MODULES_DIR)/kernel/fs/jbd/jbd.$(LINUX_KMOD_SUFFIX) \
$(MODULES_DIR)/kernel/fs/ext3/ext3.$(LINUX_KMOD_SUFFIX)
endef
$(eval $(call KernelPackage,fs-ext3))
define KernelPackage/fs-hfsplus
TITLE:=HFS+ filesystem support
DESCRIPTION:=Kernel module for HFS+ filesystem support
DEPENDS:=+kmod-nls-base
KCONFIG:=$(CONFIG_HFSPLUS_FS)
SUBMENU:=$(FSMENU)
AUTOLOAD:=$(call AutoLoad,30,hfsplus)
FILES:=$(MODULES_DIR)/kernel/fs/hfsplus/hfsplus.$(LINUX_KMOD_SUFFIX)
endef
$(eval $(call KernelPackage,fs-hfsplus))
define KernelPackage/fs-nfs
TITLE:=NFS filesystem support
DESCRIPTION:=Kernel module for NFS support
KCONFIG:=$(CONFIG_NFS_FS)
SUBMENU:=$(FSMENU)
AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd nfs)
FILES:= \
$(MODULES_DIR)/kernel/net/sunrpc/sunrpc.$(LINUX_KMOD_SUFFIX) \
$(MODULES_DIR)/kernel/fs/lockd/lockd.$(LINUX_KMOD_SUFFIX) \
$(MODULES_DIR)/kernel/fs/nfs/nfs.$(LINUX_KMOD_SUFFIX)
endef
$(eval $(call KernelPackage,fs-nfs))
define KernelPackage/fs-vfat
TITLE:=VFAT filesystem support
DESCRIPTION:=Kernel module for VFAT filesystem support
DEPENDS:=+kmod-nls-base
KCONFIG:=$(CONFIG_VFAT_FS)
SUBMENU:=$(FSMENU)
AUTOLOAD:=$(call AutoLoad,30,fat vfat)
FILES:= \
$(MODULES_DIR)/kernel/fs/fat/fat.$(LINUX_KMOD_SUFFIX) \
$(MODULES_DIR)/kernel/fs/vfat/vfat.$(LINUX_KMOD_SUFFIX)
endef
$(eval $(call KernelPackage,fs-vfat))
define KernelPackage/fs-xfs
TITLE:=XFS filesystem support
DESCRIPTION:=Kernel module for XFS support
KCONFIG:=$(CONFIG_XFS_FS)
SUBMENU:=$(FSMENU)
AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd xfs)
FILES:= \
$(MODULES_DIR)/kernel/fs/xfs/xfs.$(LINUX_KMOD_SUFFIX)
endef
$(eval $(call KernelPackage,fs-xfs))
define KernelPackage/nls-base
TITLE:=Native Language Support
DESCRIPTION:=Kernel module for Native Language Support
KCONFIG:=$(CONFIG_NLS)
SUBMENU:=$(FSMENU)
MENU:=1
FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_base.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,20,nls_base)
endef
$(eval $(call KernelPackage,nls-base))
define KernelPackage/nls-cp437
TITLE:=Codepage 437 (United States, Canada)
DESCRIPTION:=Kernel module for NLS Codepage 437 (United States, Canada)
DEPENDS:=kmod-nls-base
KCONFIG:=$(CONFIG_NLS_CODEPAGE_437)
SUBMENU:=$(FSMENU)
FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_cp437.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,25,nls_cp437)
endef
$(eval $(call KernelPackage,nls-cp437))
define KernelPackage/nls-cp850
TITLE:=Codepage 850 (Europe)
DESCRIPTION:=Kernel module for NLS Codepage 850 (Europe)
DEPENDS:=kmod-nls-base
KCONFIG:=$(CONFIG_NLS_CODEPAGE_850)
SUBMENU:=$(FSMENU)
FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_cp850.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,25,nls_cp850)
endef
$(eval $(call KernelPackage,nls-cp850))
define KernelPackage/nls-iso8859-1
TITLE:=ISO 8859-1 (Latin 1; Western European Languages)
DESCRIPTION:=Kernel module for ISO 8859-1 (Latin 1)
DEPENDS:=kmod-nls-base
KCONFIG:=$(CONFIG_NLS_ISO8859_1)
SUBMENU:=$(FSMENU)
FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_iso8859-1.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-1)
endef
$(eval $(call KernelPackage,nls-iso8859-1))
define KernelPackage/nls-iso8859-15
TITLE:=ISO 8859-15 (Latin 9; Western, with Euro symbol)
DESCRIPTION:=Kernel module for ISO 8859-15 (Latin 9)
DEPENDS:=kmod-nls-base
KCONFIG:=$(CONFIG_NLS_ISO8859_15)
SUBMENU:=$(FSMENU)
FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_iso8859-15.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-15)
endef
$(eval $(call KernelPackage,nls-iso8859-15))
define KernelPackage/nls-utf8
TITLE:=UTF8
DESCRIPTION:=Kernel module for NLS UTF8
DEPENDS:=kmod-nls-base
KCONFIG:=$(CONFIG_NLS_UTF8)
SUBMENU:=$(FSMENU)
FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_utf8.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,25,nls_utf8)
endef
$(eval $(call KernelPackage,nls-utf8))

23
package/kernel/modules/other.mk
View file

@ -1,4 +1,4 @@
# #
# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2006 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
@ -99,3 +99,24 @@ endef
$(eval $(call KernelPackage,soundcore)) $(eval $(call KernelPackage,soundcore))
define KernelPackage/loop
TITLE:=Loopback device support
DESCRIPTION:=Kernel module for loopback device support
KCONFIG:=$(CONFIG_BLK_DEV_LOOP)
SUBMENU:=$(EMENU)
AUTOLOAD:=$(call AutoLoad,30,loop)
FILES:=$(MODULES_DIR)/kernel/drivers/block/loop.$(LINUX_KMOD_SUFFIX)
endef
$(eval $(call KernelPackage,loop))
define KernelPackage/nbd
TITLE:=Network block device support
DESCRIPTION:=Kernel module for network block device support
KCONFIG:=$(CONFIG_BLK_DEV_NBD)
SUBMENU:=$(EMENU)
AUTOLOAD:=$(call AutoLoad,30,nbd)
FILES:=$(MODULES_DIR)/kernel/drivers/block/nbd.$(LINUX_KMOD_SUFFIX)
endef
$(eval $(call KernelPackage,nbd))

124
target/linux/Config.in
View file

@ -2,79 +2,6 @@ menu "Kernel Configuration / Device Support"
comment "Kernel modules" comment "Kernel modules"
menu "Block devices support"
config PACKAGE_KMOD_LOOP
prompt "kmod-loop......................... Loop mount support"
tristate
default m
help
Kernel module for loop mount support
config PACKAGE_KMOD_NBD
prompt "kmod-nbd.......................... Network Block Device"
tristate
default m
help
Kernel module for network block device
endmenu
menu "Filesystems support"
config PACKAGE_KMOD_FS_CIFS
prompt "kmod-fs-cifs...................... CIFS support"
tristate
default m
help
Kernel modules for CIFS support
config PACKAGE_KMOD_FS_EXT2
prompt "kmod-fs-ext2...................... EXT2 filesystem support"
tristate
default m
help
Kernel modules for EXT2 filesystem support
config PACKAGE_KMOD_FS_EXT3
prompt "kmod-fs-ext3...................... EXT3 filesystem support"
tristate
default m
help
Kernel modules for EXT3 filesystem support
config PACKAGE_KMOD_FS_HFSPLUS
prompt "kmod-fs-hfsplus................... HFS+ filesystem support"
tristate
default m
help
Kernel modules for HFS+ filesystem support
config PACKAGE_KMOD_FS_NFS
prompt "kmod-fs-nfs....................... NFS support"
tristate
default m
help
Kernel modules for NFS support
Includes lockd, nfs and sunrpc
config PACKAGE_KMOD_FS_VFAT
prompt "kmod-fs-vfat...................... VFAT filesystem support"
tristate
default m
help
Kernel modules for VFAT filesystem support
useful for usb mass storage devices
config PACKAGE_KMOD_FS_XFS
prompt "kmod-fs-xfs....................... XFS filesystem support"
tristate
default m
help
Kernel modules for XFS filesystem support
endmenu
menu "Multimedia devices support" menu "Multimedia devices support"
config PACKAGE_KMOD_PWC config PACKAGE_KMOD_PWC
@ -90,61 +17,10 @@ config PACKAGE_KMOD_VIDEODEV
endmenu endmenu
menu "Native Language support"
config PACKAGE_KMOD_NLS_BASE
prompt "kmod-nls-base..................... Native Language support"
tristate
default m
help
Kernel native language support
config PACKAGE_KMOD_NLS_CP437
prompt "kmod-nls-cp437.................. Codepage 437 (United States, Canada)"
tristate
default m
depends PACKAGE_KMOD_NLS_BASE
help
Kernel native language support
config PACKAGE_KMOD_NLS_CP850
prompt "kmod-nls-cp850.................. Codepage 850 (Europe)"
tristate
default m
depends PACKAGE_KMOD_NLS_BASE
help
Kernel native language support
config PACKAGE_KMOD_NLS_ISO8859_1
prompt "kmod-nls-iso8859-1.............. NLS ISO 8859-1 (Latin 1; Western European Languages)"
tristate
default m
depends PACKAGE_KMOD_NLS_BASE
help
Kernel native language support
config PACKAGE_KMOD_NLS_ISO8859_15
prompt "kmod-nls-iso8859-15............. NLS ISO 8859-15 (Latin 15; Western European Languages with Euro)"
tristate
default m
depends PACKAGE_KMOD_NLS_BASE
help
Kernel native language support
config PACKAGE_KMOD_NLS_UTF8
prompt "kmod-nls-utf8................... NLS UTF8"
tristate
default m
depends PACKAGE_KMOD_NLS_BASE
help
Kernel native language support
endmenu
menu "Network devices support" menu "Network devices support"
depends LINUX_2_4_X86 || LINUX_2_6_X86 depends LINUX_2_4_X86 || LINUX_2_6_X86
config PACKAGE_KMOD_NET_AIRO config PACKAGE_KMOD_NET_AIRO
prompt "kmod-net-airo..................... Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards kernel support" prompt "kmod-net-airo..................... Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards kernel support"
tristate tristate