Use the KernelPackage template instead of kmod-foo

SVN-Revision: 5995
This commit is contained in:
Florian Fainelli 2007-01-05 15:36:58 +00:00
parent 4f014d13c4
commit 76b24f64fa
7 changed files with 37 additions and 63 deletions

View File

@ -22,13 +22,13 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
define Package/kmod-alsa
SECTION:=kernel
CATEGORY:=Kernel drivers
define KernelPackage/alsa
SUBMENU:=Other modules
DEPENDS:=@USB_SUPPORT
TITLE:=Advanced Linux Sound Architecture
URL:=http://alsa-project.org/
VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
DESCRIPTION:=
FILES:=$(PKG_BUILD_DIR)/modules/*.$(LINUX_KMOD_SUFFIX)
AUTOLOAD=$(call AutoLoad,70,$(shell cat ./files/alsa.modules))
endef
ifeq ($(KERNEL),2.4)
@ -71,12 +71,4 @@ define Build/Compile
all
endef
define Package/kmod-alsa/install
$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION)
$(INSTALL_DATA) $(PKG_BUILD_DIR)/modules/*.$(LINUX_KMOD_SUFFIX) \
$(1)/lib/modules/$(LINUX_VERSION)/
$(INSTALL_DIR) $(1)/etc/modules.d
$(INSTALL_DATA) ./files/alsa.modules $(1)/etc/modules.d/70-alsa
endef
$(eval $(call BuildPackage,kmod-alsa))
$(eval $(call KernelPackage,alsa))

View File

@ -41,15 +41,15 @@ define Package/fuse-utils
This package contains the FUSE utilities.
endef
define Package/kmod-fuse
define KernelPackage/fuse
SUBMENU:=Filesystems
$(call Package/fuse/Default)
SECTION:=kernel
CATEGORY:=Kernel drivers
TITLE+= (kernel module)
DESCRIPTION+=\\\
\\\
This package contains the FUSE kernel module.
VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX)
endef
define Package/libfuse
@ -134,21 +134,11 @@ define Package/fuse-utils/install
$(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/
endef
define Package/kmod-fuse/install
$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION)
$(CP) $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \
$(1)/lib/modules/$(LINUX_VERSION)/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/bin
$(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/
endef
define Package/libfuse/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,fuse-utils))
$(eval $(call BuildPackage,kmod-fuse))
$(eval $(call BuildPackage,libfuse))
$(eval $(call KernelPackage,fuse))

View File

@ -85,7 +85,7 @@ define Package/InstallTemplate
$(MAKE) $(PKG_BUILD_DIR)/.built; \
fi
$(INSTALL_DIR) $$(1)/etc
install -m0600 $(PKG_BUILD_DIR)_$(2)/madwifi.conf $$(1)/etc/hostapd.conf
$(INSTALL_CONF $(PKG_BUILD_DIR)_$(2)/madwifi.conf $$(1)/etc/hostapd.conf
$(INSTALL_DIR) $$(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)_$(2)/hostapd $$(1)/usr/sbin/
endef

View File

@ -62,7 +62,7 @@ endef
define Package/ipsec-tools/install
$(INSTALL_DIR) $(1)/etc
install -m0600 $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(1)/etc/
$(INSTALL_CONF) $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(1)/etc/
$(INSTALL_DIR) $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libipsec.so.* $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(1)/usr/lib/

View File

@ -42,15 +42,15 @@ define Package/openswan
URL:=http://www.openswan.org/
endef
define Package/kmod-openswan
define KernelPackage/openswan
SUBMENU:=Network Support
$(call Package/openswan/Default)
SECTION:=kernel
CATEGORY:=Kernel drivers
TITLE+= (kernel module)
DESCRIPTION+=\\\
\\\
This package contains the Openswan kernel module.
VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
FILES:=$(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX)
endef
PKG_MAKE_OPTS:= \
@ -82,11 +82,5 @@ define Package/openswan/install
find $(1) -name \*.old | xargs rm -rf
endef
define Package/kmod-openswan/install
mkdir -p $(1)/lib/modules/$(LINUX_VERSION)
$(CP) $(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX) \
$(1)/lib/modules/$(LINUX_VERSION)/
endef
$(eval $(call BuildPackage,openswan))
$(eval $(call BuildPackage,kmod-openswan))
$(eval $(call KernelPackage,openswan))

View File

@ -21,13 +21,14 @@ PKG_CAT:=bzcat
include $(INCLUDE_DIR)/package.mk
define Package/kmod-pwc
SECTION:=kernel
CATEGORY:=Kernel drivers
DEPENDS:=@BROKEN @LINUX_2_6
define KernelPackage/pwc
TITLE:=USB Philips camera driver
URL:=http://www.saillard.org/linux/pwc/
DESCRIPTION:=Kernel support for USB Philips camera
SUBMENU:=USB Support
DEPENDS:=@BROKEN @LINUX_2_6
VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
FILES:=$(PKG_BUILD_DIR)/pwc.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,70,$(shell cat ./files/pwc.modules))
endef
define Build/Compile
@ -42,12 +43,4 @@ define Build/Compile
modules
endef
define Package/kmod-pwc/install
mkdir -p $(1)/etc/modules.d
$(INSTALL_DATA) ./files/pwc.modules $(1)/etc/modules.d/70-pwc
$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION)
$(CP) $(PKG_BUILD_DIR)/pwc.$(LINUX_KMOD_SUFFIX) \
$(1)/lib/modules/$(LINUX_VERSION)/
endef
$(eval $(call BuildPackage,kmod-pwc))
$(eval $(call KernelPackage,pwc))

View File

@ -23,9 +23,8 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-driver-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
#FIXME: add proper dependency handling on kmod-usb-core packages
define Package/kmod-zd1211
SECTION:=kernel
CATEGORY:=Kernel drivers
define KernelPackage/zd1211
SUBMENU:=Wireless Drivers
DEPENDS:=@LINUX_2_6&&!LINUX_2_6_UML
TITLE:=Driver for Zydas 1211 based USB devices
DESCRIPTION:=\
@ -33,8 +32,16 @@ define Package/kmod-zd1211
USB-WLAN-Chip.\\\
Initially contributed by ZyDAS, this driver is actively maintained by the \\\
open source community.
URL:=http://zd1211.ath.cx/
VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
FILES:=$(PKG_BUILD_DIR)/zd1211.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,60,zd1211)
endef
define Package/zd1211-utils
SECTION:=utils
CATEGORY:=Utilities
TITLE:=zd1211 user-space utilities
DESCRIPTION:=zd1211 user-space utilities : apdbg, zd1211-sta
endef
define Build/Compile
@ -51,13 +58,11 @@ define Build/Compile
$(TARGET_CC) $(PKG_BUILD_DIR)/apdbg.c -o $(PKG_BUILD_DIR)/apdbg
endef
define Package/kmod-zd1211/install
$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION)
$(CP) $(PKG_BUILD_DIR)/zd1211.$(LINUX_KMOD_SUFFIX) \
$(1)/lib/modules/$(LINUX_VERSION)/
define Package/zd1211-utils/install
$(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_BUILD_DIR)/apdbg $(1)/usr/sbin/
$(CP) $(PKG_BUILD_DIR)/sta $(1)/usr/sbin/$(PKG_NAME)-sta
endef
$(eval $(call BuildPackage,kmod-zd1211))
$(eval $(call Package,zd1211-utils))
$(eval $(call KernelPackage,zd1211))