Integrating gmap-mod-services-db to master_v0.2.4

Issue: HOP-6786 Default gRules must be removed GitOrigin-RevId: 65bad5dc0b817dacc870f6c42dd2d201a50e1909
Integrating gmap-server to master_v2.13.0
2026-01-09 07:24:24 +08:00 · 2024-06-13 16:05:10 +00:00 · 2024-06-13 16:05:10 +00:00 · 2024-06-13 16:05:10 +00:00 · 2024-05-28 07:07:26 +00:00 · 2024-05-28 06:52:22 +00:00
9 changed files with 42 additions and 35 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-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.5
+PKG_VERSION:=v1.19.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.18.5.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/archive/v1.18.5
-PKG_HASH:=a8c80870d128b4368982f0d7f45f0020f0eb5dc048fd9d766d1092361717b28e
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v1.18.5
+PKG_SOURCE:=gmap-mod-ethernet-dev-v1.19.1.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/archive/v1.19.1
+PKG_HASH:=41df5fd9be4cd9f44d46acf58104e20d91dd179e8799df6fcb5641898d848055
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v1.19.1
 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-self/Makefile
+++ b/apps/gmap-mod-self/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-mod-self
-PKG_VERSION:=v1.6.1
+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.6.1.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self/-/archive/v1.6.1
-PKG_HASH:=cc2597331cb12a08352bcfaf6043be4c675602325a0d84ca2c08e3d122d2a900
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-self-v1.6.1
+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.2.1
+PKG_VERSION:=v0.2.4
 SHORT_DESCRIPTION:=gMap component that populates the datamodel based on preconfigured grules

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.2.1
+PKG_SOURCE_VERSION:=v0.2.4
 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.2
+PKG_VERSION:=v0.3.0
 SHORT_DESCRIPTION:=Module to expose upnp information in gMap

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

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

-PKG_SOURCE:=gmap-server-v2.10.2.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v2.10.2
-PKG_HASH:=af07b15c2705b30fb6110afa5a35350dcc58920d0cd344f1d55aca75563773e2
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v2.10.2
+PKG_SOURCE:=gmap-server-v2.13.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v2.13.0
+PKG_HASH:=d95e4e0a3df4a0ea137cfb46a812215a3f0d1949cdc5bd6342fb3bcfcb162f13
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v2.13.0
 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.22.0
+PKG_VERSION:=v0.24.0
 SHORT_DESCRIPTION:=Generic mib files for the gmap service

-PKG_SOURCE:=gmap-mibs-common-v0.22.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/archive/v0.22.0
-PKG_HASH:=ffd7a964fbdbe9472f86e9b063b1b32001d2a603b3a29224354f1ac034089da4
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.22.0
+PKG_SOURCE:=gmap-mibs-common-v0.24.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/archive/v0.24.0
+PKG_HASH:=ff0442661aae954e323ea576c85e720155e3ea1d300a4d03ebe1603fd5fbf0e9
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.24.0
 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/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.1
 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.1.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client/-/archive/v1.7.1
+PKG_HASH:=ccf0c57b95630357ba57512df832b7a1599f01180e5c092f3e0494f244650df3
+PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-client-v1.7.1
 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.1.0
 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.1.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-ext/-/archive/v1.1.0
+PKG_HASH:=5a81ea5759067396b326d8ab718ddac6d6f0aebc95b08de02275a52a7a5991fd
+PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-ext-v1.1.0
 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	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