mac80211: rename a misnamed patch

[openwrt.git] / package / wprobe / Makefile

diff --git a/package/wprobe/Makefile b/package/wprobe/Makefile
index 379aa37..1986cfa 100644 (file)
--- a/package/wprobe/Makefile
+++ b/package/wprobe/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2008 OpenWrt.org
+#
+# Copyright (C) 2008-2010 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -9,6 +9,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=wprobe
 PKG_VERSION:=1
 
 PKG_NAME:=wprobe
 PKG_VERSION:=1

+PKG_RELEASE:=1

 
 PKG_BUILD_DEPENDS:=PACKAGE_wprobe-export:libipfix
 
 
 PKG_BUILD_DEPENDS:=PACKAGE_wprobe-export:libipfix
 


@@ -18,12 +19,21 @@ PKG_CONFIG_DEPENDS = \
 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

+# XXX: build failure on cris
+# wprobe-lib.c:145: error: 'packed' attribute ignored for field of type 'struct <anonymous>'
+# wprobe-lib.c:149: error: 'packed' attribute ignored for field of type 'struct <anonymous>'
+
+define Package/wprobe/Default
+  DEPENDS:=@(!(TARGET_ps3||TARGET_pxcab||cris)||BROKEN)
+endef
+

 define KernelPackage/wprobe
 define KernelPackage/wprobe

+$(call Package/wprobe/Default)

   SUBMENU:=Network Support
   SUBMENU:=Network Support

-  DEPENDS:=@LINUX_2_6

   TITLE:=Wireless driver probe infrastructure
   TITLE:=Wireless driver probe infrastructure

+  MAINTAINER:=Felix Fietkau <nbd@openwrt.org>

   FILES:= \
   FILES:= \

-       $(PKG_BUILD_DIR)/kernel/wprobe.$(LINUX_KMOD_SUFFIX)
+       $(PKG_BUILD_DIR)/kernel/wprobe.ko

   AUTOLOAD:=$(call AutoLoad,01,wprobe)
 endef
 
   AUTOLOAD:=$(call AutoLoad,01,wprobe)
 endef
 


@@ -32,9 +42,10 @@ define KernelPackage/wprobe/description
 endef
 
 define Package/wprobe-util
 endef
 
 define Package/wprobe-util

+$(call Package/wprobe/Default)

   SECTION:=net
   CATEGORY:=Network
   SECTION:=net
   CATEGORY:=Network

-  DEPENDS:=+kmod-wprobe +libnl-tiny
+  DEPENDS+=+kmod-wprobe +libnl-tiny

   TITLE:=Wireless measurement utility
 endef
 
   TITLE:=Wireless measurement utility
 endef
 


@@ -44,9 +55,10 @@ define Package/wprobe-util/description
 endef
 
 define Package/wprobe-export
 endef
 
 define Package/wprobe-export

+$(call Package/wprobe/Default)

   SECTION:=net
   CATEGORY:=Network
   SECTION:=net
   CATEGORY:=Network

-  DEPENDS:=+wprobe-util
+  DEPENDS+=+wprobe-util

   TITLE:=Wireless measurement data exporter
 endef
 
   TITLE:=Wireless measurement data exporter
 endef
 


@@ -55,19 +67,24 @@ define Package/wprobe-export/description
   wireless driver measurement data via the IPFIX protocol
 endef
 
   wireless driver measurement data via the IPFIX protocol
 endef
 

+define Package/wprobe-export/conffiles
+/etc/config/wprobe
+endef
+

 define Build/Prepare
        mkdir -p $(PKG_BUILD_DIR)
        $(CP) src/* $(PKG_BUILD_DIR)/
 endef
 
 TARGET_CPPFLAGS := \
 define Build/Prepare
        mkdir -p $(PKG_BUILD_DIR)
        $(CP) src/* $(PKG_BUILD_DIR)/
 endef
 
 TARGET_CPPFLAGS := \

+       -D_GNU_SOURCE \

        -I$(STAGING_DIR)/usr/include/libnl-tiny \
        $(TARGET_CPPFLAGS)
 
 ifdef CONFIG_PACKAGE_kmod-wprobe
   define Build/Compile/kmod
        $(MAKE) -C $(LINUX_DIR) \
        -I$(STAGING_DIR)/usr/include/libnl-tiny \
        $(TARGET_CPPFLAGS)
 
 ifdef CONFIG_PACKAGE_kmod-wprobe
   define Build/Compile/kmod
        $(MAKE) -C $(LINUX_DIR) \

-               CROSS_COMPILE="$(TARGET_CROSS)" \
+               CROSS_COMPILE="$(KERNEL_CROSS)" \

                ARCH="$(LINUX_KARCH)" \
                SUBDIRS="$(PKG_BUILD_DIR)/kernel" \
                KERNELDIR=$(LINUX_DIR) \
                ARCH="$(LINUX_KARCH)" \
                SUBDIRS="$(PKG_BUILD_DIR)/kernel" \
                KERNELDIR=$(LINUX_DIR) \