X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8f7f273fa4ce32e983f4437a7efa89d75062a2f9..7022807357223f27577ad44df6800ef73b6ea22c:/package/wprobe/Makefile

diff --git a/package/wprobe/Makefile b/package/wprobe/Makefile
index 1e32eee0c..85667b771 100644
--- a/package/wprobe/Makefile
+++ b/package/wprobe/Makefile
@@ -18,7 +18,16 @@ PKG_CONFIG_DEPENDS = \
 
 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
+$(call Package/wprobe/Default)
   SUBMENU:=Network Support
   TITLE:=Wireless driver probe infrastructure
   FILES:= \
@@ -31,9 +40,10 @@ define KernelPackage/wprobe/description
 endef
 
 define Package/wprobe-util
+$(call Package/wprobe/Default)
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+kmod-wprobe +libnl-tiny
+  DEPENDS+=+kmod-wprobe +libnl-tiny
   TITLE:=Wireless measurement utility
 endef
 
@@ -43,9 +53,10 @@ define Package/wprobe-util/description
 endef
 
 define Package/wprobe-export
+$(call Package/wprobe/Default)
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+wprobe-util
+  DEPENDS+=+wprobe-util
   TITLE:=Wireless measurement data exporter
 endef
 
@@ -60,13 +71,14 @@ define Build/Prepare
 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) \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
+		CROSS_COMPILE="$(KERNEL_CROSS)" \
 		ARCH="$(LINUX_KARCH)" \
 		SUBDIRS="$(PKG_BUILD_DIR)/kernel" \
 		KERNELDIR=$(LINUX_DIR) \
@@ -115,7 +127,7 @@ endef
 
 define Package/wprobe-export/install
 	$(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d $(1)/etc/config
-	$(INSTALL_BIN) ./files/wprobe.init $(1)/etc/init.d/
+	$(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