Integrating gmap-server to master_v2.2.12

Issue: HGWPR-24927 Fix crash on gmap devices with tricky names (dots, square... Issue: HOP-4628 [USP] access to Devices.Device. using USP return an error GitOrigin-RevId: 0378842fe5d8a6e30645c0c6ed23404282a1375d
Integrating gmap-mibs-common to master_v0.11.1
2026-01-11 08:23:35 +08:00 · 2023-10-15 09:04:05 +00:00 · 2023-10-10 12:50:28 +00:00 · 2023-10-06 13:11:22 +00:00 · 2023-10-06 13:11:22 +00:00 · 2023-10-06 13:11:22 +00:00
7 changed files with 43 additions and 44 deletions
--- 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.14.0
+PKG_VERSION:=v1.15.0
 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.14.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/archive/v1.14.0
-PKG_HASH:=90a433dd488a1eaf1c7548fe20739a72767389480770caffbe900c97b310d120
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v1.14.0
+PKG_SOURCE:=gmap-mod-ethernet-dev-v1.15.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/archive/v1.15.0
+PKG_HASH:=b7e8734dd7e43fbe39de6895d96b14b2931fc1b74288c2ff170b74c5b6971132
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v1.15.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
--- a/apps/gmap-mod-mdns/Makefile
+++ b/apps/gmap-mod-mdns/Makefile
@@ -1,16 +1,16 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-mod-mdns
-PKG_VERSION:=v0.1.4
+PKG_VERSION:=v0.1.5
 SHORT_DESCRIPTION:=Module to expose mdns information in gMap

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.1.4
-PKG_SOURCE_URL:=https://$(SAH_GIT_USER):$(SAH_GIT_TOKEN)@$(SAH_GIT)/$(SAH_GIT_GROUP)/components/gmap-mod-mdns.git
+PKG_SOURCE_VERSION:=v0.1.5
+PKG_SOURCE_URL:=https://$(SAH_GIT_USER):$(SAH_GIT_TOKEN)@$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-mdns.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:=
+PKG_LICENSE:=SAH
 PKG_LICENSE_FILES:=LICENSE


@@ -22,7 +22,7 @@ define Package/$(PKG_NAME)
  CATEGORY:=gmap
  SUBMENU:=Applications
  TITLE:=$(SHORT_DESCRIPTION)
-  URL:=https://$(SAH_GIT)/$(SAH_GIT_GROUP)/components/gmap-mod-mdns
+  URL:=https://$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-mdns
  DEPENDS += +libamxb
  DEPENDS += +libamxc
  DEPENDS += +libamxp
--- a/apps/gmap-mod-services-db/Makefile
+++ b/apps/gmap-mod-services-db/Makefile
@@ -1,16 +1,16 @@
 include $(TOPDIR)/rules.mk
+-include $(STAGING_DIR)/components.config

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

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.1.6
-PKG_SOURCE_URL:=https://$(SAH_GIT_USER):$(SAH_GIT_TOKEN)@$(SAH_GIT)/$(SAH_GIT_GROUP)/components/gmap-mod-services-db.git
+PKG_SOURCE_VERSION:=v0.1.7
+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:=
+PKG_LICENSE:=SAH
 PKG_LICENSE_FILES:=LICENSE


@@ -22,7 +22,7 @@ define Package/$(PKG_NAME)
  CATEGORY:=gmap
  SUBMENU:=Applications
  TITLE:=$(SHORT_DESCRIPTION)
-  URL:=https://$(SAH_GIT)/$(SAH_GIT_GROUP)/components/gmap-mod-services-db
+  URL:=https://$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-services-db
  DEPENDS += +libamxc
  DEPENDS += +libamxb
  DEPENDS += +libamxp
@@ -45,9 +45,6 @@ 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)
-	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
@@ -59,6 +56,9 @@ define Package/$(PKG_NAME)/install
 	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-upnp/Makefile
+++ b/apps/gmap-mod-upnp/Makefile
@@ -6,7 +6,7 @@ SHORT_DESCRIPTION:=Module to expose upnp information in gMap

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=v0.1.5
-PKG_SOURCE_URL:=https://$(SAH_GIT_USER):$(SAH_GIT_TOKEN)@$(SAH_GIT)/$(SAH_GIT_GROUP)/components/gmap-mod-upnp.git
+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)
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
@@ -22,7 +22,7 @@ define Package/$(PKG_NAME)
  CATEGORY:=gmap
  SUBMENU:=Applications
  TITLE:=$(SHORT_DESCRIPTION)
-  URL:=https://$(SAH_GIT)/$(SAH_GIT_GROUP)/components/gmap-mod-upnp
+  URL:=https://$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-upnp
  DEPENDS += +libamxb
  DEPENDS += +libamxc
  DEPENDS += +libamxp
--- 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.2.6
+PKG_VERSION:=v2.2.12
 SHORT_DESCRIPTION:=Service implementing the gmap data model

-PKG_SOURCE:=gmap-server-v2.2.6.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v2.2.6
-PKG_HASH:=5155290619ec5fd1e9fec161dd844cf40db35753574aa958aa482891890c2487
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v2.2.6
+PKG_SOURCE:=gmap-server-v2.2.12.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v2.2.12
+PKG_HASH:=b2f6e1e1aaacdd3ebfc1490ae5d61386d357595b8e0a7b53a54146e47eccfb89
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v2.2.12
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -60,9 +60,6 @@ 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 CONFIG_SAH_AMX_GMAP_SERVER_ORDER=$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER) CONFIG_AMX_GMAP_SERVER_NAME_ORDER=$(CONFIG_AMX_GMAP_SERVER_NAME_ORDER) CONFIG_AMX_GMAP_MAX_DEVICES=$(CONFIG_AMX_GMAP_MAX_DEVICES))
-	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)
@@ -77,6 +74,9 @@ define Package/$(PKG_NAME)/install
 	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

 define Package/$(PKG_NAME)/config
--- 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.10.0
+PKG_VERSION:=v0.11.1
 SHORT_DESCRIPTION:=Generic mib files for the gmap service

-PKG_SOURCE:=gmap-mibs-common-v0.10.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/archive/v0.10.0
-PKG_HASH:=773ca99addd4e57e2c0349d69ade2471b8ec5542213e1662d3252f712de61018
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.10.0
+PKG_SOURCE:=gmap-mibs-common-v0.11.1.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/archive/v0.11.1
+PKG_HASH:=090178ad71ec3a78f25c2739ff09013f15198ef741fa7639d8df58861e3a09c6
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.11.1
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -43,9 +43,6 @@ 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)
-	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
@@ -57,6 +54,9 @@ define Package/$(PKG_NAME)/install
 	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/libs/libgmap-client/Makefile
+++ b/libs/libgmap-client/Makefile
@@ -1,13 +1,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libgmap-client
-PKG_VERSION:=v1.5.2
 SHORT_DESCRIPTION:=Client library for gmap modules

-PKG_SOURCE:=libgmap-client-v1.5.2.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client/-/archive/v1.5.2
-PKG_HASH:=c1f840cc4d98977e827bb4c2aa2e1fe287d09c76b23e3e940380afdc8d9a8dd5
-PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-client-v1.5.2
+PKG_SOURCE:=libgmap-client-v1.5.3.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client/-/archive/v1.5.3
+PKG_HASH:=7adb25b5daaeed99ec0459a74b84d3a45dcd86ec461eeb4508f47f39f83aa7d8
+PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-client-v1.5.3
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -41,9 +40,6 @@ 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)
-	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
@@ -55,6 +51,9 @@ define Package/$(PKG_NAME)/install
 	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)))
Author	SHA1	Message	Date
sahbot	683e2d8ed4	Integrating gmap-server to master_v2.2.12 Issue: HGWPR-24927 Fix crash on gmap devices with tricky names (dots, square... Issue: HOP-4628 [USP] access to Devices.Device. using USP return an error GitOrigin-RevId: 0378842fe5d8a6e30645c0c6ed23404282a1375d	2023-10-15 09:04:05 +00:00
sahbot	bc772a41ba	Integrating gmap-mibs-common to master_v0.11.1 Issue: NET-5166 [AMX gMap] UserAgents are not present in Devices.Device DM GitOrigin-RevId: effc4bc98e5292427d7d496d1d70d2c6c694ecd2	2023-10-10 12:50:28 +00:00
sahbot	791d408c31	Integrating libgmap-client to master_v1.5.3 Issue: NET-4406 gMap: setAlternativeRules, removeAlternativeRules support GitOrigin-RevId: 090b6fd24de6177030b336d21e774c7cde1317dc	2023-10-06 13:11:22 +00:00
sahbot	f0692dcd41	Integrating gmap-mod-services-db to master_v0.1.7 Issue: NET-4406 gMap: setAlternativeRules, removeAlternativeRules support GitOrigin-RevId: 9a932040bb7f82ff299d5273906c1a9ed4ae30a7	2023-10-06 13:11:22 +00:00
sahbot	7e7f953382	Integrating gmap-server to master_v2.2.10 Issue: NET-4406 gMap: setAlternativeRules, removeAlternativeRules support GitOrigin-RevId: 65eff14fadd53b1e7a99008ee197bc36f0d9643d	2023-10-06 13:11:22 +00:00
sahbot	6cc3b7c965	Integrating gmap-server to master_v2.2.9 Issue: NET-5122 Fix licenseses (separate MR and commit) GitOrigin-RevId: 7cc09860e93e4ad22768660a780f10ee9ddb8864	2023-09-26 14:59:50 +00:00
sahbot	3850e0ad42	Integrating gmap-mod-mdns to master_v0.1.5 Issue: NET-5083 [gmap] [self] [mod] Self can be started after the modules, causing some detection issues. GitOrigin-RevId: 894a2df9d03e7b8dea127a9d5b4ec938354787e9	2023-09-25 08:46:57 +00:00
sahbot	5119bbfd30	Integrating gmap-mibs-common to master_v0.11.0 Issue: HOP-3828 - [DeviceInfo][Location] Allow a user to statically set its Location Configuration [new] Issue: NET-5075 [BDD][Gmap Mib] mapping issues detected GitOrigin-RevId: 0870cdbffaaeb7d5c7e74d8bc14be97d18e3ef49	2023-09-25 08:46:57 +00:00
sahbot	6bcccb83b4	Issue: ST-1152 Rework anonymous URL for proprietary repositories in feeds GitOrigin-RevId: 9f7561e55b366bc940b372a4cfc816e6260b1d22	2023-09-22 09:15:19 +00:00
sahbot	4ac976c76a	Integrating gmap-server to master_v2.2.7 Issue: NET-5099 Fix link() removes upper->lower but keeps lower->upper GitOrigin-RevId: 6692ee6f3c6303df556f050e5b0b8839ff175479	2023-09-21 11:28:18 +00:00
sahbot	5f1335f53c	Integrating gmap-mod-ethernet-dev to master_v1.15.0 Issue: NET-5093 Use link() instead of setLink() Issue: NET-5112 Keep link to port on disconnect GitOrigin-RevId: 429dae4efdc6f38eb909413862b326acf45a46d0	2023-09-21 11:28:18 +00:00
sahbot	012e714174	Integrating gmap-mod-ethernet-dev to master_v1.14.1 Issue: NET-5093 Use link() instead of setLink() GitOrigin-RevId: 39376d3e2dfe66facaa06c4bfe1bee58ccae19d5	2023-09-21 11:28:18 +00:00