Integrating gmap-mod-upnp to master_v0.1.9

Issue: NET-5219 [GMAP] Server parameter is missing for upnp devices GitOrigin-RevId: 7adcbb98b9e6762734a76a8c81673654f0521577
Integrating gmap-server to master_v2.2.16
2026-01-09 23:47:26 +08:00 · 2023-10-25 08:15:09 +00:00 · 2023-10-24 08:26:53 +00:00 · 2023-10-24 08:26:53 +00:00 · 2023-10-20 19:16:44 +00:00 · 2023-10-20 06:40:12 +00:00
6 changed files with 37 additions and 35 deletions
--- 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.1.1
+PKG_VERSION:=v1.1.2
 SHORT_DESCRIPTION:=gMap client plugin

-PKG_SOURCE:=gmap-client-v1.1.1.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client/-/archive/v1.1.1
-PKG_HASH:=c77f3a38651ae5a848479bb682c8bf750617935e178b2ec381da22b116f614f1
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-client-v1.1.1
+PKG_SOURCE:=gmap-client-v1.1.2.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client/-/archive/v1.1.2
+PKG_HASH:=1de9b304c1451a29b368abeaf583b301fe2b6d45ffbb038fb85459e6f589a1a0
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-client-v1.1.2
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -36,7 +36,6 @@ define Package/$(PKG_NAME)
  DEPENDS += +libamxo
  DEPENDS += +libsahtrace
  DEPENDS += +amxrt
-  DEPENDS += +gmap-server
  MENU:=1
 endef

@@ -49,16 +48,13 @@ define Build/Compile
 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 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_CLIENT_ORDER=$(CONFIG_SAH_AMX_GMAP_CLIENT_ORDER) CONFIG_SAH_AMX_GMAP_CLIENT_ONE_PROCESS=$(CONFIG_SAH_AMX_GMAP_CLIENT_ONE_PROCESS))

 	$(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))
+	$(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_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
@@ -66,6 +62,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/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.15.0
+PKG_VERSION:=v1.15.1
 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.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_SOURCE:=gmap-mod-ethernet-dev-v1.15.1.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/archive/v1.15.1
+PKG_HASH:=2ac7f8b6d6bb3b5a789543e7fc610ee24e9ab78fa9c129f78cb99c5bc837491c
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v1.15.1
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -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-services-db/Makefile
+++ b/apps/gmap-mod-services-db/Makefile
@@ -2,10 +2,11 @@ include $(TOPDIR)/rules.mk
 -include $(STAGING_DIR)/components.config

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

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.1.7
+PKG_SOURCE_VERSION:=v0.1.8
 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)
--- a/apps/gmap-mod-upnp/Makefile
+++ b/apps/gmap-mod-upnp/Makefile
@@ -1,16 +1,17 @@
 include $(TOPDIR)/rules.mk
+-include $(STAGING_DIR)/components.config

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

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.1.5
+PKG_SOURCE_VERSION:=v0.1.9
 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>
-PKG_LICENSE:=
+PKG_LICENSE:=SAH
 PKG_LICENSE_FILES:=LICENSE


@@ -45,9 +46,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 +57,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-server/Makefile
+++ b/apps/gmap-server/Makefile
@@ -1,12 +1,13 @@
 include $(TOPDIR)/rules.mk

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

-PKG_SOURCE:=gmap-server-v2.2.10.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v2.2.10
-PKG_HASH:=c6c48203b761edf6527deea46c7c3a2745ca43c86f33103066dd2a9c230cddca
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v2.2.10
+PKG_SOURCE:=gmap-server-v2.2.16.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v2.2.16
+PKG_HASH:=184215e854614512d2795481de35f3e39ef2d99ab02ca43d8081cc0bb165146a
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v2.2.16
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
--- 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.11.1
+PKG_VERSION:=v0.11.2
 SHORT_DESCRIPTION:=Generic mib files for the gmap service

-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_SOURCE:=gmap-mibs-common-v0.11.2.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/archive/v0.11.2
+PKG_HASH:=4d799e0294274b7cb6992b07b26919a53a36ceda1b65d9f7ac2e18035ca20ce4
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.11.2
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
Author	SHA1	Message	Date
sahbot	28ab0a8759	Integrating gmap-mod-upnp to master_v0.1.9 Issue: NET-5219 [GMAP] Server parameter is missing for upnp devices GitOrigin-RevId: 7adcbb98b9e6762734a76a8c81673654f0521577	2023-10-25 08:15:09 +00:00
sahbot	9832130f14	Integrating gmap-server to master_v2.2.16 Issue: NET-5206 Move DeviceType from gmap server to information mib GitOrigin-RevId: cfe9dec7a60011fdefa2aa6aafbe51d28281581b	2023-10-24 08:26:53 +00:00
sahbot	f578d8dcda	Integrating gmap-client to master_v1.1.2 Issue: SSW-6789 [LCM] add all feed wifi services components to the wifion lcm app GitOrigin-RevId: 25d50aa64f82bc6bc52041d745d4c523cec17ddd	2023-10-24 08:26:53 +00:00
sahbot	29c6c1997f	Integrating gmap-server to master_v2.2.15 Issue: NET-5212 [gMAP] [Prpl] Tag parsing not working as expected GitOrigin-RevId: fb373c0cb3ecf7fcf180809cf5499d27e57f0a5f	2023-10-20 19:16:44 +00:00
sahbot	6cb75b0f05	Integrating gmap-mod-ethernet-dev to master_v1.15.1 Issue: NET-5209 Change bridgetable Active priority to 50 GitOrigin-RevId: a972bca2c0494dbeb049b84a0b57bb5fd71d28d1	2023-10-20 06:40:12 +00:00
sahbot	5902bffd51	Integrating gmap-mod-upnp to master_v0.1.8 Issue: NET-5083 [gmap] [self] [mod] Self can be started after the modules, causing some detection issues. Issue: NET-5158 [gmap][mod-upnp] Not use the UDN as Alias anymore, only index Issue: NET-5217 [gmap][mod-upnp] Fill the ModelName parameter GitOrigin-RevId: f5abde5136438ba724a789335962610e0f14b3d0	2023-10-20 06:40:12 +00:00
sahbot	728ef1caa5	Integrating gmap-mibs-common to master_v0.11.2 Issue: NET-5182 Add multi-instance objects for missing bdd parameters GitOrigin-RevId: 8c094d8173e54d981a6ba4ca3e4f3a926974c5e5	2023-10-20 06:40:12 +00:00
sahbot	0007d6a705	Integrating gmap-server to master_v2.2.14 Issue: NET-5057 gMap Homeplug plugin: topology changes GitOrigin-RevId: b29f5049a52e7d4680917bc291c1912bad0c93d6	2023-10-20 06:40:12 +00:00
sahbot	0e215f3898	Integrating gmap-mod-services-db to master_v0.1.8 Issue: DUMMY-0000 - No associated bugs found GitOrigin-RevId: 4c1be2b41368ab6db6cc88981b50125aeaa60437	2023-10-20 06:40:12 +00:00
sahbot	1c9b57ce95	Integrating gmap-mod-upnp to master_v0.1.7 Issue: NET-5083 [gmap] [self] [mod] Self can be started after the modules, causing some detection issues. Issue: NET-5158 [gmap][mod-upnp] Not use the UDN as Alias anymore, only index GitOrigin-RevId: f602d5ef178f53ef177ecb6fa213c565f5292ebe	2023-10-20 06:40:12 +00:00
sahbot	6e7bd47bfd	Integrating gmap-mod-upnp to master_v0.1.6 Issue: NET-5083 [gmap] [self] [mod] Self can be started after the modules, causing some detection issues. GitOrigin-RevId: 0f6fb0fc8c9b2be0d3e0dbe7a31a7a13beff6585	2023-10-20 06:40:12 +00:00
sahbot	f128b86ab3	[CI] Update PKG_HASH GitOrigin-RevId: f134306c5d4fa5a521eee18a1d04bd2b1053e303	2023-10-16 15:56:13 +00:00
sahbot	09854404bf	Integrating gmap-server to master_v2.2.13 Issue: NET-5197 Fix datamodel gmap missing in getdebug GitOrigin-RevId: 421ff53658d8c13e913f054079f8dd9b8d5a13cf	2023-10-16 15:56:13 +00:00
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