X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/51a182a864efe986da327fc07a1e4a12dadd8ed3..85545a1d5a01821af290e54c7efbfc05d5a1d6f7:/package/wprobe/Makefile?ds=inline diff --git a/package/wprobe/Makefile b/package/wprobe/Makefile index bbc2b88c9..02e9919aa 100644 --- a/package/wprobe/Makefile +++ b/package/wprobe/Makefile @@ -10,18 +10,17 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wprobe PKG_VERSION:=1 -PKG_BUILD_DEPENDS:=libnl PACKAGE_wprobe-export:libipfix +PKG_BUILD_DEPENDS:=PACKAGE_wprobe-export:libipfix -include $(INCLUDE_DIR)/package.mk - -PKG_CONFDEPS = \ +PKG_CONFIG_DEPENDS = \ CONFIG_PACKAGE_kmod-wprobe \ - CONFIG_PACKAGE_wprobe-export + CONFIG_PACKAGE_wprobe-export \ -STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,$(PKG_CONFDEPS)) +include $(INCLUDE_DIR)/package.mk define KernelPackage/wprobe SUBMENU:=Network Support + DEPENDS:=@LINUX_2_6 TITLE:=Wireless driver probe infrastructure FILES:= \ $(PKG_BUILD_DIR)/kernel/wprobe.$(LINUX_KMOD_SUFFIX) @@ -32,22 +31,22 @@ define KernelPackage/wprobe/description A module that exports measurement data from wireless driver to user space endef -define Package/wprobe-info +define Package/wprobe-util SECTION:=net CATEGORY:=Network - DEPENDS:=+kmod-wprobe + DEPENDS:=+kmod-wprobe +libnl-tiny 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 SECTION:=net CATEGORY:=Network - DEPENDS:=+kmod-wprobe + DEPENDS:=+wprobe-util TITLE:=Wireless measurement data exporter endef @@ -61,12 +60,14 @@ define Build/Prepare $(CP) src/* $(PKG_BUILD_DIR)/ endef -TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include +TARGET_CPPFLAGS := \ + -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) \ @@ -82,7 +83,8 @@ define Build/Compile/lib 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 @@ -92,7 +94,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)" \ - 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 @@ -107,17 +109,18 @@ define Build/InstallDev $(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_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 - $(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)) -$(eval $(call BuildPackage,wprobe-info)) +$(eval $(call BuildPackage,wprobe-util)) $(eval $(call BuildPackage,wprobe-export))