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
Integrating gmap-server to master_v2.14.0
2026-01-08 13:29:58 +08:00 · 2024-07-10 06:07:05 +00:00 · 2024-07-10 06:07:05 +00:00 · 2024-07-10 06:07:05 +00:00 · 2024-06-21 08:08:17 +00:00 · 2024-06-21 08:08:17 +00:00
8 changed files with 63 additions and 32 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.2
 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.2.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/archive/v1.19.2
+PKG_HASH:=f1e311b01c025ae4736d34399a5fcdf31a79812fe4eee55dd5989483b1b4f076
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v1.19.2
 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-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.2.3
+PKG_VERSION:=v0.2.5
 SHORT_DESCRIPTION:=gMap component that populates the datamodel based on preconfigured grules

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

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

-PKG_SOURCE:=gmap-server-v2.11.1.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v2.11.1
-PKG_HASH:=68433f52fdfc0882d24131cbb68e1bd1e8341a834cd31e05bb43ae1e347b3dfd
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v2.11.1
+PKG_SOURCE:=gmap-server-v2.14.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v2.14.0
+PKG_HASH:=ecf82a31e751a756cf3a1ee42247a33925668a9ad4dd4e9fa00207bb78bbdc58
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v2.14.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.1
+PKG_VERSION:=v0.24.2
 SHORT_DESCRIPTION:=Generic mib files for the gmap service

-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_SOURCE:=gmap-mibs-common-v0.24.2.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/archive/v0.24.2
+PKG_HASH:=f4ebf519838f098046348397c62a99453621ffd4472179b6f982bf785dc6fe2c
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.24.2
 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.7.0
+PKG_VERSION:=v1.7.1
 SHORT_DESCRIPTION:=Client library for gmap modules

-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_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	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