[CI] Update changelog for release master_v0.11.0

GitOrigin-RevId: eaa321c4a9a796b112a3b8b833d5995f7c29917e
Integrating libgmap-client to master_v0.5.0
2026-01-07 23:01:39 +08:00 · 2022-09-02 07:26:25 +00:00 · 2022-09-02 07:26:23 +00:00 · 2022-08-30 14:02:44 +00:00 · 2022-08-30 14:02:42 +00:00 · 2022-08-30 14:02:39 +00:00
11 changed files with 280 additions and 38 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,79 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]


+## Release v0.11.0 - 2022-09-02(07:26:08 +0000)
+
+### New
+
+- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): [prpl][gMap]RPC topology missing
+
+## Release v0.10.6 - 2022-08-30(14:01:45 +0000)
+
+### Other
+
+- [gmap-client](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client): Gmap: Fix default and make gmap default startup priority configurable
+- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): Add missing requires
+- [gmap-mod-name-selector](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector): Add missing requires
+- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self): Add missing requires
+- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): Gmap: Fix default and make gmap default startup priority configurable
+- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): Gmap: Fix default and make gmap default startup priorityr configurable
+
+## Release v0.10.5 - 2022-08-22(15:48:10 +0000)
+
+### Other
+
+- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self): remove "wifirepeater" tag until clear why needed
+
+## Release v0.10.4 - 2022-08-09(10:47:53 +0000)
+
+### Other
+
+- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): Link dev<->port dynamically when all info is available
+
+## Release v0.10.3 - 2022-08-08(16:23:26 +0000)
+
+### Other
+
+- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): Implement using UUIDs for device keys
+- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): [prpl][gMap] gMap queries must be evaluated in the gMap server(not the lib)
+- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): [CI] Fix missing dependencies on uuid
+- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): [prpl][gMap] gMap queries must be evaluated in the gMap server(not the lib)
+
+## Release v0.10.2 - 2022-08-04(09:20:50 +0000)
+
+### Other
+
+- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): LAN Device must have a uuid as unique (instance)key
+- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): LAN Device must have a uuid as unique (instance)key
+
+## Release v0.10.1 - 2022-07-29(09:23:27 +0000)
+
+### Other
+
+- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): test mib loading + move testhelper functions to correct test file
+
+## Release v0.10.0 - 2022-07-27(09:40:31 +0000)
+
+### New
+
+- [gmap-client](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client): Component added
+
+### Other
+
+- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): [Gitlab CI][Unit tests][valgrind] Pipeline doesn't stop when memory leaks are detected
+- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): [prpl][gMap] gMap needs to be split in a gMap-core and gMap-client process
+- [gmap-mod-name-selector](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector): [prpl][gMap] gMap needs to be split in a gMap-core and gMap-client process
+- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self): [prpl][gMap] gMap needs to be split in a gMap-core and gMap-client process
+- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): [prpl][gMap] gMap needs to be split in a gMap-core and gMap-client process
+
+## Release v0.9.2 - 2022-07-14(12:54:08 +0000)
+
+### Other
+
+- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): Revert "common: add workaround method for retrieving intf from ifindex"
+- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self): Switch to using netmodel and amxs
+- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): Fix `gmap_devices_unlink` doing nothing
+
 ## Release v0.9.1 - 2022-06-01(13:06:16 +0000)

 ### Fixes
--- a/README.md
+++ b/README.md
@@ -6,11 +6,15 @@ SoftAtHome feed of Openwrt packages for gMap components.

 Feed_gmap includes the following components:

+### Plugins
+
+- [gmap-client](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client) - gMap client plugin
+
 ### Applications

 - [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev) - gMap component that adds discovered devices to the gmap datamodel and links them to the correct interface
 - [gmap-mod-name-selector](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector) - Name selection module for gmap
- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self) - gmap module to fetch information about the hgw itself and the layer 2 'devices' on it
+- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self) - gmap module to fetch information about the hgw/repeater itself and the layer 2 'devices' on it
 - [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server) - Service implementing the gmap data model

 ### Configurations
--- a/apps/gmap-client/Config.in
+++ b/apps/gmap-client/Config.in
@@ -0,0 +1,24 @@
+config PACKAGE_gmap-client
+    tristate
+    select SAH_AMX_GMAP_CLIENT
+
+if PACKAGE_gmap-client
+
+menu "Select gmap-client build options"
+    depends on PACKAGE_gmap-client
+
+config SAH_AMX_GMAP_CLIENT
+    bool "Build the gMap client plugin"
+    default y
+
+config SAH_AMX_GMAP_CLIENT_ORDER
+    int "gMap client plugin startup order"
+    default 82
+
+config SAH_AMX_GMAP_CLIENT_ONE_PROCESS
+    bool "All gMap client modules run in same process"
+    default y
+
+endmenu
+
+endif
--- a/apps/gmap-client/Makefile
+++ b/apps/gmap-client/Makefile
@@ -0,0 +1,74 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gmap-client
+PKG_VERSION:=v1.0.2
+SHORT_DESCRIPTION:=gMap client plugin
+
+PKG_SOURCE:=gmap-client-v1.0.2.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client/-/archive/v1.0.2
+PKG_HASH:=64da2099fe3187a58dee518aab979daf092cec8fe8e03796e96af622765f1f91
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-client-v1.0.2
+PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
+PKG_LICENSE:=BSD-2-Clause-Patent
+PKG_LICENSE_FILES:=LICENSE
+
+COMPONENT:=gmap-client
+
+PKG_RELEASE:=1
+
+define SAHInit/Install
+	install -d ${PKG_INSTALL_DIR}/etc/rc.d/
+	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/etc/rc.d/S$(CONFIG_SAH_AMX_GMAP_CLIENT_ORDER)$(COMPONENT)
+endef
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+  CATEGORY:=gmap
+  SUBMENU:=Plugins
+  TITLE:=$(SHORT_DESCRIPTION)
+  URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client
+  DEPENDS += +libamxc
+  DEPENDS += +libamxp
+  DEPENDS += +libamxd
+  DEPENDS += +libamxb
+  DEPENDS += +libamxo
+  DEPENDS += +libsahtrace
+  DEPENDS += +amxrt
+  DEPENDS += +gmap-server
+  MENU:=1
+endef
+
+define Package/$(PKG_NAME)/description
+	gMap client plugin
+endef
+
+define Build/Compile
+	$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_AMX_GMAP_CLIENT_ORDER=$(CONFIG_SAH_AMX_GMAP_CLIENT_ORDER) CONFIG_SAH_AMX_GMAP_CLIENT_ONE_PROCESS=$(CONFIG_SAH_AMX_GMAP_CLIENT_ONE_PROCESS))
+endef
+
+define Build/Install
+	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_AMX_GMAP_CLIENT_ORDER=$(CONFIG_SAH_AMX_GMAP_CLIENT_ORDER) CONFIG_SAH_AMX_GMAP_CLIENT_ONE_PROCESS=$(CONFIG_SAH_AMX_GMAP_CLIENT_ONE_PROCESS))
+	find $(PKG_INSTALL_DIR) -name *.a -exec rm {} +;
+	find $(PKG_INSTALL_DIR) -name *.h -exec rm {} +;
+	find $(PKG_INSTALL_DIR) -name *.pc -exec rm {} +;
+
+	$(call SAHInit/Install)
+endef
+
+define Build/InstallDev
+	$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_AMX_GMAP_CLIENT_ORDER=$(CONFIG_SAH_AMX_GMAP_CLIENT_ORDER) CONFIG_SAH_AMX_GMAP_CLIENT_ONE_PROCESS=$(CONFIG_SAH_AMX_GMAP_CLIENT_ONE_PROCESS))
+endef
+
+define Package/$(PKG_NAME)/install
+	if [ -d ./files ]; then \
+		$(CP) ./files/* $(1)/; \
+	fi
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+endef
+
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
--- a/apps/gmap-mod-ethernet-dev/Makefile
+++ b/apps/gmap-mod-ethernet-dev/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-mod-ethernet-dev
-PKG_VERSION:=v0.1.2
+PKG_VERSION:=v1.0.3
 SHORT_DESCRIPTION:=gMap component that adds discovered devices to the gmap datamodel and links them to the correct interface

-PKG_SOURCE:=gmap-mod-ethernet-dev-v0.1.2.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/archive/v0.1.2
-PKG_HASH:=42e36b00280b955bf7f155b90fc9ba85465e5b1a13014d377bea360eeb085ff2
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v0.1.2
+PKG_SOURCE:=gmap-mod-ethernet-dev-v1.0.3.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/archive/v1.0.3
+PKG_HASH:=66aefe4d996fe9bb3fa838ee64239a409cd3bfdb46a3a48ebe83e9706065fb8d
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v1.0.3
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -53,6 +53,9 @@ define Build/InstallDev
 endef

 define Package/$(PKG_NAME)/install
+	if [ -d ./files ]; then \
+		$(CP) ./files/* $(1)/; \
+	fi
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef

--- a/apps/gmap-mod-name-selector/Makefile
+++ b/apps/gmap-mod-name-selector/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-mod-name-selector
-PKG_VERSION:=v0.1.3
+PKG_VERSION:=v1.0.1
 SHORT_DESCRIPTION:=Name selection module for gmap

-PKG_SOURCE:=gmap-mod-name-selector-v0.1.3.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector/-/archive/v0.1.3
-PKG_HASH:=847e280022800a2accca983937ef88c2c255448daa6e7c1838200e0a14a28213
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-name-selector-v0.1.3
+PKG_SOURCE:=gmap-mod-name-selector-v1.0.1.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector/-/archive/v1.0.1
+PKG_HASH:=cac734389d94a198f980ec4c39956655d0f12a1177fcb0d204a186df2becc206
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-name-selector-v1.0.1
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -52,6 +52,9 @@ define Build/InstallDev
 endef

 define Package/$(PKG_NAME)/install
+	if [ -d ./files ]; then \
+		$(CP) ./files/* $(1)/; \
+	fi
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef

--- a/apps/gmap-mod-self/Config.in
+++ b/apps/gmap-mod-self/Config.in
@@ -0,0 +1,20 @@
+config PACKAGE_gmap-mod-self
+    tristate
+    select SAH_SERVICES_GMAP-SELF
+
+if PACKAGE_gmap-mod-self
+
+menu "Select gmap-mod-self build options"
+    depends on PACKAGE_gmap-mod-self
+
+config SAH_SERVICES_GMAP-SELF
+    bool "Application for filling in the device's and it's interfaces information"
+    default y
+
+config SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER
+    bool "gmap-self runs on a wifi repeater"
+    default n
+
+endmenu
+
+endif
--- a/apps/gmap-mod-self/Makefile
+++ b/apps/gmap-mod-self/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-mod-self
-PKG_VERSION:=v0.0.16
-SHORT_DESCRIPTION:=gmap module to fetch information about the hgw itself and the layer 2 'devices' on it
+PKG_VERSION:=v1.0.2
+SHORT_DESCRIPTION:=gmap module to fetch information about the hgw/repeater itself and the layer 2 'devices' on it

-PKG_SOURCE:=gmap-mod-self-v0.0.16.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self/-/archive/v0.0.16
-PKG_HASH:=93f45e4d476c4867667c8cba2144fac178085cfa77dc612039050b35816f3602
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-self-v0.0.16
+PKG_SOURCE:=gmap-mod-self-v1.0.2.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self/-/archive/v1.0.2
+PKG_HASH:=fb408ea7025d21be662bfd5d42f60b6b566a240c5f31ad700c22b6617ecfbaf1
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-self-v1.0.2
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -27,32 +27,41 @@ define Package/$(PKG_NAME)
  DEPENDS += +libamxp
  DEPENDS += +libamxb
  DEPENDS += +libamxo
+  DEPENDS += +libamxs
  DEPENDS += +libgmap-client
  DEPENDS += +libsahtrace
+  DEPENDS += +libnetmodel
  MENU:=1
 endef

 define Package/$(PKG_NAME)/description
-	gmap module to fetch information about the hgw itself and the layer 2 'devices' on it
+	gmap module to fetch information about the hgw/repeater itself and the layer 2 'devices' on it
 endef

 define Build/Compile
-	$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+	$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER=$(CONFIG_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER))
 endef

 define Build/Install
-	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER=$(CONFIG_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER))
 	find $(PKG_INSTALL_DIR) -name *.a -exec rm {} +;
 	find $(PKG_INSTALL_DIR) -name *.h -exec rm {} +;
 	find $(PKG_INSTALL_DIR) -name *.pc -exec rm {} +;
 endef

 define Build/InstallDev
-	$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+	$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER=$(CONFIG_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER))
 endef

 define Package/$(PKG_NAME)/install
+	if [ -d ./files ]; then \
+		$(CP) ./files/* $(1)/; \
+	fi
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef

+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
 $(eval $(call BuildPackage,$(PKG_NAME)))
--- a/apps/gmap-server/Config.in
+++ b/apps/gmap-server/Config.in
@@ -0,0 +1,20 @@
+config PACKAGE_gmap-server
+    tristate
+    select SAH_AMX_GMAP_SERVER
+
+if PACKAGE_gmap-server
+
+menu "Select gmap-server build options"
+    depends on PACKAGE_gmap-server
+
+config SAH_AMX_GMAP_SERVER
+    bool "Build gMap server"
+    default y
+
+config SAH_AMX_GMAP_SERVER_ORDER
+    int "gMap server plugin startup order"
+    default 71
+
+endmenu
+
+endif
--- a/apps/gmap-server/Makefile
+++ b/apps/gmap-server/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-server
-PKG_VERSION:=v0.3.1
+PKG_VERSION:=v1.0.6
 SHORT_DESCRIPTION:=Service implementing the gmap data model

-PKG_SOURCE:=gmap-server-v0.3.1.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v0.3.1
-PKG_HASH:=ca6b60df08a8daff2ed88c7aebebcbc9fb102333d1ca7d293a7e588c7ec10c75
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v0.3.1
+PKG_SOURCE:=gmap-server-v1.0.6.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v1.0.6
+PKG_HASH:=ae5c57336b47779288f3197f6d00beb739170867c91ae75dcc79e85b2800689d
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v1.0.6
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -15,19 +15,20 @@ PKG_LICENSE_FILES:=LICENSE
 COMPONENT:=gmap-server

 PKG_RELEASE:=1
+PKG_BUILD_DEPENDS += util-linux

 define SAHInit/Install
 	install -d ${PKG_INSTALL_DIR}/etc/rc.d/
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/etc/rc.d/S71$(COMPONENT)
+	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/etc/rc.d/S$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER)$(COMPONENT)
 endef

 define SAHBackupRestore/Install
 	install -d ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/backup
 	install -d ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/restore
 	install -d ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/import
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/backup/B10$(COMPONENT)
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/restore/R10$(COMPONENT)
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/import/R10$(COMPONENT)
+	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/backup/B$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER)$(COMPONENT)
+	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/restore/R$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER)$(COMPONENT)
+	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/import/R$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER)$(COMPONENT)
 endef

 include $(INCLUDE_DIR)/package.mk
@@ -44,6 +45,7 @@ define Package/$(PKG_NAME)
  DEPENDS += +libamxo
  DEPENDS += +libgmap-client
  DEPENDS += +libsahtrace
+  DEPENDS += +libuuid
  MENU:=1
 endef

@@ -52,11 +54,11 @@ define Package/$(PKG_NAME)/description
 endef

 define Build/Compile
-	$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+	$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_AMX_GMAP_SERVER_ORDER=$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER))
 endef

 define Build/Install
-	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_AMX_GMAP_SERVER_ORDER=$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER))
 	find $(PKG_INSTALL_DIR) -name *.a -exec rm {} +;
 	find $(PKG_INSTALL_DIR) -name *.h -exec rm {} +;
 	find $(PKG_INSTALL_DIR) -name *.pc -exec rm {} +;
@@ -66,11 +68,18 @@ define Build/Install
 endef

 define Build/InstallDev
-	$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+	$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_AMX_GMAP_SERVER_ORDER=$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER))
 endef

 define Package/$(PKG_NAME)/install
+	if [ -d ./files ]; then \
+		$(CP) ./files/* $(1)/; \
+	fi
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef

+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
 $(eval $(call BuildPackage,$(PKG_NAME)))
--- a/libs/libgmap-client/Makefile
+++ b/libs/libgmap-client/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libgmap-client
-PKG_VERSION:=v0.3.1
+PKG_VERSION:=v0.5.0
 SHORT_DESCRIPTION:=Client library for gmap modules

-PKG_SOURCE:=libgmap-client-v0.3.1.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client/-/archive/v0.3.1
-PKG_HASH:=507f2181591ac8e5f95fba4d3d21f4eb5922ba2c57faa972883e72f4e8113848
-PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-client-v0.3.1
+PKG_SOURCE:=libgmap-client-v0.5.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client/-/archive/v0.5.0
+PKG_HASH:=081e41f699acae9760cd24b16d49a18d878f14b802ccebfab90a9afc1c753e07
+PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-client-v0.5.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -49,6 +49,9 @@ define Build/InstallDev
 endef

 define Package/$(PKG_NAME)/install
+	if [ -d ./files ]; then \
+		$(CP) ./files/* $(1)/; \
+	fi
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
Author	SHA1	Message	Date
sahbot	753f16ff35	[CI] Update changelog for release master_v0.11.0 GitOrigin-RevId: eaa321c4a9a796b112a3b8b833d5995f7c29917e	2022-09-02 07:26:25 +00:00
sahbot	8be01ae701	Integrating libgmap-client to master_v0.5.0 Issue: NET-3798 [prpl][gMap]RPC topology missing [new] GitOrigin-RevId: 29227e8747703c03be38857c2084e4482f0ef557	2022-09-02 07:26:23 +00:00
sahbot	71ed6a973c	[CI] Update changelog for release master_v0.10.6 GitOrigin-RevId: addbdded904c15362d82d1cfffdf2c1580d667b5	2022-08-30 14:02:44 +00:00
sahbot	d336adb06a	Integrating gmap-server to master_v1.0.6 Issue: NET-3941 Gmap: Fix default and make gmap default startup priority configurable GitOrigin-RevId: 9ce1d07b3fef69e2761ebba5b0812ecba029fcf9	2022-08-30 14:02:42 +00:00
sahbot	a189a9c10a	Integrating gmap-server to master_v1.0.5 Issue: NET-3941 Gmap: Fix default and make gmap default startup priority configurable GitOrigin-RevId: 751c8d4b863469c698e5849f4dacd903f240a0af	2022-08-30 14:02:39 +00:00
sahbot	0bef9da946	Integrating gmap-client to master_v1.0.2 Issue: NET-3941 Gmap: Fix default and make gmap default startup priority configurable GitOrigin-RevId: 50e89bf443e85d5e69ad8f56dda5111af0574140	2022-08-30 14:02:37 +00:00
sahbot	08d525dadc	Integrating gmap-mod-ethernet-dev to master_v1.0.3 Issue: NET-3935 Add missing requires GitOrigin-RevId: 7ae8c788975c7b79a02fa62f5a0e361a723125c8	2022-08-30 14:02:34 +00:00
sahbot	ed79df303b	Integrating gmap-mod-self to master_v1.0.2 Issue: NET-3935 Add missing requires GitOrigin-RevId: bdbb98300e47d0a481ea037e504740811d914cbe	2022-08-30 14:02:31 +00:00
sahbot	9ed410b2d1	Integrating gmap-mod-name-selector to master_v1.0.1 Issue: NET-3935 Add missing requires GitOrigin-RevId: bdd038de0797f8e3cecaf730d3a138f024061287	2022-08-30 14:02:28 +00:00
sahbot	fa12a660e4	[CI] Update changelog for release master_v0.10.5 GitOrigin-RevId: e5c8154ba4999fa19f0ea0e9a3666f6be478173c	2022-08-22 15:48:43 +00:00
sahbot	4302a59e68	Integrating gmap-mod-self to master_v1.0.1 Issue: NET-3861 remove "wifirepeater" tag until clear why needed GitOrigin-RevId: bec12dec653ec31c5446abd58ba01c4f9e5d10cd	2022-08-22 15:48:14 +00:00
sahbot	d4aa5958f0	[CI] Update changelog for release master_v0.10.4 GitOrigin-RevId: 4de2510ae0e15b4c7365511bd5fe733750100693	2022-08-09 10:52:02 +00:00
sahbot	1be2d7c0db	Integrating gmap-mod-ethernet-dev to master_v1.0.2 Issue: NET-3840 Link dev<->port dynamically when all info is available GitOrigin-RevId: c549d98779a6b1b81ebdd525f8f16439eabe2ce3	2022-08-09 10:51:59 +00:00
sahbot	d7bfe9ee00	[CI] Update changelog for release master_v0.10.3 GitOrigin-RevId: b7c1f796d9178d73263a9d7538ec66d1a11a250d	2022-08-08 16:23:54 +00:00
sahbot	dc21889b44	Integrating gmap-server to master_v1.0.4 Issue: NET-3708 Implement using UUIDs for device keys Issue: NET-3715 [prpl][gMap] gMap queries must be evaluated in the gMap server(not the lib) GitOrigin-RevId: 05daee3a292c73fd7623a42ad8ffd5334b944f1f	2022-08-08 16:23:51 +00:00
sahbot	2d5d3d3f5e	Integrating libgmap-client to master_v0.4.1 Issue: NET-3715 [prpl][gMap] gMap queries must be evaluated in the gMap server(not the lib) GitOrigin-RevId: d6de2a6649a5fb6ec1b70e625557e5b8756ced96	2022-08-08 16:23:47 +00:00
sahbot	c2946febb4	[CI] Update changelog for release master_v0.10.2 GitOrigin-RevId: 21dbb48fe33a886479c0f2662d6834fba0d5f7a5	2022-08-04 09:21:40 +00:00
sahbot	5a65cdf7f4	Integrating gmap-mod-ethernet-dev to master_v1.0.1 Issue: NET-3708 LAN Device must have a uuid as unique (instance)key GitOrigin-RevId: fde8ae20fa184ecf79c5c70b4c42c4020b53cbc3	2022-08-04 09:21:38 +00:00
sahbot	f999d27af4	Integrating libgmap-client to master_v0.4.0 Issue: NET-3708 LAN Device must have a uuid as unique (instance)key GitOrigin-RevId: e7c23d711a8dcb2ca357af9e5f0e44d038904cc3	2022-08-04 09:21:36 +00:00
sahbot	14a3f7c807	[CI] Update changelog for release master_v0.10.1 GitOrigin-RevId: bf36d358922fa87f3d74497ed71f3b6f489eeee6	2022-07-29 09:24:20 +00:00
sahbot	ba08b5b3ea	Integrating gmap-server to master_v1.0.1 Issue: NET-3708 test mib loading + move testhelper functions to correct test file GitOrigin-RevId: 55038584e4939c1887ffd11624437a41f271a8f6	2022-07-28 13:15:18 +00:00
sahbot	dd78e96a15	[CI] Update changelog for release master_v0.10.0 GitOrigin-RevId: e38eb2fc79fb9d0411a5811829c3595b0d2ecd8f	2022-07-27 09:41:18 +00:00
Matthias FRANCK	243cd73f49	Add gmap-client GitOrigin-RevId: 8cee177c8b114ac6cf282771f72732bf9d66c392	2022-07-27 09:38:47 +00:00
sahbot	79822389ed	Integrating gmap-mod-name-selector to master_v1.0.0 Issue: NET-3709 [prpl][gMap] gMap needs to be split in a gMap-core and gMap-client process GitOrigin-RevId: 18ed457323dcb053fd9b46852365bdccdb2c6ebc	2022-07-26 16:54:23 +00:00
sahbot	78eb8c3580	Integrating gmap-server to master_v1.0.0 Issue: NET-3709 [prpl][gMap] gMap needs to be split in a gMap-core and gMap-client process GitOrigin-RevId: e2744f143499c4b6461cf53beaa36957500502da	2022-07-26 14:37:19 +00:00
sahbot	095c9efc8b	Integrating gmap-mod-self to master_v1.0.0 Issue: NET-3709 [prpl][gMap] gMap needs to be split in a gMap-core and gMap-client process GitOrigin-RevId: 15b7439779deac9e5950130131afa2ea1112c9db	2022-07-26 12:04:22 +00:00
sahbot	eadbbd293c	Integrating gmap-mod-ethernet-dev to master_v1.0.0 Issue: NET-3709 [prpl][gMap] gMap needs to be split in a gMap-core and gMap-client process GitOrigin-RevId: 170b8fd95bb00bc594b86ae890b122ff23532cfa	2022-07-26 10:27:25 +00:00
sahbot	40ca080fdc	Integrating gmap-mod-ethernet-dev to master_v0.1.4 Issue: HOP-379 [Gitlab CI][Unit tests][valgrind] Pipeline doesn't stop when memory leaks are detected [other] GitOrigin-RevId: 6ec2c3b03ee06983aba9992ca190327c6c854f35	2022-07-15 07:25:59 +00:00
sahbot	bb0c187e82	[CI] Update changelog for release master_v0.9.2 GitOrigin-RevId: 76a2f68880de2ad4eebc8686b3d3fa49e712d904	2022-07-14 12:54:57 +00:00
sahbot	f08f131df6	Integrating gmap-mod-ethernet-dev to master_v0.1.3 Issue: NET-3676 Revert "common: add workaround method for retrieving intf from ifindex" GitOrigin-RevId: a257f233197ce970f4fce751b1d8a43afb7c8709	2022-07-14 12:54:54 +00:00
sahbot	f1c7298573	[CI] Update autogenerated files GitOrigin-RevId: a8aa8220e17bd2b4ade457470752fe62bf82d315	2022-07-14 11:18:32 +00:00
sahbot	8899835537	Integrating gmap-mod-self to master_v0.0.17 Issue: NET-3676 Switch to using netmodel and amxs GitOrigin-RevId: 3947f588ce59febdcfccbbcd95c1011b22b7291b	2022-07-14 11:18:30 +00:00
sahbot	b1a4113534	Integrating libgmap-client to master_v0.3.2 Issue: NET-3676 Fix `gmap_devices_unlink` doing nothing GitOrigin-RevId: 7a96cfd261f2b3b6b54426947b6f2403673d3ebd	2022-07-12 17:02:29 +00:00