From 6c1015f0d36018d6de092a05e650848c95758655 Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 10 Jun 2007 22:41:40 +0000 Subject: [PATCH 1/1] rename kmod-qc-usb to kmod-usb-qc, fix dependencies, only build kernel module if it was selected git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7552 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/qc-usb/Makefile | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/package/qc-usb/Makefile b/package/qc-usb/Makefile index 67d27a718..78e6dc1da 100644 --- a/package/qc-usb/Makefile +++ b/package/qc-usb/Makefile @@ -22,35 +22,31 @@ PKG_CAT:=zcat include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/kernel.mk -define Package/qc-usb-utils/Default +define Package/qc-usb-utils + SECTION:=utils + CATEGORY:=Utilities TITLE:=Utility programs for the qc-usb kernel module DESCRIPTION:=\ - Utilities to tweak paramters of your QuickCam Express or \\\ + Utilities to tweak parameters of your QuickCam Express or \\\ similar webcam. These programs are completely useless without a \\\ qc-usb-modules package. URL:=http://qce-ga.sourceforge.net/ endef -define Package/qc-usb-utils - SECTION:=utils - CATECORY:=Utilities - $(call Package/qc-usb-utils/Default) -endef - -define KernelPackage/qc-usb +define KernelPackage/usb-qc TITLE:=Support for USB QuickCam Express webcam DESCRIPTION:=\ Kernel support for Logitech's QuickCam Express webcam and \\\ other webcams with similar chipsets. SUBMENU:=USB Support - DEPENDS:=@LINUX_2_6 + DEPENDS:=@LINUX_2_6 @USB_SUPPORT @VIDEO_SUPPORT kmod-usb-core +kmod-videodev VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) FILES:=$(PKG_BUILD_DIR)/quickcam.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,70,quickcam) + AUTOLOAD:=$(call AutoLoad,90,quickcam) endef -ifeq ($(CONFIG_LINUX_2_6),y) - define Build/Compile/linux26 +ifneq ($(CONFIG_PACKAGE_kmod-usb-qc),) + define Build/Compile/kmod $(MAKE) -C $(LINUX_DIR) \ PATH="$(TARGET_PATH)" \ KVER="$(LINUX_VERSION)" \ @@ -65,7 +61,7 @@ ifeq ($(CONFIG_LINUX_2_6),y) endif define Build/Compile - $(call Build/Compile/linux26) + $(call Build/Compile/kmod) $(MAKE) -C $(PKG_BUILD_DIR) \ CFLAGS="$(TARGET_CFLAGS)" \ @@ -74,8 +70,8 @@ endef define Package/qc-usb-utils/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/qcset $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/qcset $(1)/usr/bin/ endef $(eval $(call BuildPackage,qc-usb-utils)) -$(eval $(call KernelPackage,qc-usb)) +$(eval $(call KernelPackage,usb-qc)) -- 2.20.1