From 56231056ea784f1cec6450f649b1adaed1f56366 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 6 Sep 2007 16:27:37 +0000 Subject: strip the kernel version suffix from target directories, except for brcm-2.4 (the -2.4 will be included in the board name here). CONFIG_LINUX__ becomes CONFIG_TARGET_, same for profiles. SVN-Revision: 8653 --- package/acx/Makefile | 2 +- package/admswconfig/Makefile | 2 +- package/ar7-atm/Makefile | 2 +- package/base-files/Makefile | 2 +- package/bcm43xx-mac80211/Makefile | 2 +- package/broadcom-diag/Makefile | 2 +- package/broadcom-mmc/Makefile | 2 +- package/broadcom-wl/Makefile | 4 ++-- package/fonera-mp3-drv/Makefile | 2 +- package/fonera-mp3/Makefile | 2 +- package/foxboard-utils/Makefile | 2 +- package/hostapd/Makefile | 4 ++-- package/ipset/Makefile | 2 +- package/kexec-tools/Makefile | 2 +- package/madwifi/Makefile | 5 +---- package/nvram/Makefile | 2 +- package/qc-usb/Makefile | 2 +- package/switch/Makefile | 2 +- package/util-linux/Makefile | 2 +- package/uvcvideo/Makefile | 2 +- package/wlcompat/Makefile | 4 ++-- package/yamonenv/Makefile | 2 +- package/zd1211-driver/Makefile | 2 +- 23 files changed, 26 insertions(+), 29 deletions(-) (limited to 'package') diff --git a/package/acx/Makefile b/package/acx/Makefile index 48d27e5..7684cb9 100644 --- a/package/acx/Makefile +++ b/package/acx/Makefile @@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/acx TITLE:=Driver for TI ACX1xx chipset - DEPENDS:=@LINUX_2_6&&!LINUX_2_6_AVR32 +wireless-tools + DEPENDS:=@LINUX_2_6 @!TARGET_AVR32 +wireless-tools DESCRIPTION:=\ This package contains a driver for TI ACX1xx 802.11a/b/g chipsets. URL:=http://acx100.sourceforge.net/ diff --git a/package/admswconfig/Makefile b/package/admswconfig/Makefile index 10ab589..609c2e1 100644 --- a/package/admswconfig/Makefile +++ b/package/admswconfig/Makefile @@ -24,7 +24,7 @@ define Package/admswconfig SECTION:=utils CATEGORY:=Utilities TITLE:=ADM5120 Switch configuration tool - DEPENDS:=@LINUX_2_6_ADM5120||@LINUX_2_6_ADM5120EB + DEPENDS:=@TARGET_ADM5120||TARGET_ADM5120EB DESCRIPTION:=\ A program to configure the internal ethernet switch of an ADM5120 processor. \\\ You need the corresponding driver for the switch in the kernel. \\\ diff --git a/package/ar7-atm/Makefile b/package/ar7-atm/Makefile index 756657d..3be0fab 100644 --- a/package/ar7-atm/Makefile +++ b/package/ar7-atm/Makefile @@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/sangam-atm-annex-a SUBMENU:=Network Devices - DEPENDS:=@LINUX_2_6_AR7 +kmod-atm + DEPENDS:=@TARGET_AR7 +kmod-atm TITLE:=AR7 ADSL driver (Annex A, ADSL over POTS) DESCRIPTION:=The AR7 ADSL driver for Annex A (ADSL over POTS) FILES:=$(PKG_BUILD_DIR)/tiatm.$(LINUX_KMOD_SUFFIX) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 987bb5d..9acb8df 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -69,7 +69,7 @@ endef define Package/libgcc $(call Package/gcc/Default) TITLE:=GCC support library - DEPENDS:=@!LINUX_2_6_AVR32||@!NATIVE_TOOLCHAIN + DEPENDS:=@!TARGET_AVR32 @!NATIVE_TOOLCHAIN endef define Package/libssp diff --git a/package/bcm43xx-mac80211/Makefile b/package/bcm43xx-mac80211/Makefile index 2362444..54f5a97 100644 --- a/package/bcm43xx-mac80211/Makefile +++ b/package/bcm43xx-mac80211/Makefile @@ -21,7 +21,7 @@ define KernelPackage/bcm43xx-mac80211 SUBMENU:=Wireless Drivers TITLE:=Broadcom 43xx wireless support DESCRIPTION:=Kernel module for Broadcom 43xx wireless support (mac80211) - DEPENDS:=@LINUX_2_6_BRCM47XX +kmod-mac80211 + DEPENDS:=@TARGET_BRCM47XX +kmod-mac80211 KCONFIG:=CONFIG_MAC80211 FILES:=$(PKG_BUILD_DIR)/bcm43xx-mac80211.$(LINUX_KMOD_SUFFIX) # AUTOLOAD:=$(call AutoLoad,30,bcm43xx-mac80211) diff --git a/package/broadcom-diag/Makefile b/package/broadcom-diag/Makefile index f2337a2..e0827b0 100644 --- a/package/broadcom-diag/Makefile +++ b/package/broadcom-diag/Makefile @@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/diag SUBMENU:=Other modules - DEPENDS:=@LINUX_2_4_BRCM||LINUX_2_6_BRCM||LINUX_2_6_BRCM47XX + DEPENDS:=@TARGET_BRCM_2_4||TARGET_BRCM47XX TITLE:=Driver for router LEDs and Buttons FILES:=$(PKG_BUILD_DIR)/diag.$(LINUX_KMOD_SUFFIX) endef diff --git a/package/broadcom-mmc/Makefile b/package/broadcom-mmc/Makefile index 57db0d6..889bcfa 100644 --- a/package/broadcom-mmc/Makefile +++ b/package/broadcom-mmc/Makefile @@ -23,7 +23,7 @@ MAKEFLAGS_KMOD:= -C "$(LINUX_DIR)" \ define KernelPackage/broadcom-mmc SUBMENU:=Other modules - DEPENDS:=@LINUX_2_4_BRCM + DEPENDS:=@TARGET_BRCM_2_4 TITLE:=Kernel driver for the Linksys WRT54G MM/SD-Card Mod DESCRIPTION:=\ Kernel driver for the Linksys WRT54G MM/SD-Card Mod diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile index da32a89..77d5995 100644 --- a/package/broadcom-wl/Makefile +++ b/package/broadcom-wl/Makefile @@ -25,13 +25,13 @@ define Package/broadcom-wl/Default CATEGORY:=Kernel modules DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo SUBMENU:=Proprietary BCM43xx WiFi driver - SUBMENUDEP:=@LINUX_2_4_BRCM + SUBMENUDEP:=@TARGET_BRCM_2_4 endef define KernelPackage/brcm-wl/Default $(call Package/broadcom-wl/Default) SECTION:=kernel - DEPENDS:=@LINUX_2_4_BRCM + DEPENDS:=@TARGET_BRCM_2_4 TITLE:=Kernel driver for BCM43xx chipsets DESCRIPTION:=\ This package contains the proprietary wireless driver for the Broadcom \\\ diff --git a/package/fonera-mp3-drv/Makefile b/package/fonera-mp3-drv/Makefile index d163b4a..997b85a 100644 --- a/package/fonera-mp3-drv/Makefile +++ b/package/fonera-mp3-drv/Makefile @@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/fonera-mp3-driver SUBMENU:=Other modules - DEPENDS:=@LINUX_2_6_ATHEROS + DEPENDS:=@TARGET_ATHEROS TITLE:=Fonera-MP3 driver (VS1011X) DESCRIPTION:=driver for a vs1011X attached to a fonera FILES:=$(PKG_BUILD_DIR)/mp3_drv.$(LINUX_KMOD_SUFFIX) diff --git a/package/fonera-mp3/Makefile b/package/fonera-mp3/Makefile index dabef83..c41d6f8 100644 --- a/package/fonera-mp3/Makefile +++ b/package/fonera-mp3/Makefile @@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/package.mk define Package/fonera-mp3d SECTION:=utils CATEGORY:=Utilities - DEPENDS:=@LINUX_2_6_ATHEROS + DEPENDS:=@TARGET_ATHEROS TITLE:=Daemon for fonera-mp3 DESCRIPTION:=Daemon to drive a vs1011X mp3 decoder attached to the \ fonera gpio pins diff --git a/package/foxboard-utils/Makefile b/package/foxboard-utils/Makefile index f5d9aa7..fc63e0c 100644 --- a/package/foxboard-utils/Makefile +++ b/package/foxboard-utils/Makefile @@ -27,7 +27,7 @@ define Package/foxboard-utils DESCRIPTION:=\ This package contains a collection of tools for configuring the foxboard gpio pins/leds URL:=http://www.acmesystems.it - DEPENDS:=@LINUX_2_6_ETRAX + DEPENDS:=@TARGET_ETRAX endef define Build/Compile diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index 22f0dab..a4acb51 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -36,7 +36,7 @@ endef define Package/hostapd $(call Package/hostapd/Default) - DEPENDS:=+libopenssl @!LINUX_2_6_AVR32 @!LINUX_2_6_ETRAX + DEPENDS:=+libopenssl @!TARGET_AVR32 @!TARGET_ETRAX TITLE+= (full) DESCRIPTION:=\ This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS \\\ @@ -49,7 +49,7 @@ endef define Package/hostapd-mini $(call Package/hostapd/Default) - DEPENDS:=@!LINUX_2_6_AVR32 @!LINUX_2_6_ETRAX + DEPENDS:=@!TARGET_AVR32 @!TARGET_ETRAX TITLE+= (WPA-PSK only) DESCRIPTION:=\ This package contains a minimal IEEE 802.1x/WPA/EAP/RADIUS Authenticator \\\ diff --git a/package/ipset/Makefile b/package/ipset/Makefile index 62e63d3..700b805 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk define Package/ipset SECTION:=net CATEGORY:=Network - DEPENDS:=@!LINUX_2_6_ETRAX + DEPENDS:=@!TARGET_ETRAX TITLE:=Netfilter ip sets administration utility URL:=http://ipset.netfilter.org/ endef diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile index 7289930..7a18740 100644 --- a/package/kexec-tools/Makefile +++ b/package/kexec-tools/Makefile @@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk define Package/kexec-tools SECTION:=utils CATEGORY:=Utilities - DEPENDS:=@LINUX_2_6_X86||@LINUX_2_6_RDC +zlib + DEPENDS:=@i386 +zlib TITLE:=Kernel boots kernel DESCRIPTION:=\ kexec is a set of systems call that allows you to load \\\ diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index 70177d9..2770c3d 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -43,13 +43,10 @@ ifeq ($(ARCH),powerpc) endif BUS:=PCI -ifneq ($(CONFIG_LINUX_2_6_ATHEROS),) +ifneq ($(CONFIG_TARGET_ATHEROS),) BUS:=AHB HAL_TARGET:=ap51 endif -ifneq ($(CONFIG_LINUX_2_6_ARUBA),) - BUS:=PCI AHB # no suitable HAL for AHB yet. -endif BUS_MODULES:= ifeq ($(findstring AHB,$(BUS)),AHB) diff --git a/package/nvram/Makefile b/package/nvram/Makefile index 486e419..e7a59a7 100644 --- a/package/nvram/Makefile +++ b/package/nvram/Makefile @@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk define Package/nvram SECTION:=utils CATEGORY:=Utilities - DEPENDS:=@LINUX_2_4_BRCM + DEPENDS:=@TARGET_BRCM_2_4 TITLE:=Broadcom config utility DESCRIPTION:=\ This package contains an utility to control broadcom's 'nvram' config \\\ diff --git a/package/qc-usb/Makefile b/package/qc-usb/Makefile index a28d439..795ba96 100644 --- a/package/qc-usb/Makefile +++ b/package/qc-usb/Makefile @@ -36,7 +36,7 @@ define KernelPackage/usb-qc Kernel support for Logitech's QuickCam Express webcam and \\\ other webcams with similar chipsets. SUBMENU:=USB Support - DEPENDS:=@LINUX_2_6 @USB_SUPPORT @VIDEO_SUPPORT kmod-usb-core +kmod-videodev + DEPENDS:=@LINUX_2_6 @USB_SUPPORT kmod-usb-core +kmod-videodev FILES:=$(PKG_BUILD_DIR)/quickcam.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,90,quickcam) endef diff --git a/package/switch/Makefile b/package/switch/Makefile index 0f3716c..dd09248 100644 --- a/package/switch/Makefile +++ b/package/switch/Makefile @@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/switch SUBMENU:=Other modules - DEPENDS:=@LINUX_2_6_BRCM||LINUX_2_4_BRCM||LINUX_2_6_BRCM47XX + DEPENDS:=@TARGET_BRCM_2_4||TARGET_BRCM47XX TITLE:=Switch drivers DESCRIPTION:=\ This package contains switch drivers for ADM6996L and BCM53XX RoboSwitch. diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index c5c574c..40f443e 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk define Package/util-linux/Default SECTION:=utils CATEGORY:=Utilities - DEPENDS:=@!LINUX_2_6_ETRAX + DEPENDS:=@!TARGET_ETRAX URL:=http://www.kernel.org/pub/linux/utils/util-linux/ endef diff --git a/package/uvcvideo/Makefile b/package/uvcvideo/Makefile index 847f73b..c08f565 100644 --- a/package/uvcvideo/Makefile +++ b/package/uvcvideo/Makefile @@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/uvcvideo SUBMENU:=USB Support - DEPENDS:=@LINUX_2_6 kmod-usb-core kmod-videodev @VIDEO_SUPPORT + DEPENDS:=@LINUX_2_6 kmod-usb-core kmod-videodev TITLE:=Driver for Linux-UVC based USB cameras URL:=http://linux-uvc.berlios.de/ FILES:=$(PKG_BUILD_DIR)/uvcvideo.$(LINUX_KMOD_SUFFIX) diff --git a/package/wlcompat/Makefile b/package/wlcompat/Makefile index 2c361b7..78e3c0f 100644 --- a/package/wlcompat/Makefile +++ b/package/wlcompat/Makefile @@ -16,8 +16,8 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/wlcompat/Default SUBMENU:=Proprietary BCM43xx WiFi driver - SUBMENUDEP:=@LINUX_2_4_BRCM - DEPENDS:=@LINUX_2_4_BRCM @PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo +wireless-tools + SUBMENUDEP:=@TARGET_BRCM_2_4 + DEPENDS:=@TARGET_BRCM_2_4 @PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo +wireless-tools TITLE:=Broadcom wl wrapper module DESCRIPTION:=\ This package contains a wrapper module, that provides Wireless Extension \\\ diff --git a/package/yamonenv/Makefile b/package/yamonenv/Makefile index 7cfe609..0cf6493 100644 --- a/package/yamonenv/Makefile +++ b/package/yamonenv/Makefile @@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package.mk define Package/yamonenv SECTION:=utils CATEGORY:=Utilities - DEPENDS:=@LINUX_2_6_AU1000 + DEPENDS:=@TARGET_AU1000 TITLE:=YAMON configuration utility URL:=http://meshcube.org/nylon/stable/sources/ endef diff --git a/package/zd1211-driver/Makefile b/package/zd1211-driver/Makefile index 1790941..d61cc7b 100644 --- a/package/zd1211-driver/Makefile +++ b/package/zd1211-driver/Makefile @@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk #FIXME: add proper dependency handling on kmod-usb-core packages define KernelPackage/zd1211 SUBMENU:=Wireless Drivers - DEPENDS:=@LINUX_2_6&&!LINUX_2_6_UML + DEPENDS:=@LINUX_2_6 @USB_SUPPORT TITLE:=Driver for Zydas 1211 based USB devices DESCRIPTION:=\ This package contains a Linux driver for the ZyDAS ZD1211 802.11b/g \\\ -- cgit v1.1