ieee1905: 3.0.1

This commit is contained in:
Anjan Chanda 2021-05-31 20:43:15 +02:00
parent 8539d6cfe8
commit d3dbf90646
4 changed files with 75 additions and 68 deletions

10
ieee1905/Config.in Normal file
View file

@ -0,0 +1,10 @@
if (PACKAGE_ieee1905)
menu "Configurations"
config IEEE1905_EXTENSION_ALLOWED
bool "Allow plugins to extend 1905 CMDUs and/or TLVs"
default y
endmenu
endif

View file

@ -5,12 +5,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ieee1905
PKG_VERSION:=3.0.0
PKG_VERSION:=3.0.1
LOCAL_DEV=0
ifneq ($(LOCAL_DEV),1)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=0240a89d71fcbbcf9641c253d97b642d93ea96aa
PKG_SOURCE_VERSION:=4e3191852174b24e4bdf2035846058f100d18609
PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
PKG_MIRROR_HASH:=skip
@ -23,29 +23,46 @@ PKG_LICENSE_FILES:=LICENSE
include $(INCLUDE_DIR)/package.mk
define Package/ieee1905/Default
SECTION:=utils
CATEGORY:=Utilities
SUBMENU:=IEEE-1905.1 stack
endef
define Package/ieee1905/config
source "$(SOURCE)/Config.in"
endef
define Package/libieee1905
$(call Package/ieee1905/Default,$(1))
TITLE+= (library for CMDU and TLV handling)
DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl +libwifi \
+libjson-c +libblobmsg-json
endef
define Package/ieee1905
SECTION:=utils
CATEGORY:=Utilities
TITLE:=Project i1905
DEPENDS:=+libwifi +libuci +libubox +ubus +libpthread +libnl-genl +libmidgen
$(call Package/ieee1905/Default,$(1))
TITLE+= ieee1905d (daemon implementing 1905.1 and provides cli)
DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl +libwifi \
+libjson-c +libblobmsg-json +libwifi +ubus +libpthread \
+libnl-genl +libieee1905
endef
define Package/libi1905
SECTION:=utils
CATEGORY:=Utilities
TITLE:=i1905 library
DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl +libwifi +libjson-c +libblobmsg-json +libmidgen
endef
define Package/libmidgen
SECTION:=utils
CATEGORY:=Utilities
TITLE:=i1905 addition library
DEPENDS= +libpthread +libubox +libuci +libubus +libeasy +libnl-genl +libwifi +libjson-c +libblobmsg-json
define Package/map-plugin
$(call Package/ieee1905/Default,$(1))
TITLE:=Multi-AP (Easymesh) plugin
DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl +libwifi \
+libjson-c +libblobmsg-json +ieee1905 +libieee1905
endef
define Package/ieee1905/description
This package provides i1905
This package provides IEEE Std 1905.1 stack.
endef
define Package/libieee1905/description
This package provides library functions for IEEE Std 1905.1 stack.
endef
TARGET_CFLAGS += \
@ -56,77 +73,57 @@ TARGET_CFLAGS += \
MAKE_PATH:=src
LIBS := \
$(if $(CONFIG_PACKAGE_libi1905),libi1905) \
$(if $(CONFIG_PACKAGE_libmidgen),libmidgen)
ifeq ($(LOCAL_DEV),1)
define Build/Prepare
rsync -r --exclude=.* ~/git/prj-unish/ $(PKG_BUILD_DIR)/
endef
endif
#define Build/InstallDev
# #$(INSTALL_DIR) $(STAGING_DIR)/usr/include
# #$(CP) $(PKG_BUILD_DIR)/src/cmdu.h $(STAGING_DIR)/usr/include/
# $(INSTALL_DIR) $(1)/usr/include
# $(INSTALL_DIR) $(1)/usr/lib
# $(CP) $(PKG_BUILD_DIR)/src/cmdu.h $(1)/usr/include/
# $(CP) $(PKG_BUILD_DIR)/src/lib*.so* $(1)/usr/lib/
# $(CP) $(PKG_BUILD_DIR)/src/extensions/map/map2.h $(1)/usr/include/
# $(CP) $(PKG_BUILD_DIR)/src/extensions/map/map_module.h $(1)/usr/include/
# $(CP) $(PKG_BUILD_DIR)/src/extensions/map/lib*.so* $(1)/usr/lib/
#endef
define Package/ieee1905/install
$(CP) ./files/* $(1)/
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_DIR) $(1)/usr/lib/ieee1905
# $(CP) $(PKG_BUILD_DIR)/src/lib*.so* $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/i1905d $(1)/usr/sbin/
$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ieee1905d $(1)/usr/sbin/
endef
define Package/libi1905/install
define Package/libieee1905/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/src/libi1905.so $(1)/usr/lib/
$(CP) $(PKG_BUILD_DIR)/src/libieee1905.so $(1)/usr/lib/
$(CP) $(PKG_BUILD_DIR)/src/libmidgen.so $(1)/usr/lib/
endef
define Package/map-plugin/install
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_DIR) $(1)/usr/lib/ieee1905
$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
endef
define Build/InstallDev/map-plugin
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_DIR) $(1)/usr/include
$(INSTALL_DIR) $(1)/usr/lib/ieee1905
$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map2.h $(1)/usr/include/map22.h
$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map_module.h $(1)/usr/include/map_module22.h
$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
endef
define Package/libmidgen/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/src/libmidgen.so $(1)/usr/lib/
endef
define Build/InstallDev/libmidgen
define Build/InstallDev/libieee1905
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/src/libmidgen.so $(1)/usr/lib/
endef
define Build/InstallDev/libi1905
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_DIR) $(1)/usr/lib/i1905
$(INSTALL_DIR) $(1)/usr/include
$(INSTALL_DIR) $(1)/usr/lib/ieee1905
$(CP) $(PKG_BUILD_DIR)/src/cmdu.h $(1)/usr/include/
$(CP) $(PKG_BUILD_DIR)/src/1905_tlvs.h $(1)/usr/include/
$(CP) $(PKG_BUILD_DIR)/src/i1905_wsc.h $(1)/usr/include/
$(CP) $(PKG_BUILD_DIR)/src/bufutil.h $(1)/usr/include/
$(CP) $(PKG_BUILD_DIR)/src/timer_impl.h $(1)/usr/include/
$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map2.h $(1)/usr/include/map22.h
$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/i1905/map.so
$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map_module.h $(1)/usr/include/map_module22.h
$(CP) $(PKG_BUILD_DIR)/src/libi1905.so $(1)/usr/lib/
$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
$(CP) $(PKG_BUILD_DIR)/src/libmidgen.so $(1)/usr/lib/
$(CP) $(PKG_BUILD_DIR)/src/libieee1905.so $(1)/usr/lib/
endef
define Build/InstallDev
$(foreach lib,$(LIBS),$(call Build/InstallDev/$(lib),$(1),$(2));)
$(call Build/InstallDev/libieee1905,$(1),$(2))
$(call Build/InstallDev/map-plugin,$(1),$(2))
endef
$(eval $(call BuildPackage,ieee1905))
$(eval $(call BuildPackage,libi1905))
$(eval $(call BuildPackage,libmidgen))
$(eval $(call BuildPackage,libieee1905))
$(eval $(call BuildPackage,map-plugin))

View file

@ -20,4 +20,4 @@ config ap
config al-iface
option enabled 1
option ifname 'br-lan'
option type 'bridge
option type 'bridge'

View file

@ -7,7 +7,7 @@ USE_PROCD=1
start_service() {
procd_open_instance
procd_set_param command "/usr/sbin/i1905d"
procd_set_param command "/usr/sbin/ieee1905d"
procd_set_param respawn
# procd_set_param stdout 1
# procd_set_param stderr 1