Integrating gmap-mod-self to master_v1.7.0

Issue: NET-5764 Adapt to new link API GitOrigin-RevId: 8bcde9349895e8146a7ae6bb8c0f0bf7ac1acc1f
Integrating gmap-server to master_v2.11.0
2026-01-10 16:07:21 +08:00 · 2024-05-04 07:07:02 +00:00 · 2024-05-02 15:04:59 +00:00 · 2024-05-02 15:04:59 +00:00 · 2024-04-19 17:28:43 +00:00 · 2024-04-11 18:31:52 +00:00
8 changed files with 44 additions and 44 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.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-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-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.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-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.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self/-/archive/v1.7.0
+PKG_HASH:=9567f0fbbf65b2f320e69afb621b216d2161b61d137c4df8fb17730b61b30eb5
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-self-v1.7.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
--- a/apps/gmap-mod-services-db/Makefile
+++ b/apps/gmap-mod-services-db/Makefile
@@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk
 -include $(STAGING_DIR)/components.config

 PKG_NAME:=gmap-mod-services-db
-PKG_VERSION:=v0.1.9
+PKG_VERSION:=v0.2.1
 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.1
 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
@@ -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.2.2
 SHORT_DESCRIPTION:=Module to expose upnp information in gMap

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.2.0
+PKG_SOURCE_VERSION:=v0.2.2
 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-server/Makefile
+++ b/apps/gmap-server/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

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

-PKG_SOURCE:=gmap-server-v2.8.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v2.8.0
-PKG_HASH:=6b07b814e36d1d1b533f6fe03ddf3f126e697117ba139eeb4c7d11f22205883e
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v2.8.0
+PKG_SOURCE:=gmap-server-v2.11.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v2.11.0
+PKG_HASH:=480bfae4ca1bf51ace598d6b12962405e32c1f71294453c794dbf7d9c958e70d
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v2.11.0
 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/
--- 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.1
+PKG_VERSION:=v0.22.1
 SHORT_DESCRIPTION:=Generic mib files for the gmap service

-PKG_SOURCE:=gmap-mibs-common-v0.21.1.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/archive/v0.21.1
-PKG_HASH:=4fe29cc1279c12f2a55ae315f18dd278036a0a0f29fd8ab3dd964c7a095628e3
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.21.1
+PKG_SOURCE:=gmap-mibs-common-v0.22.1.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/archive/v0.22.1
+PKG_HASH:=a7a6c3551db0ead6faf538b4a56fae445a949e17ccf9e65e35558665e2e33efc
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.22.1
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
--- 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:=v1.7.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-v1.7.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client/-/archive/v1.7.0
+PKG_HASH:=415943fd7cf3f403e20ceafabdcd505d834ee18061780619ce883b571b94b5a9
+PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-client-v1.7.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
Author	SHA1	Message	Date
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