[package] broadcom-wl: check iface pid file when invoking nas, fixes starting nas...

[openwrt.git] / package / wprobe / Makefile

diff --git a/package/wprobe/Makefile b/package/wprobe/Makefile
index 7b49b65..9e0b11a 100644 (file)
--- a/package/wprobe/Makefile
+++ b/package/wprobe/Makefile
@@ -18,9 +18,19 @@ 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:=@LINUX_2_6 @(!(TARGET_ps3||TARGET_pxcab||cris)||BROKEN)
+endef
+

 define KernelPackage/wprobe
 define KernelPackage/wprobe

+$(call Package/wprobe/Default)

   SUBMENU:=Network Support
   TITLE:=Wireless driver probe infrastructure
   SUBMENU:=Network Support
   TITLE:=Wireless driver probe infrastructure

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

   FILES:= \
        $(PKG_BUILD_DIR)/kernel/wprobe.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,01,wprobe)
   FILES:= \
        $(PKG_BUILD_DIR)/kernel/wprobe.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,01,wprobe)


@@ -30,22 +40,24 @@ define KernelPackage/wprobe/description
   A module that exports measurement data from wireless driver to user space
 endef
 
   A module that exports measurement data from wireless driver to user space
 endef
 

-define Package/wprobe-info
+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
 

-define Package/wprobe-info/description
-  wprobe-info uses the wprobe kernel module to query
+define Package/wprobe-util/description
+  wprobe-util uses the wprobe kernel module to query

   wireless driver measurement data from an interface
 endef
 
 define Package/wprobe-export
   wireless driver measurement data from an interface
 endef
 
 define Package/wprobe-export

+$(call Package/wprobe/Default)

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

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

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


@@ -59,14 +71,15 @@ define Build/Prepare
        $(CP) src/* $(PKG_BUILD_DIR)/
 endef
 
        $(CP) src/* $(PKG_BUILD_DIR)/
 endef
 

-TARGET_CFLAGS += \
+TARGET_CPPFLAGS := \
+       -D_GNU_SOURCE \

        -I$(STAGING_DIR)/usr/include/libnl-tiny \
        -I$(STAGING_DIR)/usr/include/libnl-tiny \

-       -I$(STAGING_DIR)/usr/include
+       $(TARGET_CPPFLAGS)

 
 ifdef CONFIG_PACKAGE_kmod-wprobe
   define Build/Compile/kmod
        $(MAKE) -C $(LINUX_DIR) \
 
 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) \


@@ -82,6 +95,7 @@ define Build/Compile/lib
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/kernel" \
                LDFLAGS="$(TARGET_LDFLAGS)" \
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/kernel" \
                LDFLAGS="$(TARGET_LDFLAGS)" \

+               HOST_OS=Linux \

                LIBNL="-lnl-tiny"
 endef
 
                LIBNL="-lnl-tiny"
 endef
 


@@ -107,17 +121,18 @@ define Build/InstallDev
        $(CP) $(PKG_BUILD_DIR)/kernel/linux $(1)/usr/include/wprobe
 endef
 
        $(CP) $(PKG_BUILD_DIR)/kernel/linux $(1)/usr/include/wprobe
 endef
 

-define Package/wprobe-info/install
+define Package/wprobe-util/install

        $(INSTALL_DIR) $(1)/sbin
        $(INSTALL_DIR) $(1)/sbin

-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/user/wprobe-info $(1)/sbin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/user/wprobe-util $(1)/sbin/

 endef
 
 define Package/wprobe-export/install
 endef
 
 define Package/wprobe-export/install

-       $(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d
-       $(INSTALL_BIN) ./files/wprobe.init $(1)/etc/init.d/
+       $(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d $(1)/etc/config
+       $(INSTALL_BIN) ./files/wprobe.init $(1)/etc/init.d/wprobe
+       $(INSTALL_BIN) ./files/wprobe.config $(1)/etc/config/wprobe

        $(INSTALL_BIN) $(PKG_BUILD_DIR)/exporter/wprobe-export $(1)/sbin/
 endef
 
 $(eval $(call KernelPackage,wprobe))
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/exporter/wprobe-export $(1)/sbin/
 endef
 
 $(eval $(call KernelPackage,wprobe))

-$(eval $(call BuildPackage,wprobe-info))
+$(eval $(call BuildPackage,wprobe-util))

 $(eval $(call BuildPackage,wprobe-export))
 $(eval $(call BuildPackage,wprobe-export))