[CI] Update changelog for release master_v0.10.4

GitOrigin-RevId: 4de2510ae0e15b4c7365511bd5fe733750100693
Integrating gmap-mod-ethernet-dev to master_v1.0.2
2025-12-20 01:20:21 +08:00 · 2022-08-09 10:52:02 +00:00 · 2022-08-09 10:51:59 +00:00 · 2022-08-08 16:23:54 +00:00 · 2022-08-08 16:23:51 +00:00 · 2022-08-08 16:23:47 +00:00
11 changed files with 264 additions and 80 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,92 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]


+## 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
+
+- [gmap-mod-name-selector](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector): [Gitlab CI][Unit tests][valgrind] Pipeline doesn't stop when memory leaks are detected
+- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self): [Gitlab CI][Unit tests][valgrind] Pipeline doesn't stop when memory leaks are detected
+- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): [Gitlab CI][Unit tests][valgrind] Pipeline doesn't stop when memory leaks are detected
+
+### Other
+
+- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): Fix DHCP option 60 (vendor class) not coming through
+- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): [Gitlab CI][Unit tests][valgrind] Pipeline doesn't stop when...
+
+## Release v0.9.0 - 2022-01-28(19:52:18 +0000)
+
+### New
+
+- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): Add query functionality
+- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): Gmap add query functionality
+
+## Release v0.8.3 - 2021-11-09(08:47:08 +0000)
+
+### Changes
+
+- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self): remove symlink to init script
+- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): remove symlink to init script
+
+## Release v0.8.2 - 2021-10-14(11:25:18 +0000)
+
+## Release v0.8.1 - 2021-10-06(11:42:29 +0000)
+
+### Fixes
+
+- [gmap-mod-self](https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-self): [GMAP-MOD-SELF] add ; in odl
+- [gmap-mod-self](https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-self): [GMAP-MOD-SELF] wait for network.device on ubus
+
 ## Release v0.8.0 - 2021-09-15(07:36:35 +0000)

 ### New
--- a/README.md
+++ b/README.md
@@ -6,20 +6,24 @@ 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/soft.at.home/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/soft.at.home/gmap/applications/gmap-mod-name-selector) - Name selection module for gmap
- [gmap-mod-self](https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-self) - gmap module to fetch information about the hgw itself and the layer 2 'devices' on it
- [gmap-server](https://gitlab.com/soft.at.home/gmap/applications/gmap-server) - Service implementing the gmap data model
+- [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/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

- [gmap-mibs-common](https://gitlab.com/soft.at.home/gmap/mibs/gmap-mibs-common) - Generic mib files for the gmap service
+- [gmap-mibs-common](https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common) - Generic mib files for the gmap service

 ### Libraries

- [libgmap-client](https://gitlab.com/soft.at.home/gmap/libraries/libgmap-client) - Client library for gmap modules
+- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client) - Client library for gmap modules

 ## How to add feed_gmap to your OpenWrt build

--- 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 50
+
+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,71 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gmap-client
+PKG_VERSION:=v1.0.1
+SHORT_DESCRIPTION:=gMap client plugin
+
+PKG_SOURCE:=gmap-client-v1.0.1.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client/-/archive/v1.0.1
+PKG_HASH:=607fe1f75e6db7c60d95236a5d845226f0710c846006f62608bcb0cba64f2927
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-client-v1.0.1
+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
+	$(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,42 +1,26 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-mod-ethernet-dev
-PKG_VERSION:=v0.1.0
+PKG_VERSION:=v1.0.2
 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.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-ethernet-dev/-/archive/v0.1.0
-PKG_HASH:=17d9f2d7172b5a37873855da24e85ecbfde0b1b49c314aba13da2d6e4f95472e
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v0.1.0
+PKG_SOURCE:=gmap-mod-ethernet-dev-v1.0.2.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/archive/v1.0.2
+PKG_HASH:=3f5641565b72faaf2e0cb4ee428263a0af80569d7c602c29f7b660c4cf32ee4c
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v1.0.2
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE

-COMPONENT:=gmap-mod-ethernet-dev
-
 PKG_RELEASE:=1

-define SAHInit/Install
-	install -d ${PKG_INSTALL_DIR}/etc/rc.d/
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT).so ${PKG_INSTALL_DIR}/etc/rc.d/S73$(COMPONENT).so
-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).so ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/backup/B10$(COMPONENT).so
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT).so ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/restore/R10$(COMPONENT).so
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT).so ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/import/R10$(COMPONENT).so
-endef
-
 include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
  CATEGORY:=gmap
  SUBMENU:=Applications
  TITLE:=$(SHORT_DESCRIPTION)
-  URL:=https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-ethernet-dev
+  URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev
  DEPENDS += +libamxc
  DEPENDS += +libamxd
  DEPENDS += +libamxb
@@ -62,9 +46,6 @@ define Build/Install
 	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)
-	$(call SAHBackupRestore/Install)
 endef

 define Build/InstallDev
@@ -72,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.2
+PKG_VERSION:=v1.0.0
 SHORT_DESCRIPTION:=Name selection module for gmap

-PKG_SOURCE:=gmap-mod-name-selector-v0.1.2.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-name-selector/-/archive/v0.1.2
-PKG_HASH:=03495128b18464026632d799b153d72413d7f9eeb4ae1e4e831f91defe28adbe
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-name-selector-v0.1.2
+PKG_SOURCE:=gmap-mod-name-selector-v1.0.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector/-/archive/v1.0.0
+PKG_HASH:=c7d1df3ba0960cf458bfa97272ec40e6ca2bf6f5c82e3eabeb2f9ad9173ba8bf
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-name-selector-v1.0.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -20,7 +20,7 @@ define Package/$(PKG_NAME)
  CATEGORY:=gmap
  SUBMENU:=Applications
  TITLE:=$(SHORT_DESCRIPTION)
-  URL:=https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-name-selector
+  URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector
  DEPENDS += +gmap-server
  DEPENDS += +libamxc
  DEPENDS += +libamxp
--- 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,77 +1,64 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-mod-self
-PKG_VERSION:=v0.0.12
-SHORT_DESCRIPTION:=gmap module to fetch information about the hgw itself and the layer 2 'devices' on it
+PKG_VERSION:=v1.0.0
+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.12.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-self/-/archive/v0.0.12
-PKG_HASH:=42cad5951f2d4a09f06d7d5fc431085dde184525ac5420751f88300f17c4ef6b
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-self-v0.0.12
+PKG_SOURCE:=gmap-mod-self-v1.0.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self/-/archive/v1.0.0
+PKG_HASH:=27d93c368997b9183e7957fb9ddd806ca1d90a3d3a4fba551d3d78b0e2b4c112
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-self-v1.0.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE

-COMPONENT:=gmap-mod-self
-
 PKG_RELEASE:=1

-define SAHInit/Install
-	install -d ${PKG_INSTALL_DIR}/etc/rc.d/
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT).so ${PKG_INSTALL_DIR}/etc/rc.d/S72$(COMPONENT).so
-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).so ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/backup/B10$(COMPONENT).so
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT).so ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/restore/R10$(COMPONENT).so
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT).so ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/import/R10$(COMPONENT).so
-endef
-
 include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
  CATEGORY:=gmap
  SUBMENU:=Applications
  TITLE:=$(SHORT_DESCRIPTION)
-  URL:=https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-self
+  URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self
  DEPENDS += +libamxc
  DEPENDS += +libamxj
  DEPENDS += +libamxd
  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 {} +;
-
-	$(call SAHInit/Install)
-	$(call SAHBackupRestore/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_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER=$(CONFIG_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER))
 endef

 define Package/$(PKG_NAME)/install
 	$(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/Makefile
+++ b/apps/gmap-server/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

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

-PKG_SOURCE:=gmap-server-v0.2.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/gmap/applications/gmap-server/-/archive/v0.2.0
-PKG_HASH:=85ce9a5480d28e602ae6991e66bb4e4f6af27601918b4eca6422a4da2c0da0dc
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v0.2.0
+PKG_SOURCE:=gmap-server-v1.0.4.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v1.0.4
+PKG_HASH:=5d2021136f28ab3c3c81d240adabb83728cfd507c641cdea30602a0371f346ba
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v1.0.4
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -15,6 +15,7 @@ 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/
@@ -36,7 +37,7 @@ define Package/$(PKG_NAME)
  CATEGORY:=gmap
  SUBMENU:=Applications
  TITLE:=$(SHORT_DESCRIPTION)
-  URL:=https://gitlab.com/soft.at.home/gmap/applications/gmap-server
+  URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server
  DEPENDS += +libamxc
  DEPENDS += +libamxd
  DEPENDS += +libamxp
@@ -44,6 +45,7 @@ define Package/$(PKG_NAME)
  DEPENDS += +libamxo
  DEPENDS += +libgmap-client
  DEPENDS += +libsahtrace
+  DEPENDS += +libuuid
  MENU:=1
 endef

@@ -70,6 +72,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/configs/gmap-mibs-common/Makefile
+++ b/configs/gmap-mibs-common/Makefile
@@ -6,7 +6,7 @@ SHORT_DESCRIPTION:=Generic mib files for the gmap service

 PKG_SOURCE:=gmap-mibs-common-v0.2.3.tar.gz
 PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/gmap/mibs/gmap-mibs-common/-/archive/v0.2.3
-PKG_HASH:=431faa108dd74caaad731868d33cae623abd24e12d47738991e4879466dc7123
+PKG_HASH:=d350eac8b25841093149a8fe3313dfa567b024084091c2f6f9355fba0374c50c
 PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.2.3
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
--- 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.2.3
+PKG_VERSION:=v0.4.1
 SHORT_DESCRIPTION:=Client library for gmap modules

-PKG_SOURCE:=libgmap-client-v0.2.3.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/gmap/libraries/libgmap-client/-/archive/v0.2.3
-PKG_HASH:=f944b9c14c132cd1530581c9ecb977997b4c27d8798092fe47f10bcfe39171c3
-PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-client-v0.2.3
+PKG_SOURCE:=libgmap-client-v0.4.1.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client/-/archive/v0.4.1
+PKG_HASH:=9a480ca0a6da4101d307463c23f50df68a9c9ddf54f17e62760294fac9e42bfc
+PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-client-v0.4.1
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -20,7 +20,7 @@ define Package/$(PKG_NAME)
  CATEGORY:=gmap
  SUBMENU:=Libraries
  TITLE:=$(SHORT_DESCRIPTION)
-  URL:=https://gitlab.com/soft.at.home/gmap/libraries/libgmap-client
+  URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client
  DEPENDS += +libamxc
  DEPENDS += +libamxp
  DEPENDS += +libamxb
@@ -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	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
sahbot	4789c9dccc	[CI] Update changelog for release master_v0.9.1 GitOrigin-RevId: da3ba6a52c1541d1404f01ea2c22b8b28b0f24a8	2022-06-01 13:06:45 +00:00
sahbot	f9b460565a	Integrating gmap-mod-ethernet-dev to master_v0.1.2 Issue: NET-3589 Fix DHCP option 60 (vendor class) not coming through GitOrigin-RevId: 7bd3b5f56358202676424da6bca6f21ca5375eb0	2022-05-30 07:46:12 +00:00
sahbot	f109768ee7	Integrating gmap-mod-name-selector to master_v0.1.3 Issue: HOP-379 [Gitlab CI][Unit tests][valgrind] Pipeline doesn't stop when memory leaks are detected [fix] GitOrigin-RevId: b14edbe1027adb70e4821ba0d096dfc4d3bbb5ff	2022-05-24 13:05:11 +00:00
sahbot	cd158c1119	Integrating libgmap-client to master_v0.3.1 Issue: HOP-379 [Gitlab CI][Unit tests][valgrind] Pipeline doesn't stop when... GitOrigin-RevId: a2faf9b4ee6f571a5e0cdb6eeab7971e78a4a757	2022-05-24 11:37:53 +00:00
sahbot	78d4b6b29d	Integrating gmap-server to master_v0.3.1 Issue: HOP-379 [Gitlab CI][Unit tests][valgrind] Pipeline doesn't stop when memory leaks are detected [fix] GitOrigin-RevId: 23efd0049d0bb6dfec89d2451787ffb743144606	2022-05-24 07:31:29 +00:00
sahbot	0f4c0e409e	Integrating gmap-mod-self to master_v0.0.16 Issue: HOP-379 [Gitlab CI][Unit tests][valgrind] Pipeline doesn't stop when memory leaks are detected [fix] GitOrigin-RevId: 1960e854b2d585bc1eaead5d83849f7b9f284b21	2022-05-23 12:27:09 +00:00
sahbot	499f2ed809	[CI] Update changelog for release master_v0.9.0 GitOrigin-RevId: a851e9c4a1c46deb1c44a7a5a2c1bbbacbb42928	2022-01-28 19:53:18 +00:00
sahbot	bae5007a1c	Integrating gmap-server to master_v0.3.0 Issue: HOP-792 Gmap add query functionality [new] GitOrigin-RevId: e12a04409beeaba4de7c6a4a5dab9e33ade32437	2022-01-27 09:35:16 +00:00
sahbot	48154d3d72	Integrating libgmap-client to master_v0.3.0 Issue: HOP-792 Add query functionality [new] GitOrigin-RevId: 24b7c805781ca3d1ad2d10b3998865eb43af3893	2022-01-27 08:07:53 +00:00
sahbot	1e367aff26	[CI] Update changelog for release master_v0.8.3 GitOrigin-RevId: 990c9c0e05f3b432e48b1f09c098b0f7c5a5aedd	2021-11-09 08:47:37 +00:00
SAH bot	9e2f5b670b	Integrating gmap-mod-self to master_v0.0.15 GitOrigin-RevId: f94fb158517ccba0e9b479e88881ff2b269be793	2021-11-02 13:27:43 +00:00
SAH bot	73221a5351	Integrating gmap-mod-ethernet-dev to master_v0.1.1 GitOrigin-RevId: c967749fe11c7c8dbd4ccab6866303174a8df6ea	2021-11-02 13:27:40 +00:00
sahbot	d31a358784	[CI] Update changelog for release master_v0.8.2 GitOrigin-RevId: 8db31d7035bc96b19989ded0464f4a4e295ff471	2021-10-14 11:26:29 +00:00
sahbot	84bab29400	[CI] Update changelog for release master_v0.8.1 GitOrigin-RevId: e2e806c012a28d254cb488d6d4a41f97ed622839	2021-10-06 11:43:11 +00:00
sahbot	991db6f707	[CI] Update PKG_HASH GitOrigin-RevId: 729d0e67792910aa5303215ec91942cffd23f236	2021-10-04 12:52:13 +00:00
sahbot	826ce2338d	Integrating gmap-mod-self to master_v0.0.14 Issue: PCF-379 [GMAP-MOD-SELF] wait for network.device on ubus [fix] Issue: PCF-387 [GMAP-MOD-SELF] add ; in odl [fix] GitOrigin-RevId: 2c1d561d4bf5e89fe10b2335e9b7d1aca65ae7aa	2021-10-04 12:52:09 +00:00
sahbot	cc83eb921d	[CI] Update PKG_HASH GitOrigin-RevId: 709e3714b875e04f4fc37b77428b085db264d2bb	2021-10-04 12:52:06 +00:00
sahbot	14de38291f	Integrating gmap-mod-self to master_v0.0.13 Issue: PCF-379 [GMAP-MOD-SELF] wait for network.device on ubus [fix] GitOrigin-RevId: c7a839623f58f7b73d4de8a6797190c58c503d92	2021-10-04 12:52:01 +00:00
Matthias FRANCK	86022ea28a	Correct hash of gmap-mod-name-selector GitOrigin-RevId: abea6d46a9a86b25044ffb55a7f801c915b37948	2021-09-16 13:05:41 +00:00