projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[package] firewall: don't setup nat reflection if negations are used
[openwrt.git]
/
package
/
wprobe
/
Makefile
diff --git
a/package/wprobe/Makefile
b/package/wprobe/Makefile
index 69c450767089aff9678e898a50018d30f29573af..65b85c235f335c8a5d27b6ab2e9d531436f56410 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,22
+9,31
@@
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=wprobe
PKG_VERSION:=1
PKG_NAME:=wprobe
PKG_VERSION:=1
+PKG_RELEASE:=1
-PKG_BUILD_DEPENDS:=libnl PACKAGE_wprobe-export:libipfix
+PKG_BUILD_DEPENDS:=PACKAGE_wprobe-export:libipfix
+
+PKG_CONFIG_DEPENDS = \
+ CONFIG_PACKAGE_kmod-wprobe \
+ CONFIG_PACKAGE_wprobe-export \
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/package.mk
-PKG_CONFDEPS = \
- CONFIG_PACKAGE_kmod-wprobe \
- CONFIG_PACKAGE_wprobe-export
+# 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>'
-STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,$(PKG_CONFDEPS))
+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
TITLE:=Wireless driver probe infrastructure
SUBMENU:=Network Support
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,22
+41,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
+ 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
+ DEPENDS
+=+wprobe-util
TITLE:=Wireless measurement data exporter
endef
TITLE:=Wireless measurement data exporter
endef
@@
-61,12
+72,15
@@
define Build/Prepare
$(CP) src/* $(PKG_BUILD_DIR)/
endef
$(CP) src/* $(PKG_BUILD_DIR)/
endef
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
+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) \
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,7
+96,8
@@
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)" \
- LIBNL="$(STAGING_DIR)/usr/lib/libnl.a"
+ HOST_OS=Linux \
+ LIBNL="-lnl-tiny"
endef
ifdef CONFIG_PACKAGE_wprobe-export
endef
ifdef CONFIG_PACKAGE_wprobe-export
@@
-92,7
+107,7
@@
ifdef CONFIG_PACKAGE_wprobe-export
CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/kernel -I$(PKG_BUILD_DIR)/user" \
LDFLAGS="$(TARGET_LDFLAGS)" \
CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/kernel -I$(PKG_BUILD_DIR)/user" \
LDFLAGS="$(TARGET_LDFLAGS)" \
- LIBS="$(PKG_BUILD_DIR)/user/libwprobe.a $(STAGING_DIR)/usr/lib/libipfix.a $(STAGING_DIR)/usr/lib/libmisc.a
$(STAGING_DIR)/usr/lib/libnl.a
-lm"
+ LIBS="$(PKG_BUILD_DIR)/user/libwprobe.a $(STAGING_DIR)/usr/lib/libipfix.a $(STAGING_DIR)/usr/lib/libmisc.a
-lnl-tiny
-lm"
endef
endif
endef
endif
@@
-103,21
+118,22
@@
define Build/Compile
endef
define Build/InstallDev
endef
define Build/InstallDev
- $(INSTALL_DIR) $(1)/usr/include
- $(CP) $(PKG_BUILD_DIR)/kernel/linux $(1)/usr/include
+ $(INSTALL_DIR) $(1)/usr/include
/wprobe
+ $(CP) $(PKG_BUILD_DIR)/kernel/linux $(1)/usr/include
/wprobe
endef
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))