Integrating gmap-mod-upnp to master_v0.4.0

Issue: NET-6026 [gmap][mod-upnp] fill in server value Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: a8e00e3a14b75987918b5fb0e656c2a7a3f0e4f9
Integrating gmap-mibs-common to master_v0.24.5
2026-01-09 15:37:17 +08:00 · 2024-10-26 08:19:55 +00:00 · 2024-10-26 08:19:55 +00:00 · 2024-10-26 08:19:55 +00:00 · 2024-10-26 08:19:55 +00:00 · 2024-10-22 18:02:40 +00:00
25 changed files with 233 additions and 59 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -0,0 +1,4 @@
+---
+
+include:
+  - remote: 'https://gitlab.com/prpl-foundation/tooling/yml-templates/raw/main/.feed-pipeline.yml'
--- a/apps/gmap-client/Makefile
+++ b/apps/gmap-client/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-client
-PKG_VERSION:=v1.2.1
+PKG_VERSION:=v1.3.1
 SHORT_DESCRIPTION:=gMap client plugin

-PKG_SOURCE:=gmap-client-v1.2.1.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client/-/archive/v1.2.1
-PKG_HASH:=04f1fa5d8a9ddbcaba519dbd2f8d193cd596a321cc84b3132fde6f3a09627720
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-client-v1.2.1
+PKG_SOURCE:=gmap-client-v1.3.1.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client/-/archive/v1.3.1
+PKG_HASH:=036c0aada8d80303fde6ca9667e0c7c46dcd107788156ec2f214a7af4ced1921
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-client-v1.3.1
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -25,7 +25,7 @@ endef
 include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
-  CATEGORY:=gmap
+  CATEGORY:=prpl Foundation
  SUBMENU:=Plugins
  TITLE:=$(SHORT_DESCRIPTION)
  URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client
--- a/apps/gmap-client/files/etc/runlevel.d/ap/10-remove-gmap-client.sh
+++ b/apps/gmap-client/files/etc/runlevel.d/ap/10-remove-gmap-client.sh
@@ -0,0 +1 @@
+opkg remove gmap-client --force-depends
--- a/apps/gmap-mod-conntrack-stats/Makefile
+++ b/apps/gmap-mod-conntrack-stats/Makefile
@@ -0,0 +1,65 @@
+include $(TOPDIR)/rules.mk
+-include $(STAGING_DIR)/components.config
+
+PKG_NAME:=gmap-mod-conntrack-stats
+PKG_VERSION:=v1.0.2
+SHORT_DESCRIPTION:=Module to conntrack statistics information in gMap
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=v1.0.2
+PKG_SOURCE_URL:=https://$(SAH_GIT_USER):$(SAH_GIT_TOKEN)@$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-conntrack-stats.git
+PKG_MIRROR_HASH:=skip
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
+PKG_LICENSE:=BSD-2-Clause-Patent
+PKG_LICENSE_FILES:=LICENSE
+
+
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+  CATEGORY:=gmap
+  SUBMENU:=gMap
+  TITLE:=$(SHORT_DESCRIPTION)
+  URL:=https://$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-conntrack-stats
+  DEPENDS += +libamxb
+  DEPENDS += +libamxc
+  DEPENDS += +libamxp
+  DEPENDS += +libamxd
+  DEPENDS += +libamxo
+  DEPENDS += +libamxs
+  DEPENDS += +libgmap-client
+  DEPENDS += +libsahtrace
+  DEPENDS += +amxrt
+  MENU:=1
+endef
+
+define Package/$(PKG_NAME)/description
+	Module to conntrack statistics information in gMap
+endef
+
+define Build/Compile
+	$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(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)
+endef
+
+define Build/Install
+	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(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)
+endef
+
+define Build/InstallDev
+	$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(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)
+endef
+
+define Package/$(PKG_NAME)/install
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	if [ -d ./files ]; then \
+		$(CP) ./files/* $(1)/; \
+	fi
+	find $(1) -name *.a -exec rm {} +;
+	find $(1) -name *.h -exec rm {} +;
+	find $(1) -name *.pc -exec rm {} +;
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
--- a/apps/gmap-mod-conntrack-stats/files/etc/runlevel.d/ap/10-remove-gmap-mod-conntrack-stats.sh
+++ b/apps/gmap-mod-conntrack-stats/files/etc/runlevel.d/ap/10-remove-gmap-mod-conntrack-stats.sh
@@ -0,0 +1 @@
+opkg remove gmap-mod-conntrack-stats --force-depends
--- 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:=v1.18.4
+PKG_VERSION:=v1.20.5
 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-v1.18.4.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/archive/v1.18.4
-PKG_HASH:=21a221618531b3253f032072a0becf8e3a5db609ae0c0106bb7005e8ad9ac195
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v1.18.4
+PKG_SOURCE:=gmap-mod-ethernet-dev-v1.20.5.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/archive/v1.20.5
+PKG_HASH:=bb53797840c49230fc355d9fe47b19fd79504ffbfd04443f4202daa0079d59c7
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v1.20.5
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -32,6 +32,7 @@ define Package/$(PKG_NAME)
  DEPENDS += +libsahtrace
  DEPENDS += +libdhcpoptions
  DEPENDS += +libdiscoping
+  DEPENDS += +libnetmodel
  MENU:=1
 endef

--- a/apps/gmap-mod-ethernet-dev/files/etc/runlevel.d/ap/10-remove-gmap-mod-ethernet-dev.sh
+++ b/apps/gmap-mod-ethernet-dev/files/etc/runlevel.d/ap/10-remove-gmap-mod-ethernet-dev.sh
@@ -0,0 +1 @@
+opkg remove gmap-mod-ethernet-dev --force-depends
--- a/apps/gmap-mod-mdns/files/etc/runlevel.d/ap/10-remove-gmap-mod-mdns.sh
+++ b/apps/gmap-mod-mdns/files/etc/runlevel.d/ap/10-remove-gmap-mod-mdns.sh
@@ -0,0 +1 @@
+opkg remove gmap-mod-mdns --force-depends
--- a/apps/gmap-mod-name-selector/Makefile
+++ b/apps/gmap-mod-name-selector/Makefile
@@ -1,23 +1,24 @@
 include $(TOPDIR)/rules.mk

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

-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_SOURCE:=gmap-mod-name-selector-v1.0.2.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector/-/archive/v1.0.2
+PKG_HASH:=b0239e8099767a85859d70fbd43b0cb805292104d55a6782bab2a8f3f7740b4b
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-name-selector-v1.0.2
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE

+
 PKG_RELEASE:=1

 include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
-  CATEGORY:=gmap
+  CATEGORY:=prpl Foundation
  SUBMENU:=gMap
  TITLE:=$(SHORT_DESCRIPTION)
  URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector
@@ -37,25 +38,25 @@ 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 LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
 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)
-	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 Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(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)
 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) STAGINGDIR=$(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)
 endef

 define Package/$(PKG_NAME)/install
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 	if [ -d ./files ]; then \
 		$(CP) ./files/* $(1)/; \
 	fi
-	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	find $(1) -name *.a -exec rm {} +;
+	find $(1) -name *.h -exec rm {} +;
+	find $(1) -name *.pc -exec rm {} +;
 endef

 $(eval $(call BuildPackage,$(PKG_NAME)))
--- a/apps/gmap-mod-name-selector/files/etc/runlevel.d/ap/10-remove-gmap-mod-name-selector.sh
+++ b/apps/gmap-mod-name-selector/files/etc/runlevel.d/ap/10-remove-gmap-mod-name-selector.sh
@@ -0,0 +1 @@
+opkg remove gmap-mod-name-selector --force-depends
--- a/apps/gmap-mod-sahpairing/Makefile
+++ b/apps/gmap-mod-sahpairing/Makefile
@@ -0,0 +1,66 @@
+include $(TOPDIR)/rules.mk
+-include $(STAGING_DIR)/components.config
+
+PKG_NAME:=gmap-mod-sahpairing
+PKG_VERSION:=v0.1.3
+SHORT_DESCRIPTION:=Module to expose sahpairing information in gMap
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=v0.1.3
+PKG_SOURCE_URL:=https://$(SAH_GIT_USER):$(SAH_GIT_TOKEN)@$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-sahpairing.git
+PKG_MIRROR_HASH:=skip
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
+PKG_LICENSE:=SAH
+PKG_LICENSE_FILES:=LICENSE
+
+
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+  CATEGORY:=gmap
+  SUBMENU:=gMap
+  TITLE:=$(SHORT_DESCRIPTION)
+  URL:=https://$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-sahpairing
+  DEPENDS += +libamxb
+  DEPENDS += +libamxc
+  DEPENDS += +libamxp
+  DEPENDS += +libamxd
+  DEPENDS += +libamxo
+  DEPENDS += +libamxs
+  DEPENDS += +libgmap-client
+  DEPENDS += +libsahtrace
+  DEPENDS += +amxrt
+  DEPENDS += +sahpairing
+  MENU:=1
+endef
+
+define Package/$(PKG_NAME)/description
+	Module to expose sahpairing information in gMap
+endef
+
+define Build/Compile
+	$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(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)
+endef
+
+define Build/Install
+	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(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)
+endef
+
+define Build/InstallDev
+	$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(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)
+endef
+
+define Package/$(PKG_NAME)/install
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	if [ -d ./files ]; then \
+		$(CP) ./files/* $(1)/; \
+	fi
+	find $(1) -name *.a -exec rm {} +;
+	find $(1) -name *.h -exec rm {} +;
+	find $(1) -name *.pc -exec rm {} +;
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
--- a/apps/gmap-mod-sahpairing/files/etc/runlevel.d/ap/10-remove-gmap-mod-sahpairing.sh
+++ b/apps/gmap-mod-sahpairing/files/etc/runlevel.d/ap/10-remove-gmap-mod-sahpairing.sh
@@ -0,0 +1 @@
+opkg remove gmap-mod-sahpairing --force-depends
--- 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:=v1.5.3
+PKG_VERSION:=v1.7.4
 SHORT_DESCRIPTION:=gmap module to fetch information about the hgw/repeater itself and the layer 2 'devices' on it

-PKG_SOURCE:=gmap-mod-self-v1.5.3.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self/-/archive/v1.5.3
-PKG_HASH:=3936a9505e436dd6c44eca81685ffc786e0a6480a529ac6fb1642cea74b89049
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-self-v1.5.3
+PKG_SOURCE:=gmap-mod-self-v1.7.4.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self/-/archive/v1.7.4
+PKG_HASH:=2fa960a9778de06523c6156cb545dba27a9d36dc20753d21c564cf02b5fab36d
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-self-v1.7.4
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
--- a/apps/gmap-mod-self/files/etc/runlevel.d/ap/10-remove-gmap-mod-self.sh
+++ b/apps/gmap-mod-self/files/etc/runlevel.d/ap/10-remove-gmap-mod-self.sh
@@ -0,0 +1 @@
+opkg remove gmap-mod-self --force-depends
--- a/apps/gmap-mod-services-db/Config.in
+++ b/apps/gmap-mod-services-db/Config.in
@@ -0,0 +1,20 @@
+config PACKAGE_gmap-mod-services-db
+    tristate
+    select SAH_SERVICES_GMAP-MOD_SERVICES-DB
+
+if PACKAGE_gmap-mod-services-db
+
+menu "Select gmap-mod-services-db build options"
+    depends on PACKAGE_gmap-mod-services-db
+
+config SAH_SERVICES_GMAP-MOD_SERVICES-DB
+    bool "Application for populating the datamodel based on grules"
+    default y
+
+config SAH_SERVICES_GMAP-MOD_SERVICES-DB_BUILT-IN_SAH_RULES
+    bool "Include sah proprietary grules in build package"
+    default y
+
+endmenu
+
+endif
--- a/apps/gmap-mod-services-db/Makefile
+++ b/apps/gmap-mod-services-db/Makefile
@@ -2,16 +2,16 @@ include $(TOPDIR)/rules.mk
 -include $(STAGING_DIR)/components.config

 PKG_NAME:=gmap-mod-services-db
-PKG_VERSION:=v0.1.9
+PKG_VERSION:=v0.2.6
 SHORT_DESCRIPTION:=gMap component that populates the datamodel based on preconfigured grules

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.1.9
+PKG_SOURCE_VERSION:=v0.2.6
 PKG_SOURCE_URL:=https://$(SAH_GIT_USER):$(SAH_GIT_TOKEN)@$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-services-db.git
 PKG_MIRROR_HASH:=skip
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
-PKG_LICENSE:=SAH
+PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE


@@ -41,15 +41,15 @@ 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 LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin 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 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-MOD_SERVICES-DB_BUILT-IN_SAH_RULES=$(CONFIG_SAH_SERVICES_GMAP-MOD_SERVICES-DB_BUILT-IN_SAH_RULES))
 endef

 define Build/Install
-	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(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=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(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-MOD_SERVICES-DB_BUILT-IN_SAH_RULES=$(CONFIG_SAH_SERVICES_GMAP-MOD_SERVICES-DB_BUILT-IN_SAH_RULES))
 endef

 define Build/InstallDev
-	$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(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) STAGINGDIR=$(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-MOD_SERVICES-DB_BUILT-IN_SAH_RULES=$(CONFIG_SAH_SERVICES_GMAP-MOD_SERVICES-DB_BUILT-IN_SAH_RULES))
 endef

 define Package/$(PKG_NAME)/install
@@ -62,4 +62,8 @@ define Package/$(PKG_NAME)/install
 	find $(1) -name *.pc -exec rm {} +;
 endef

+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
 $(eval $(call BuildPackage,$(PKG_NAME)))
--- a/apps/gmap-mod-services-db/files/etc/runlevel.d/ap/10-remove-gmap-mod-services-db.sh
+++ b/apps/gmap-mod-services-db/files/etc/runlevel.d/ap/10-remove-gmap-mod-services-db.sh
@@ -0,0 +1 @@
+opkg remove gmap-mod-services-db --force-depends
--- a/apps/gmap-mod-upnp/Makefile
+++ b/apps/gmap-mod-upnp/Makefile
@@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk
 -include $(STAGING_DIR)/components.config

 PKG_NAME:=gmap-mod-upnp
-PKG_VERSION:=v0.2.0
+PKG_VERSION:=v0.4.0
 SHORT_DESCRIPTION:=Module to expose upnp information in gMap

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.2.0
+PKG_SOURCE_VERSION:=v0.4.0
 PKG_SOURCE_URL:=https://$(SAH_GIT_USER):$(SAH_GIT_TOKEN)@$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-upnp.git
 PKG_MIRROR_HASH:=skip
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
--- a/apps/gmap-mod-upnp/files/etc/runlevel.d/ap/10-remove-gmap-mod-upnp.sh
+++ b/apps/gmap-mod-upnp/files/etc/runlevel.d/ap/10-remove-gmap-mod-upnp.sh
@@ -0,0 +1 @@
+opkg remove gmap-mod-upnp --force-depends
--- a/apps/gmap-server/Makefile
+++ b/apps/gmap-server/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-server
-PKG_VERSION:=v2.7.0
+PKG_VERSION:=v3.0.2
 SHORT_DESCRIPTION:=Service implementing the gmap data model

-PKG_SOURCE:=gmap-server-v2.7.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v2.7.0
-PKG_HASH:=1210237842313c66e706c199163890729f46d97680c03c9027d9d020bea4b727
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v2.7.0
+PKG_SOURCE:=gmap-server-v3.0.2.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v3.0.2
+PKG_HASH:=a27d3e69e081fb183c42d5fb0ac082e05eb6d34927ebfcfee92f8139c805a57f
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v3.0.2
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -15,7 +15,6 @@ 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/
@@ -47,6 +46,7 @@ define Package/$(PKG_NAME)
  DEPENDS += +libgmap-client
  DEPENDS += +libsahtrace
  DEPENDS += +libuuid
+  DEPENDS += +mod-pcm-svc
  MENU:=1
 endef

--- a/apps/gmap-server/files/etc/runlevel.d/ap/10-remove-gmap-server.sh
+++ b/apps/gmap-server/files/etc/runlevel.d/ap/10-remove-gmap-server.sh
@@ -0,0 +1 @@
+opkg remove gmap-server --force-depends
--- a/configs/gmap-mibs-common/Makefile
+++ b/configs/gmap-mibs-common/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-mibs-common
-PKG_VERSION:=v0.21.0
+PKG_VERSION:=v0.24.5
 SHORT_DESCRIPTION:=Generic mib files for the gmap service

-PKG_SOURCE:=gmap-mibs-common-v0.21.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/archive/v0.21.0
-PKG_HASH:=d1b5e5f6152166752a90f75e31a820b03f48ed6fdbd0dd44a15c466c5a5dbf3b
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.21.0
+PKG_SOURCE:=gmap-mibs-common-v0.24.5.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/archive/v0.24.5
+PKG_HASH:=88ea65717f9210e37da8abd967c07f1125551082706b74fc118dab5c142f18f1
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.24.5
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -28,11 +28,13 @@ define Package/$(PKG_NAME)
  DEPENDS += +libamxd
  DEPENDS += +libamxb
  DEPENDS += +libamxj
+  DEPENDS += +libamxm
  DEPENDS += +libsahtrace
  DEPENDS += +libamxo
  DEPENDS += +libgmap-client
  DEPENDS += +libgmap-ext
  DEPENDS += +mod-dmext
+  DEPENDS += +libipat
  MENU:=1
 endef

--- a/configs/gmap-mibs-common/files/etc/runlevel.d/ap/10-remove-gmap-mibs-common.sh
+++ b/configs/gmap-mibs-common/files/etc/runlevel.d/ap/10-remove-gmap-mibs-common.sh
@@ -0,0 +1 @@
+opkg remove gmap-mibs-common --force-depends
--- a/libs/libgmap-client/Makefile
+++ b/libs/libgmap-client/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libgmap-client
-PKG_VERSION:=v1.6.4
+PKG_VERSION:=v2.1.0
 SHORT_DESCRIPTION:=Client library for gmap modules

-PKG_SOURCE:=libgmap-client-v1.6.4.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client/-/archive/v1.6.4
-PKG_HASH:=4f6fec6ca05c8fac809dc99402e241da70ca644385d5041975b200df804eef44
-PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-client-v1.6.4
+PKG_SOURCE:=libgmap-client-v2.1.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client/-/archive/v2.1.0
+PKG_HASH:=e5812ac0dead28fa48d52d72b264c3cc0a763fc2ac64b4565098bdcbbef2989a
+PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-client-v2.1.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
--- a/libs/libgmap-ext/Makefile
+++ b/libs/libgmap-ext/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libgmap-ext
-PKG_VERSION:=v1.0.0
+PKG_VERSION:=v1.2.1
 SHORT_DESCRIPTION:=Functionality common for gmap clients (not server)

-PKG_SOURCE:=libgmap-ext-v1.0.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-ext/-/archive/v1.0.0
-PKG_HASH:=11e489b0c3554adcd10f9fe52b1fe2f0eb91f748a54a6589b27c8189ed6cfead
-PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-ext-v1.0.0
+PKG_SOURCE:=libgmap-ext-v1.2.1.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-ext/-/archive/v1.2.1
+PKG_HASH:=50373eb4ff80b3bd73d331d1d5855e6a71f7cf49388e60fd41217956784b590c
+PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-ext-v1.2.1
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -18,7 +18,7 @@ PKG_RELEASE:=1
 include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
-  CATEGORY:=gmap
+  CATEGORY:=prpl Foundation
  SUBMENU:=gMap
  TITLE:=$(SHORT_DESCRIPTION)
  URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-ext
Author	SHA1	Message	Date
sahbot	fa617e3751	Integrating gmap-mod-upnp to master_v0.4.0 Issue: NET-6026 [gmap][mod-upnp] fill in server value Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: a8e00e3a14b75987918b5fb0e656c2a7a3f0e4f9	2024-10-26 08:19:55 +00:00
sahbot	54143e3a9d	Integrating gmap-mibs-common to master_v0.24.5 Issue: BDD-950 Adding new mdns record does not trigger a lookup Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: 8fa8f8d6ae72a260504efa7f65004a3af69d121f	2024-10-26 08:19:55 +00:00
sahbot	6a333e377f	Integrating gmap-mod-self to master_v1.7.4 Issue: NET-6242 CLONE - [Devices > icon]'Unkown' is displayed for VMS device Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: 7fdd37e77500ca1c395dd6d7357e6c6c66995c45	2024-10-26 08:19:55 +00:00
sahbot	27b8e77ea5	Integrating gmap-mod-ethernet-dev to master_v1.20.5 Issue: NET-6200 Reduce neighbour table chatter between gmap-mod-ethernet-dev and netdev Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: 95dbbaeb695556811cee9132b3dca0a659aa692a	2024-10-26 08:19:55 +00:00
sahbot	a54fc224d4	Integrating gmap-mod-ethernet-dev to master_v1.20.4 Issue: NET-6138 Do not create device on inactive device detection to avoid creating device after manual removal Issue: NET-6219 gmap-mod-ethernet-dev can't find DHCPv4Server. Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: a7aec811f82b8c5fdc6180ca9de673112caf32b7	2024-10-22 18:02:40 +00:00
sahbot	55ad70e0e2	Integrating gmap-mod-ethernet-dev to master_v1.20.3 Issue: NET-6219 gmap-mod-ethernet-dev can't find DHCPv4Server. Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: f5bec9c0bf17c33859a6339c4eefcfc06d3c45fd	2024-10-22 18:02:40 +00:00
sahbot	92557e3ed9	Integrating gmap-mod-sahpairing to master_v0.1.3 Issue: NET-6230 CLONE - [gmap][mod-sahpairing] out of memory OOM on gmap-sahpairing Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: 9bf7618c4a1a8dc79fccf6f6718d665b7b8e4ab7	2024-10-22 18:02:40 +00:00
sahbot	ef6a280440	Integrating gmap-server to master_v3.0.2 Issue: NET-6184 Add mdns to NameOrder in gmap Issue: NET-6198 [gMap] Name suffix concatenated without separator Issue: NET-6228 Restoring a disconnected device through two firmware upgrades fails Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: f7588e69a4b75b67e0affaf40d26a1131167a5b9	2024-10-22 18:02:40 +00:00
sahbot	8fc142c707	Integrating libgmap-ext to master_v1.2.1 Issue: SVID-191 [SOP] Service identification does not work anymore[change] Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: 7983b27c36cabc1b2bcbc8370c67345111d2414c	2024-10-22 18:02:40 +00:00
sahbot	c24d777eed	Integrating libgmap-client to master_v2.1.0 Issue: NET-6138 Add gmap_devices_createIfActive() Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: ac7399cd72edaeb0d22d3ccd2773df3877920c26	2024-10-22 18:02:40 +00:00
sahbot	4edf08f48d	Integrating gmap-server to master_v3.0.1 Issue: NET-6184 Add mdns to NameOrder in gmap Issue: NET-6198 [gMap] Name suffix concatenated without separator Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: e558c9df775602e23c6b1785979c8e6bfa3a30c0	2024-10-22 18:02:40 +00:00
sahbot	add080493a	Integrating gmap-mod-sahpairing to master_v0.1.2 Issue: DUMMY-0000 - No associated bugs found Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: e31cc1e508223af80b9284738c67a28d1d79a481	2024-10-10 18:49:51 +00:00
sahbot	cfb957cb04	Integrating gmap-mod-upnp to master_v0.3.2 Issue: NET-6167 [gmap][mod-upnp] upnp module crashes sometimes together with upnpdiscovery Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: 422922538b8c9986c5a1f0042db4739d4e3a6ce0	2024-09-27 10:12:38 +00:00
sahbot	249523ddd1	Integrating gmap-mod-ethernet-dev to master_v1.20.2 Issue: NET-6035 Make DHCPv4Server an optional dependency Issue: NET-6065 Extend documentation Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: 075a9d77db57e7fa9a7807f5531a9559ad1e0745	2024-09-27 10:12:38 +00:00
sahbot	8acff59043	Integrating gmap-mibs-common to master_v0.24.4 Issue: BDD-821 [BDD][PrPl] missing MDS services on PRPL (umdns + parser instead of avahi ) Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: 880eea53370ba8311f1dfd7b63827e507eeb5e80	2024-09-27 10:12:37 +00:00
sahbot	9ed330693a	Revert "Integrating gmap-mod-ethernet-dev to master_v1.20.1" This reverts commit dc17375eea6ce38c7011406fe7b8e07c2b7c7f70 GitOrigin-RevId: d982627e265c801efb6a1b56a63be874a56c1f9d	2024-09-24 09:10:20 +00:00
sahbot	41a0bcf100	Revert "Integrating gmap-mod-ethernet-dev to master_v1.20.2" This reverts commit 762b59bf471599f2c783b3843a87176990dc74ce GitOrigin-RevId: 52f1e3be9bd62ef17d7493d96fb7856f803948d3	2024-09-24 09:10:20 +00:00
sahbot	1a964b1718	Integrating libgmap-ext to master_v1.2.0 Issue: NET-6151 [mapper] MAC address / Hostname mismatch[new] Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: a052a3ae96b0ea456db39fdbd64e87989c6eceac	2024-09-24 09:10:20 +00:00
sahbot	5206a3eac0	Integrating gmap-mod-ethernet-dev to master_v1.20.2 Issue: NET-6035 Make DHCPv4Server an optional dependency Issue: NET-6065 Extend documentation Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: 762b59bf471599f2c783b3843a87176990dc74ce	2024-09-24 09:10:20 +00:00
sahbot	361cc12726	Integrating gmap-mod-ethernet-dev to master_v1.20.1 Issue: NET-6035 Make DHCPv4Server an optional dependency Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: dc17375eea6ce38c7011406fe7b8e07c2b7c7f70	2024-09-24 09:10:20 +00:00
sahbot	3cd602998b	treewide: add ap runlevel files The gmap features are not needed an AP images. The runlevel files are excecuted when we are in the AP runlevel and hence the gmap features will be removed at runtime. Issue: HOP-7080 add support for multiple runlevels GitOrigin-RevId: 863775266b3719720c196a39d811e522af53b02b	2024-08-30 11:59:32 +00:00
sahbot	5aaad22ef8	Integrating gmap-mod-self to master_v1.7.3 Issue: SSW-8329 - add WDS support Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: 221fc4a6ccde80fc673c54b50527f19e1ac5df79	2024-08-13 10:33:17 +00:00
sahbot	e56489805d	Integrating gmap-mod-self to master_v1.7.2 Issue: NET-6028 Fix no tracelogs + log on query success [fix] Issue: NET-6029 Fix on ubus-only startup sometimes postponed forever [fix] Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: c161485f367d1319fe8b2618700573cd7e976a33	2024-08-07 14:12:12 +00:00
sahbot	837c83d469	Integrating gmap-mibs-common to master_v0.24.3 Issue: NET-6018 [gmap][mod-upnp] Add FriendlyName and update Server value Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: ad4f5ed491da6875f8bfbe62e408655eefbf24a4	2024-08-07 14:12:12 +00:00
sahbot	16a2f4cb03	Integrating gmap-mod-upnp to master_v0.3.1 Issue: NET-6018 [gmap][mod-upnp] Add FriendlyName Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: f0eef45299a841547d9c3844245d884be76208e6	2024-08-07 14:12:12 +00:00
sahbot	7d87894eeb	Integrating gmap-server to master_v3.0.0 Issue: NET-5969 Build topology based on (contradicting) data from gmap modules GitOrigin-RevId: 9519153a7683ba51113ce8b45142ffb47eddaf29	2024-08-07 14:12:12 +00:00
sahbot	09f550b392	Integrating libgmap-client to master_v2.0.0 Issue: NET-5971 Remove old link API Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: b683790283375dff19405ff8b4321a09c5474d7d	2024-08-07 14:12:12 +00:00
sahbot	721f596970	Integrating gmap-mod-self to master_v1.7.1 Issue: NET-6028 Fix no tracelogs + log on query success [fix] Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: 6608e733a944e15a63c35cd362561dbef69e1fde	2024-08-07 14:12:12 +00:00
sahbot	5aef67e807	Integrating gmap-mod-services-db to master_v0.2.6 Issue: NET-5686 Unit tests verify .grules files Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: 1021478462443e631356124629af4f9fdbb9400b	2024-08-07 14:12:12 +00:00
sahbot	f55d934ddf	Integrating gmap-mod-ethernet-dev to master_v1.20.0 Issue: NET-6011 Keep "manageable" tag Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: a5ff4f394aeedafeb8177d4272bcc7f61425187e	2024-07-24 06:48:19 +00:00
sahbot	f259426c6a	Integrating gmap-mod-ethernet-dev to master_v1.19.2 Issue: NET-5967 Only verify IP reachability on correct lib_discoping instance [fix] GitOrigin-RevId: e67f46117542cd9d6f30a4161bc7016cccb8a357	2024-07-10 06:07:05 +00:00
sahbot	e364fb2c32	Integrating gmap-server to master_v2.14.0 Issue: NET-5939 Set FirstSeen to now when NTP comes up for devices with unknown FirstSeen GitOrigin-RevId: 3e66f187aec282122ca9dd4b89ec0c3c4e310770	2024-07-10 06:07:05 +00:00
sahbot	e34d5ac545	Integrating gmap-mibs-common to master_v0.24.2 Issue: NET-5855 [gmap][bridge] Bridge device in gmap doesnt remove old ip address from IP.Interface GitOrigin-RevId: 08a0ca37225c167b446bc3730622726c7919164d	2024-07-10 06:07:05 +00:00
sahbot	ed1cea3e50	Integrating gmap-mod-services-db to master_v0.2.5 Issue: NET-5843 Populate the stats MiB with conntrack statistics GitOrigin-RevId: 610b7db921b9a40db47bf2b15a51bc2b3c467f69	2024-06-21 08:08:17 +00:00
sahbot	c4da622328	Integrating gmap-mibs-common to master_v0.24.1 Issue: NET-5796 [gMap][Stats][API] Implement the stats MiB GitOrigin-RevId: 3d1045fe1124b3dcc4e7f12f8639bcf6e1645493	2024-06-21 08:08:17 +00:00
sahbot	6a50242134	Integrating gmap-mod-services-db to master_v0.2.4 Issue: HOP-6786 Default gRules must be removed GitOrigin-RevId: 65bad5dc0b817dacc870f6c42dd2d201a50e1909	2024-06-13 16:05:10 +00:00
sahbot	d4dd344719	Integrating gmap-server to master_v2.13.0 Issue: NET-5887 [gmap][server] catch delete device event in case of not using the rpc GitOrigin-RevId: a0891658d09f702c3c5d849d0bfcdf4f94c279bb	2024-06-13 16:05:10 +00:00
sahbot	da0dec837a	Integrating gmap-mibs-common to master_v0.24.0 Issue: NET-5886 [gmap][mod-sahpairing] Add new 'FirmwareImageStatus' parameter GitOrigin-RevId: a531c7b91f6e00a00bae37487d2f8a0cf306c0ad	2024-06-13 16:05:10 +00:00
sahbot	1222c65017	ci: remove variable section completely If the variables section is left empty, all default variables are unset. GitOrigin-RevId: 37924992a9c8bfba65f445e3df141a6c4ca941e6	2024-05-28 07:07:26 +00:00
sahbot	8b5d5d46c7	add the opensource CI GitOrigin-RevId: 7dfb644062e337a96552edf9fe0d2489b2e454d6	2024-05-28 06:52:22 +00:00
sahbot	daf6ddad40	[libgmap-ext] fix missing hash GitOrigin-RevId: 8d1206ad6677047f216a69d7db892b4cd1190e5c	2024-05-26 11:34:16 +00:00
sahbot	074456eb14	Integrating libgmap-ext to master_v1.1.0 Issue: NET-5770 Keep last known IP addresses in the data model GitOrigin-RevId: 002dcf4725e1ccfc43d9d5a7b4a61f4dfb27e43d	2024-05-17 20:51:27 +00:00
sahbot	4af57d98f3	Integrating gmap-server to master_v2.12.1 Issue: NET-5778 Test get key for duplicate macs Issue: NET-5803 Show multi-instance links in datamodel Issue: NET-5826 Use lib_amxut GitOrigin-RevId: fa8587dbea9c37fc8fbdee1ae36a13606c96c9f9	2024-05-17 20:51:27 +00:00
sahbot	82c23b5c76	Integrating libgmap-client to master_v1.7.1 Issue: NET-5820 gmap_device_flags_string don't start with null byte GitOrigin-RevId: b1049f5ead05dda45a220e56d3d0edfd87763eb2	2024-05-17 20:51:27 +00:00
sahbot	e571694df9	Integrating gmap-mod-ethernet-dev to master_v1.19.1 Issue: HOP-6338 Make amxb timeouts configurable [change] Issue: NET-5624 [amx][gmap][mod-eth] Do discoping+init per bridge per ip family Issue: NET-5772 Adapt to new link API Issue: NET-5818 [amx][gmap][mod-eth] Remove deprecated configuration file GitOrigin-RevId: 7d68771a4e445ef724d90f3a6812cae4aeb21eed	2024-05-17 20:51:27 +00:00
sahbot	9cf1676599	Integrating gmap-mod-ethernet-dev to master_v1.19.0 Issue: HOP-6338 Make amxb timeouts configurable [change] Issue: NET-5624 [amx][gmap][mod-eth] Do discoping+init per bridge per ip family Issue: NET-5772 Adapt to new link API GitOrigin-RevId: c6141812a31f59232d90d89d34be5615d9bb1761	2024-05-17 20:51:27 +00:00
sahbot	0b7e14ece6	Integrating gmap-mibs-common to master_v0.23.0 Issue: NET-5770 Keep last known IP addresses in the data model GitOrigin-RevId: eb33e34584eee469c7bf6e92b435dc469947af05	2024-05-17 20:51:27 +00:00
sahbot	eae670b968	Integrating gmap-mod-services-db to master_v0.2.3 Issue: HOP-6338 Make amxb timeouts configurable [change] Issue: NET-5757 [amx][gmap][mod-services-db] Repeater set correct DeviceCategory GitOrigin-RevId: 33f891b07c2c3aef9050a3ddb066a963bf187246	2024-05-07 19:18:45 +00:00
sahbot	747f0347f8	Integrating gmap-mod-upnp to master_v0.3.0 Issue: NET-5792 [gmap][mod-homeplug][mod-upnp] Adapt modules to new link API GitOrigin-RevId: b7b84663ee7409cc787c707bb2947c5c9c1a0e4c	2024-05-07 19:18:45 +00:00
sahbot	94b88fd0c1	Integrating gmap-server to master_v2.11.1 Issue: NET-5787 Fix doc of link() and setLink() GitOrigin-RevId: b41d28a808260ec80c2a347484a640baafd1c9a2	2024-05-06 12:34:08 +00:00
sahbot	e0aa417e8f	Integrating gmap-mod-self to master_v1.7.0 Issue: NET-5764 Adapt to new link API GitOrigin-RevId: 8bcde9349895e8146a7ae6bb8c0f0bf7ac1acc1f	2024-05-04 07:07:02 +00:00
sahbot	633afcaa63	Integrating gmap-server to master_v2.11.0 Issue: HOP-6338 Make amxb timeouts configurable [change] Issue: NET-5773 New linking API (no new functionality yet) GitOrigin-RevId: bc8c20f7d35a3c57c5328ba1d271fbf2f27e7065	2024-05-02 15:04:59 +00:00
sahbot	98c549ffb0	Integrating libgmap-client to master_v1.7.0 Issue: NET-5773 new linking API GitOrigin-RevId: aa81a5926bd714fce4b6c4387d25fc85f279c1b8	2024-05-02 15:04:59 +00:00
sahbot	855bb7a075	Integrating gmap-mibs-common to master_v0.22.1 Issue: HOP-6330 [gmap] DeviceCategories are not upgrade persistent GitOrigin-RevId: 405fdf4a13ef869695d92c63f4ab80ee03ea8f2a	2024-04-19 17:28:43 +00:00
sahbot	7ee1bef6e2	Integrating gmap-mod-upnp to master_v0.2.2 Issue: NET-5685 [gmap][mod-upnp] parentDevice path in UPnPDescription changed GitOrigin-RevId: 906d85c368b5fa78c37c80b78acb6dfb2086f2c8	2024-04-11 18:31:52 +00:00
sahbot	c5590439cb	Integrating gmap-mod-name-selector to master_v1.0.2 Issue: HOP-6338 Make amxb timeouts configurable [change] GitOrigin-RevId: 2fa044fd71b5ca23464930af6c59f0af006ee2ba	2024-04-11 09:40:27 +00:00
sahbot	e3ff2d509e	Integrating gmap-mod-upnp to master_v0.2.1 Issue: HOP-6338 Make amxb timeouts configurable [change] GitOrigin-RevId: 6448c2178883e3085addbc7055405e14b05a2993	2024-04-11 09:40:27 +00:00
sahbot	fb1ae6a24e	Integrating gmap-mod-self to master_v1.6.1 Issue: HOP-6338 Make amxb timeouts configurable [change] GitOrigin-RevId: d257ab8c38b6d7d576a739464774570c65093597	2024-04-11 09:40:27 +00:00
sahbot	6aa0404d99	Integrating gmap-client to master_v1.3.1 Issue: HOP-6338 Make amxb timeouts configurable [change] GitOrigin-RevId: 114e5934b741ef03b4fb7521c2b4d31207597ade	2024-04-11 09:40:27 +00:00
sahbot	f75a433172	Integrating gmap-server to master_v2.10.2 Issue: HOP-6258 [tr181-pcm] Saved and defaults odl should not be included in the backup files [fix] Issue: NET-5702 [PRPL][4.0.9.8][TECC][Device List]: Clear device list only clears till a reboot then the devices are all shown again even though they have not connected since clearing. GitOrigin-RevId: 29e061be2a1d66ba0454f15192ca2ad4658ff7a0	2024-04-11 09:40:27 +00:00
sahbot	5b73e58618	Integrating gmap-mod-services-db to master_v0.2.1 Issue: NET-5667 [AMX] [GMAP] grules have to set the DeviceCategory iso DeviceType Issue: NET-5690 [amx][gmap][mod-services-db] Package DeviceCategory grules files in build GitOrigin-RevId: 6e7305472a0c359055ff8393372c0250f449a976	2024-04-11 09:40:27 +00:00
sahbot	9076c76624	Integrating gmap-mibs-common to master_v0.22.0 Issue: NET-5647 [AMX] [GMAP] Set a default value for DeviceCategory GitOrigin-RevId: 86e9c86f37e072a01dd1adbd8037e794115947f6	2024-04-11 09:40:27 +00:00
sahbot	f9f852c11b	Integrating gmap-mod-services-db to master_v0.2.0 Issue: NET-5667 [AMX] [GMAP] grules have to set the DeviceCategory iso DeviceType GitOrigin-RevId: 20a22587d19a011be5907309e16f327b1448d9f2	2024-04-11 09:40:27 +00:00
sahbot	211ea8ed7c	Integrating gmap-server to master_v2.10.1 Issue: HOP-6258 [tr181-pcm] Saved and defaults odl should not be included in the backup files [fix] GitOrigin-RevId: 3fbcdc87122b6b863b5a976dab538468d5e3535a	2024-04-11 09:40:27 +00:00
sahbot	83fdfe34d0	Integrating gmap-server to master_v2.10.0 Issue: NET-4426 lib_uuid implemented twice Issue: NET-4997 extend gMap unlink to support remove all links GitOrigin-RevId: ee42266c94b74357615bb03e918daf12384e695c	2024-03-27 20:03:51 +00:00
sahbot	12c58878e2	Integrating gmap-server to master_v2.9.1 Issue: NET-4426 lib_uuid implemented twice GitOrigin-RevId: 5ad094806c0fbd64898b5618bb360ce2bd19694b	2024-03-27 20:03:51 +00:00
sahbot	76bd1a5870	Integrating gmap-mod-self to master_v1.6.0 Issue: NET-5628 Write documentation and draw diagrams GitOrigin-RevId: a17efe9ef30a8fa70bf76ef3e9719e65d361fcab	2024-03-26 20:30:18 +00:00
sahbot	e5d3795f07	Integrating gmap-client to master_v1.3.0 Issue: NET-5665 Write gmap-client documentation GitOrigin-RevId: 21f3a44f62b1a18c2ae52a0817772c0f0ee3cc9c	2024-03-26 20:30:18 +00:00
sahbot	eee25d0bf9	Integrating gmap-server to master_v2.9.0 Issue: NET-5086 gMap server: delete devices TODOs remaining in the code GitOrigin-RevId: 65527cc9c3dcd75d9f2ff93995993e6423c80f8a	2024-03-26 20:30:18 +00:00
sahbot	0befb14434	Integrating gmap-mibs-common to master_v0.21.1 Issue: NET-4888 [gmap] remove the pcb style location tag in the gmap mibs (on amx) GitOrigin-RevId: 9cbff12e1b6aff0f7940a4151f864e3d2e1c1d95	2024-03-20 08:02:05 +00:00
sahbot	35c40b4f3d	Integrating gmap-mod-ethernet-dev to master_v1.18.5 Issue: NET-5609 workaround amxb_be_who_has("DHCPv4Server.") timeout by retrying 10x GitOrigin-RevId: 3920a91194937af250789adb546525305a49c098	2024-03-16 17:35:58 +00:00
sahbot	fb06ccbfad	Integrating gmap-server to master_v2.8.0 Issue: NET-5460 Add support for upgrade-persistency GitOrigin-RevId: f021aeb73813c3ea36d8e822f7b338b7d01726aa	2024-03-14 17:15:24 +00:00
				`@@ -0,0 +1 @@`
				`opkg remove gmap-mod-conntrack-stats --force-depends`
				`@@ -0,0 +1 @@`
				`opkg remove gmap-mod-ethernet-dev --force-depends`
				`@@ -0,0 +1 @@`
				`opkg remove gmap-mod-name-selector --force-depends`
				`@@ -0,0 +1 @@`
				`opkg remove gmap-mod-sahpairing --force-depends`
				`@@ -0,0 +1 @@`
				`opkg remove gmap-mod-services-db --force-depends`
				`@@ -0,0 +1 @@`
				`opkg remove gmap-mibs-common --force-depends`