Integrating gmap-mod-moca to master_v0.5.1

Issue: NET-7566 - CHR30A 4.1.7.60 Devices connected wifi showing connected coax

Signed-off-by: sahbot                 <sahbot@softathome.com>
GitOrigin-RevId: cffa8c76104d99990a9824d7dc93da6a30783150

.gitlab-ci.yml

@@ -0,0 +1,4 @@
+---
+
+include:
+  - remote: 'https://gitlab.com/prpl-foundation/tooling/yml-templates/raw/main/.feed-pipeline.yml'

CHANGELOG.md

@@ -1,410 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [Unreleased]
-
-
-## Release v0.17.11 - 2023-02-16(13:57:24 +0000)
-
-### Other
-
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): Fix gmap-server sometimes thinks time never syncronized
-- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): [libgmap-client] generated datamodel documentation is empty
-
-## Release v0.17.10 - 2023-02-15(17:03:48 +0000)
-
-### Other
-
-- [gmap-mibs-common](https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common): Rename nemo->netdev and adapt to new 'style' of mib expression
-- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self): Adapt to 'nemo' tag not used anymore
-
-## Release v0.17.9 - 2023-02-08(18:19:04 +0000)
-
-### Other
-
-- [gmap-mibs-common](https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common): [gMap][BDD] Create Information MiB
-- [gmap-mibs-common](https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common): [BDD][gMap] Create BDD MiB
-
-## Release v0.17.8 - 2023-02-07(14:52:00 +0000)
-
-### Other
-
-- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): Mark colliding IPs with Status=error
-
-## Release v0.17.7 - 2023-02-06(11:57:57 +0000)
-
-### Other
-
-- [libgmap-ext](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-ext): Track MAC and collisions and reduce ARPs sent
-
-## Release v0.17.6 - 2023-02-03(20:34:43 +0000)
-
-### Other
-
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): Fix incorrect log on adding default name
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): Remove event stdout spam
-
-## Release v0.17.5 - 2023-02-02(12:33:47 +0000)
-
-### Other
-
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): [gmap] Remove the time-plugin requirement from gmap-server
-
-## Release v0.17.4 - 2023-01-30(18:52:35 +0000)
-
-### Other
-
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): [gmap] avoid using m4 odl files.
-
-## Release v0.17.3 - 2023-01-25(17:37:20 +0000)
-
-### Other
-
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): [gmap] the max nr of devices needs to be checked in gmaps_new_device instead of in _Devices_createDevice
-
-## Release v0.17.2 - 2023-01-23(11:36:56 +0000)
-
-### Other
-
-- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): Support ARP IP down + start arping
-
-## Release v0.17.1 - 2023-01-19(19:08:49 +0000)
-
-### Other
-
-- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): [amx][gmap] Expose mdns information in gMap
-
-## Release v0.17.0 - 2023-01-19(14:45:17 +0000)
-
-### New
-
-- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): [import-dbg] Disable import-dbg by default for all amxrt plugin
-
-### Other
-
-- [gmap-mibs-common](https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common): [amx][gmap] Expose mdns information in gMap
-- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): Create IP in gmap device on gratuitous ARP
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): gMap server: getParameters, getFirstParameter RPC
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): gMap Server: DM RPC cleanup
-- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): gMap server: getParameters, getFirstParameter RPC
-- [libgmap-ext](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-ext): send ARP + callback on timeout/success
-
-## Release v0.16.0 - 2023-01-11(11:39:17 +0000)
-
-### New
-
-- [libgmap-ext](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-ext): Component added
-
-## Release v0.15.2 - 2023-01-10(13:35:53 +0000)
-
-### Fixes
-
-- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self): Use search path in requires statement for instance object
-
-### Other
-
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): GMap Server: implementation of gmap additional expression operators
-
-## Release v0.15.1 - 2023-01-06(13:23:10 +0000)
-
-### Fixes
-
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): Fix optional include of components.config.m4 in config/gmap_conf_global.odl.m4
-
-## Release v0.15.0 - 2023-01-05(16:26:47 +0000)
-
-### New
-
-- [gmap-client](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client): [import-dbg] Disable import-dbg by default for all amxrt plugin
-- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self): [import-dbg] Disable import-dbg by default for all amxrt plugin
-- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): [import-dbg] Disable import-dbg by default for all amxrt plugin
-
-### Other
-
-- [gmap-mibs-common](https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common): [amx][gmap] Expose mdns information in gMap
-- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): [amx][gmap] gmap_devices_findByIp function uses incorrect search paths
-
-## Release v0.14.4 - 2022-12-20(18:44:19 +0000)
-
-### Other
-
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): Use optional include when including components.config.m4
-
-## Release v0.14.3 - 2022-12-16(10:57:40 +0000)
-
-### Other
-
-- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): [amx][gmap] Expose mdns information in gMap
-
-## Release v0.14.2 - 2022-12-08(17:06:51 +0000)
-
-### Other
-
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): gMap Event handling
-- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): gMap Event handling
-
-## Release v0.14.1 - 2022-12-02(11:52:25 +0000)
-
-### Other
-
-- [gmap-mibs-common](https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common): [amx][gmap] mib-ip fails to load due to undefined symbol
-- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self): Sync bridge IP from netmodel + add 'bridge' tag
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): [amx][gmap] mib-ip fails to load due to undefined symbol
-- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): [amx][gmap] mib-ip fails to load due to undefined symbol
-- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): Add IP query support
-
-## Release v0.14.0 - 2022-11-30(08:00:55 +0000)
-
-### New
-
-- [gmap-mibs-common](https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common): [gMap][wanBlock] Development of a gMap wanblock module
-
-### Other
-
-- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): Rename name source 'HostName'->'dhcp'
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): Add 'dhcp' to default name source list
-
-## Release v0.13.11 - 2022-11-28(17:46:30 +0000)
-
-### Other
-
-- [gmap-mibs-common](https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common): Add DHCPv4Client & DHCPv6Client in dhcp mib .odl
-
-## Release v0.13.10 - 2022-11-24(11:35:59 +0000)
-
-### Other
-
-- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): Add DHCP option 12 HostName
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): gMap Server: fix gmaps_device_get_recursive
-
-## Release v0.13.9 - 2022-11-22(07:54:07 +0000)
-
-### Other
-
-- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): Add gmap_ip_device_get_addresses()
-
-## Release v0.13.8 - 2022-11-09(10:03:53 +0000)
-
-### Other
-
-- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): Talk to standard TR-181 DHCPv4 datamodel instead of custom notifications
-- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): Add gmap_devices_findByIp
-
-## Release v0.13.7 - 2022-10-24(13:32:19 +0000)
-
-### Other
-
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): [gmap] Automatic clean up of inactive devices when MaxDevices is reached.
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): [gmap] Automatic clean up of inactive devices when MaxDevices is reached.
-
-## Release v0.13.6 - 2022-10-13(11:22:21 +0000)
-
-### Other
-
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): [amx][gmap] Define Name, setName(), delName() behaviour
-
-## Release v0.13.5 - 2022-10-06(17:08:01 +0000)
-
-### Other
-
-- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): [amx][gmap] Define Name, setName(), delName() behaviour
-
-## Release v0.13.4 - 2022-09-28(06:14:07 +0000)
-
-### Other
-
-- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): Fix fail to subscribe to DHCPv4 at boot
-
-## Release v0.13.3 - 2022-09-26(15:28:34 +0000)
-
-### Other
-
-- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): fix dhcp: no IP addresses created on new lease
-- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): Create unit tests for amx gMap Query feature
-- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): Do not spam log on ip not found
-
-## Release v0.13.2 - 2022-09-23(12:44:16 +0000)
-
-### Other
-
-- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): Various cleanup
-
-## Release v0.13.1 - 2022-09-20(12:43:47 +0000)
-
-### Other
-
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): [prpl][gMap]RPC topology missing
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): Create unit tests for amx gMap Query feature
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): the Devices.link() function only allows one lower device
-
-## Release v0.13.0 - 2022-09-19(16:28:08 +0000)
-
-### Other
-
-- [gmap-client](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client): Fix `/etc/init.d/gmap-client stop` not working
-- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): replace using netlink with using NetDev + test
-
-## Release v0.12.0 - 2022-09-06(07:35:42 +0000)
-
-### New
-
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): [prpl][gMap]RPC topology missing
-
-## Release v0.11.0 - 2022-09-02(07:26:08 +0000)
-
-### New
-
-- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): [prpl][gMap]RPC topology missing
-
-## Release v0.10.6 - 2022-08-30(14:01:45 +0000)
-
-### Other
-
-- [gmap-client](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client): Gmap: Fix default and make gmap default startup priority configurable
-- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): Add missing requires
-- [gmap-mod-name-selector](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector): Add missing requires
-- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self): Add missing requires
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): Gmap: Fix default and make gmap default startup priority configurable
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): Gmap: Fix default and make gmap default startup priorityr configurable
-
-## Release v0.10.5 - 2022-08-22(15:48:10 +0000)
-
-### Other
-
-- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self): remove "wifirepeater" tag until clear why needed
-
-## Release v0.10.4 - 2022-08-09(10:47:53 +0000)
-
-### Other
-
-- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): Link dev<->port dynamically when all info is available
-
-## Release v0.10.3 - 2022-08-08(16:23:26 +0000)
-
-### Other
-
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): Implement using UUIDs for device keys
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): [prpl][gMap] gMap queries must be evaluated in the gMap server(not the lib)
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): [CI] Fix missing dependencies on uuid
-- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): [prpl][gMap] gMap queries must be evaluated in the gMap server(not the lib)
-
-## Release v0.10.2 - 2022-08-04(09:20:50 +0000)
-
-### Other
-
-- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): LAN Device must have a uuid as unique (instance)key
-- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): LAN Device must have a uuid as unique (instance)key
-
-## Release v0.10.1 - 2022-07-29(09:23:27 +0000)
-
-### Other
-
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): test mib loading + move testhelper functions to correct test file
-
-## Release v0.10.0 - 2022-07-27(09:40:31 +0000)
-
-### New
-
-- [gmap-client](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client): Component added
-
-### Other
-
-- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): [Gitlab CI][Unit tests][valgrind] Pipeline doesn't stop when memory leaks are detected
-- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): [prpl][gMap] gMap needs to be split in a gMap-core and gMap-client process
-- [gmap-mod-name-selector](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector): [prpl][gMap] gMap needs to be split in a gMap-core and gMap-client process
-- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self): [prpl][gMap] gMap needs to be split in a gMap-core and gMap-client process
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): [prpl][gMap] gMap needs to be split in a gMap-core and gMap-client process
-
-## Release v0.9.2 - 2022-07-14(12:54:08 +0000)
-
-### Other
-
-- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): Revert "common: add workaround method for retrieving intf from ifindex"
-- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self): Switch to using netmodel and amxs
-- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): Fix `gmap_devices_unlink` doing nothing
-
-## Release v0.9.1 - 2022-06-01(13:06:16 +0000)
-
-### Fixes
-
-- [gmap-mod-name-selector](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector): [Gitlab CI][Unit tests][valgrind] Pipeline doesn't stop when memory leaks are detected
-- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self): [Gitlab CI][Unit tests][valgrind] Pipeline doesn't stop when memory leaks are detected
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): [Gitlab CI][Unit tests][valgrind] Pipeline doesn't stop when memory leaks are detected
-
-### Other
-
-- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): Fix DHCP option 60 (vendor class) not coming through
-- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): [Gitlab CI][Unit tests][valgrind] Pipeline doesn't stop when...
-
-## Release v0.9.0 - 2022-01-28(19:52:18 +0000)
-
-### New
-
-- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): Add query functionality
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): Gmap add query functionality
-
-## Release v0.8.3 - 2021-11-09(08:47:08 +0000)
-
-### Changes
-
-- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self): remove symlink to init script
-- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): remove symlink to init script
-
-## Release v0.8.2 - 2021-10-14(11:25:18 +0000)
-
-## Release v0.8.1 - 2021-10-06(11:42:29 +0000)
-
-### Fixes
-
-- [gmap-mod-self](https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-self): [GMAP-MOD-SELF] add ; in odl
-- [gmap-mod-self](https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-self): [GMAP-MOD-SELF] wait for network.device on ubus
-
-## Release v0.8.0 - 2021-09-15(07:36:35 +0000)
-
-### New
-
-- [gmap-mod-ethernet-dev](https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-ethernet-dev): make use of libdhcpoption
-
-## Release v0.7.1 - 2021-09-14(16:27:08 +0000)
-
-### Fixes
-
-- [gmap-mibs-common](https://gitlab.com/soft.at.home/gmap/mibs/gmap-mibs-common): [amxc] add ifdef around when_null_x, when_str_empty_x
-- [gmap-mibs-common](https://gitlab.com/soft.at.home/gmap/mibs/gmap-mibs-common): Use amxc_macros.h instead of local macros
-- [gmap-mod-name-selector](https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-name-selector): [amxc] add ifdef around when_null_x, when_str_empty_x
-
-## Release v0.7.0 - 2021-08-20(14:14:49 +0000)
-
-### New
-
-- [gmap-server](https://gitlab.com/soft.at.home/gmap/applications/gmap-server): [GMAP] add implementation for name selection
-
-## Release v0.6.0 - 2021-08-18(17:16:12 +0000)
-
-### New
-
-- [gmap-mod-name-selector](https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-name-selector): Component added
-- [gmap-mod-ethernet-dev](https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-ethernet-dev): GMAP-MOD-ETHERNET-DEV add dhcp information to device
-
-### Fixes
-
-- [libgmap-client](https://gitlab.com/soft.at.home/gmap/libraries/libgmap-client): [GMAP_CLIENT] functions returns array while expecting a bool
-- [libgmap-client](https://gitlab.com/soft.at.home/gmap/libraries/libgmap-client): [GMAP-CLIENT] gmap_device_hasTag does not work
-- [gmap-server](https://gitlab.com/soft.at.home/gmap/applications/gmap-server): [GMAP-SERVER] allow hasTags to check multiple tags
-
-## Release v0.5.2 - 2021-08-06(13:58:03 +0000)
-
-### Changes
-
-- [gmap-server](https://gitlab.com/soft.at.home/gmap/applications/gmap-server): GMAP-SERVER update mibs after changing tag
-
-## Release v0.5.1 - 2021-08-05(14:40:46 +0000)
-
-### Fixes
-
-- [libgmap-client](https://gitlab.com/soft.at.home/gmap/libraries/libgmap-client): Circular dependency libgmap-client and gmap-server
-

README.md

@@ -1,41 +0,0 @@
-# Feed_gmap
-
-SoftAtHome feed of Openwrt packages for gMap components.
-
-## Included components
-
-Feed_gmap includes the following components:
-
-### Plugins
-
-- [gmap-client](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client) - gMap client plugin
-
-### Applications
-
-- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev) - gMap component that adds discovered devices to the gmap datamodel and links them to the correct interface
-- [gmap-mod-name-selector](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector) - Name selection module for gmap
-- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self) - gmap module to fetch information about the hgw/repeater itself and the layer 2 'devices' on it
-- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server) - Service implementing the gmap data model
-
-### Configurations
-
-- [gmap-mibs-common](https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common) - Generic mib files for the gmap service
-
-### Libraries
-
-- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client) - Client library for gmap modules
-- [libgmap-ext](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-ext) - Functionality common for gmap clients (not server)
-
-## How to add feed_gmap to your OpenWrt build
-
-At the root of your OpenWrt tree, add the following to your `feeds.conf` file:
-
-```sh
-src-git feed_gmap git@gitlab.com:soft.at.home/buildsystems/openwrt/feed_gmap.git;main
-```
-
-Add the packages to your OpenWrt instance with the following commands:
-```sh
-./scripts/feeds update feed_gmap #retrieve the feed from service/update to latest
-./scripts/feeds install -p feed_gmap #make all of the feed packages available to the build
-```

apps/gmap-client/Config.in

@@ -11,13 +11,13 @@ config SAH_AMX_GMAP_CLIENT
     bool "Build the gMap client plugin"
     default y
 
-config SAH_AMX_GMAP_CLIENT_ORDER
+config SAH_AMX_GMAP_CLIENT_START_ORDER
     int "gMap client plugin startup order"
     default 82
 
-config SAH_AMX_GMAP_CLIENT_ONE_PROCESS
-    bool "All gMap client modules run in same process"
-    default y
+config SAH_AMX_GMAP_CLIENT_STOP_ORDER
+    int "gMap client plugin shutdown order"
+    default 18
 
 endmenu
 

apps/gmap-client/Makefile

@@ -1,13 +1,15 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gmap-client
-PKG_VERSION:=v1.1.0
-SHORT_DESCRIPTION:=gMap client plugin
+PKG_VERSION:=sah-next_v1.4.1
+SHORT_DESCRIPTION:=Script to start gMap clients
 
-PKG_SOURCE:=gmap-client-v1.1.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client/-/archive/v1.1.0
-PKG_HASH:=43c7d12af0c6f1e171e0a29d23a315ccd34c3e96313a637d68ca171178b0ef9e
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-client-v1.1.0
+PKG_SOURCE:=gmap-client-sah-next_v1.4.1.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client/-/archive/sah-next_v1.4.1
+PKG_HASH:=3a0c9483cc8618590fbca159852547d260f132a8ecb02056a7cd524a442fafaa
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-client-sah-next_v1.4.1
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -18,46 +20,37 @@ PKG_RELEASE:=1
 
 define SAHInit/Install
 	install -d ${PKG_INSTALL_DIR}/etc/rc.d/
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/etc/rc.d/S$(CONFIG_SAH_AMX_GMAP_CLIENT_ORDER)$(COMPONENT)
+	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/etc/rc.d/S$(CONFIG_SAH_AMX_GMAP_CLIENT_START_ORDER)$(COMPONENT)
+	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/etc/rc.d/K$(CONFIG_SAH_AMX_GMAP_CLIENT_STOP_ORDER)$(COMPONENT)
 endef
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
-  CATEGORY:=gmap
-  SUBMENU:=Plugins
+  CATEGORY:=prpl Foundation
+  SUBMENU:=gMap
   TITLE:=$(SHORT_DESCRIPTION)
   URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client
-  DEPENDS += +libamxc
-  DEPENDS += +libamxp
-  DEPENDS += +libamxd
-  DEPENDS += +libamxb
-  DEPENDS += +libamxo
-  DEPENDS += +libsahtrace
   DEPENDS += +amxrt
-  DEPENDS += +gmap-server
   MENU:=1
 endef
 
 define Package/$(PKG_NAME)/description
-	gMap client plugin
+	Script to start gMap clients
 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 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/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_AMX_GMAP_CLIENT_START_ORDER=$(CONFIG_SAH_AMX_GMAP_CLIENT_START_ORDER) CONFIG_SAH_AMX_GMAP_CLIENT_STOP_ORDER=$(CONFIG_SAH_AMX_GMAP_CLIENT_STOP_ORDER))
 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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT) CONFIG_SAH_AMX_GMAP_CLIENT_START_ORDER=$(CONFIG_SAH_AMX_GMAP_CLIENT_START_ORDER) CONFIG_SAH_AMX_GMAP_CLIENT_STOP_ORDER=$(CONFIG_SAH_AMX_GMAP_CLIENT_STOP_ORDER))
 
 	$(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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT) CONFIG_SAH_AMX_GMAP_CLIENT_START_ORDER=$(CONFIG_SAH_AMX_GMAP_CLIENT_START_ORDER) CONFIG_SAH_AMX_GMAP_CLIENT_STOP_ORDER=$(CONFIG_SAH_AMX_GMAP_CLIENT_STOP_ORDER))
 endef
 
 define Package/$(PKG_NAME)/install
@@ -65,6 +58,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

apps/gmap-client/files/etc/runlevel.d/ap/10-remove-gmap-client.sh

@@ -0,0 +1 @@
+opkg remove gmap-client --force-depends

apps/gmap-mod-conntrack-stats/Makefile

@@ -0,0 +1,67 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.softathome.com/ext_prpl/components/gmap-mod-conntrack-stats/-/blob/main/baf.yml instead
+include $(TOPDIR)/rules.mk
+-include $(STAGING_DIR)/components.config
+
+PKG_NAME:=gmap-mod-conntrack-stats
+PKG_VERSION:=v1.1.0
+SHORT_DESCRIPTION:=Module to conntrack statistics information in gMap
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=v1.1.0
+PKG_SOURCE_URL:=https://$(SAH_GIT_USER):$(SAH_GIT_TOKEN)@$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-conntrack-stats.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:=BSD-2-Clause-Patent
+PKG_LICENSE_FILES:=LICENSE
+
+
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+  CATEGORY:=SoftAtHome
+  SUBMENU:=gMap
+  TITLE:=$(SHORT_DESCRIPTION)
+  URL:=https://$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-conntrack-stats
+  DEPENDS += +libamxb
+  DEPENDS += +libamxc
+  DEPENDS += +libamxp
+  DEPENDS += +libamxd
+  DEPENDS += +libamxo
+  DEPENDS += +libamxs
+  DEPENDS += +libgmap-client
+  DEPENDS += +libsahtrace
+  DEPENDS += +amxrt
+  MENU:=1
+endef
+
+define Package/$(PKG_NAME)/description
+	Module to conntrack statistics information in gMap
+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)
+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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
+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 CONFIG_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
+endef
+
+define Package/$(PKG_NAME)/install
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	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)))

apps/gmap-mod-conntrack-stats/files/etc/runlevel.d/ap/10-remove-gmap-mod-conntrack-stats.sh

@@ -0,0 +1 @@
+opkg remove gmap-mod-conntrack-stats --force-depends

apps/gmap-mod-ethernet-dev/Makefile

@@ -1,24 +1,27 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gmap-mod-ethernet-dev
-PKG_VERSION:=v1.7.1
+PKG_VERSION:=sah-next_v1.26.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.7.1.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/archive/v1.7.1
-PKG_HASH:=f246c3b6eb7b9ed91cf83e972ce3b76f4c880a9700aa07a1b52a0acf4cca3343
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v1.7.1
+PKG_SOURCE:=gmap-mod-ethernet-dev-sah-next_v1.26.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/archive/sah-next_v1.26.0
+PKG_HASH:=99d992f164fae8a6f0e743d9351c194994af8d334ddc553da743cdea0d6c13e7
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-sah-next_v1.26.0
 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
-  SUBMENU:=Applications
+  CATEGORY:=prpl Foundation
+  SUBMENU:=gMap
   TITLE:=$(SHORT_DESCRIPTION)
   URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev
   DEPENDS += +libamxc
@@ -30,6 +33,8 @@ define Package/$(PKG_NAME)
   DEPENDS += +libgmap-ext
   DEPENDS += +libsahtrace
   DEPENDS += +libdhcpoptions
+  DEPENDS += +libdiscoping
+  DEPENDS += +libnetmodel
   MENU:=1
 endef
 
@@ -38,18 +43,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 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
@@ -57,6 +59,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)))

apps/gmap-mod-ethernet-dev/files/etc/runlevel.d/ap/10-remove-gmap-mod-ethernet-dev.sh

@@ -0,0 +1 @@
+opkg remove gmap-mod-ethernet-dev --force-depends

apps/gmap-mod-mdns/Makefile

@@ -0,0 +1,66 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-mdns/-/blob/main/baf.yml instead
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gmap-mod-mdns
+PKG_VERSION:=sah-next_v0.4.0
+SHORT_DESCRIPTION:=Module to expose mdns information in gMap
+
+PKG_SOURCE:=gmap-mod-mdns-sah-next_v0.4.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-mdns/-/archive/sah-next_v0.4.0
+PKG_HASH:=dc75a9b950a0b06a75f0420ef3f9b216cf1d74ab9dfc1a96c0761ada3e97ccef
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-mdns-sah-next_v0.4.0
+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:=prpl Foundation
+  SUBMENU:=gMap
+  TITLE:=$(SHORT_DESCRIPTION)
+  URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-mdns
+  DEPENDS += +libamxb
+  DEPENDS += +libamxc
+  DEPENDS += +libamxp
+  DEPENDS += +libamxd
+  DEPENDS += +libamxo
+  DEPENDS += +libamxs
+  DEPENDS += +libgmap-client
+  DEPENDS += +libgmap-ext
+  DEPENDS += +libsahtrace
+  DEPENDS += +amxrt
+  MENU:=1
+endef
+
+define Package/$(PKG_NAME)/description
+	Module to expose mdns information in gMap
+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)
+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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
+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 CONFIG_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
+endef
+
+define Package/$(PKG_NAME)/install
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	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)))

apps/gmap-mod-mdns/files/etc/runlevel.d/ap/10-remove-gmap-mod-mdns.sh

@@ -0,0 +1 @@
+opkg remove gmap-mod-mdns --force-depends

apps/gmap-mod-moca/Makefile

@@ -0,0 +1,66 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.softathome.com/ext_prpl/components/gmap-mod-moca/-/blob/main/baf.yml instead
+include $(TOPDIR)/rules.mk
+-include $(STAGING_DIR)/components.config
+
+PKG_NAME:=gmap-mod-moca
+PKG_VERSION:=v0.5.1
+SHORT_DESCRIPTION:=Module to expose MoCA information in gMap
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=v0.5.1
+PKG_SOURCE_URL:=https://$(SAH_GIT_USER):$(SAH_GIT_TOKEN)@$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-moca.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:=BSD-2-Clause-Patent
+PKG_LICENSE_FILES:=LICENSE
+
+
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+  CATEGORY:=SoftAtHome
+  SUBMENU:=gMap
+  TITLE:=$(SHORT_DESCRIPTION)
+  URL:=https://$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-moca
+  DEPENDS += +libamxc
+  DEPENDS += +libamxd
+  DEPENDS += +libamxb
+  DEPENDS += +libamxo
+  DEPENDS += +libamxj
+  DEPENDS += +libgmap-client
+  DEPENDS += +libgmap-ext
+  DEPENDS += +libsahtrace
+  MENU:=1
+endef
+
+define Package/$(PKG_NAME)/description
+	Module to expose MoCA information in gMap
+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)
+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)
+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)
+endef
+
+define Package/$(PKG_NAME)/install
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	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)))

apps/gmap-mod-moca/files/etc/runlevel.d/ap/10-remove-gmap-mod-moca.sh

@@ -0,0 +1 @@
+opkg remove gmap-mod-moca --force-depends

apps/gmap-mod-name-selector/Makefile

@@ -1,24 +1,27 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gmap-mod-name-selector
-PKG_VERSION:=v1.0.1
+PKG_VERSION:=sah-next_v1.1.0
 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-sah-next_v1.1.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector/-/archive/sah-next_v1.1.0
+PKG_HASH:=e06d5db18ff80849260b704837ba324904196aa86719d95c529e146ab45d4c1a
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-name-selector-sah-next_v1.1.0
 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
-  SUBMENU:=Applications
+  CATEGORY:=prpl Foundation
+  SUBMENU:=gMap
   TITLE:=$(SHORT_DESCRIPTION)
   URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector
   DEPENDS += +gmap-server
@@ -37,25 +40,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 CONFIG_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
 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 CONFIG_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
 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)))

apps/gmap-mod-name-selector/files/etc/runlevel.d/ap/10-remove-gmap-mod-name-selector.sh

@@ -0,0 +1 @@
+opkg remove gmap-mod-name-selector --force-depends

apps/gmap-mod-sahpairing/Makefile

@@ -0,0 +1,68 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.softathome.com/ext_prpl/components/gmap-mod-sahpairing/-/blob/main/baf.yml instead
+include $(TOPDIR)/rules.mk
+-include $(STAGING_DIR)/components.config
+
+PKG_NAME:=gmap-mod-sahpairing
+PKG_VERSION:=v0.2.0
+SHORT_DESCRIPTION:=Module to expose sahpairing information in gMap
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=v0.2.0
+PKG_SOURCE_URL:=https://$(SAH_GIT_USER):$(SAH_GIT_TOKEN)@$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-sahpairing.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_FILES:=LICENSE
+
+
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+  CATEGORY:=SoftAtHome
+  SUBMENU:=gMap
+  TITLE:=$(SHORT_DESCRIPTION)
+  URL:=https://$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-sahpairing
+  DEPENDS += +libamxb
+  DEPENDS += +libamxc
+  DEPENDS += +libamxp
+  DEPENDS += +libamxd
+  DEPENDS += +libamxo
+  DEPENDS += +libamxs
+  DEPENDS += +libgmap-client
+  DEPENDS += +libsahtrace
+  DEPENDS += +amxrt
+  DEPENDS += +sahpairing
+  MENU:=1
+endef
+
+define Package/$(PKG_NAME)/description
+	Module to expose sahpairing information in gMap
+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)
+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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
+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 CONFIG_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
+endef
+
+define Package/$(PKG_NAME)/install
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	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)))

apps/gmap-mod-sahpairing/files/etc/runlevel.d/ap/10-remove-gmap-mod-sahpairing.sh

@@ -0,0 +1 @@
+opkg remove gmap-mod-sahpairing --force-depends

apps/gmap-mod-self/Makefile

@@ -1,24 +1,27 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gmap-mod-self
-PKG_VERSION:=v1.2.2
+PKG_VERSION:=sah-next_v1.11.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.2.2.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self/-/archive/v1.2.2
-PKG_HASH:=e080a18c8b374fe474de1a336fd105e6d722a01f1611c385df042eee521fb8d6
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-self-v1.2.2
+PKG_SOURCE:=gmap-mod-self-sah-next_v1.11.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self/-/archive/sah-next_v1.11.0
+PKG_HASH:=310e250366cbbd81f196e421ab3f5c524ed52081f3f82d0fb41ee83b333bdedf
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-self-sah-next_v1.11.0
 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
-  SUBMENU:=Applications
+  CATEGORY:=prpl Foundation
+  SUBMENU:=gMap
   TITLE:=$(SHORT_DESCRIPTION)
   URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self
   DEPENDS += +libamxc
@@ -29,6 +32,7 @@ define Package/$(PKG_NAME)
   DEPENDS += +libamxo
   DEPENDS += +libamxs
   DEPENDS += +libgmap-client
+  DEPENDS += +libgmap-ext
   DEPENDS += +libsahtrace
   DEPENDS += +libnetmodel
   MENU:=1
@@ -43,14 +47,11 @@ 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_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER=$(CONFIG_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER))
-	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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT) CONFIG_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER=$(CONFIG_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER))
 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_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER=$(CONFIG_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER))
+	$(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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT) CONFIG_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER=$(CONFIG_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER))
 endef
 
 define Package/$(PKG_NAME)/install
@@ -58,6 +59,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

apps/gmap-mod-self/files/etc/runlevel.d/ap/10-remove-gmap-mod-self.sh

@@ -0,0 +1 @@
+opkg remove gmap-mod-self --force-depends

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

apps/gmap-mod-services-db/Makefile

@@ -0,0 +1,71 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.softathome.com/ext_prpl/components/gmap-mod-services-db/-/blob/main/baf.yml instead
+include $(TOPDIR)/rules.mk
+-include $(STAGING_DIR)/components.config
+
+PKG_NAME:=gmap-mod-services-db
+PKG_VERSION:=v0.3.0
+SHORT_DESCRIPTION:=gMap component that populates the datamodel based on preconfigured grules
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=v0.3.0
+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:=BSD-2-Clause-Patent
+PKG_LICENSE_FILES:=LICENSE
+
+
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+  CATEGORY:=SoftAtHome
+  SUBMENU:=gMap
+  TITLE:=$(SHORT_DESCRIPTION)
+  URL:=https://$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-services-db
+  DEPENDS += +libamxc
+  DEPENDS += +libamxb
+  DEPENDS += +libamxp
+  DEPENDS += +libamxd
+  DEPENDS += +libamxo
+  DEPENDS += +libamxj
+  DEPENDS += +libgmap-client
+  DEPENDS += +libsahtrace
+  DEPENDS += +amxrt
+  MENU:=1
+endef
+
+define Package/$(PKG_NAME)/description
+	gMap component that populates the datamodel based on preconfigured grules
+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 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 CONFIG_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT) 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 CONFIG_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT) 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
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	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
+	source "$(SOURCE)/Config.in"
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))

apps/gmap-mod-services-db/files/etc/runlevel.d/ap/10-remove-gmap-mod-services-db.sh

@@ -0,0 +1 @@
+opkg remove gmap-mod-services-db --force-depends

apps/gmap-mod-upnp/Makefile

@@ -0,0 +1,66 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-upnp/-/blob/main/baf.yml instead
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gmap-mod-upnp
+PKG_VERSION:=sah-next_v0.7.0
+SHORT_DESCRIPTION:=Module to expose upnp information in gMap
+
+PKG_SOURCE:=gmap-mod-upnp-sah-next_v0.7.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-upnp/-/archive/sah-next_v0.7.0
+PKG_HASH:=7e1cc47fb27deef6664da8d347f77d049a0a0ee2422ebd9bdb58ddc13a09c9cc
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-upnp-sah-next_v0.7.0
+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:=prpl Foundation
+  SUBMENU:=gMap
+  TITLE:=$(SHORT_DESCRIPTION)
+  URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-upnp
+  DEPENDS += +libamxb
+  DEPENDS += +libamxc
+  DEPENDS += +libamxp
+  DEPENDS += +libamxd
+  DEPENDS += +libamxo
+  DEPENDS += +libamxs
+  DEPENDS += +libgmap-client
+  DEPENDS += +libgmap-ext
+  DEPENDS += +libsahtrace
+  DEPENDS += +amxrt
+  MENU:=1
+endef
+
+define Package/$(PKG_NAME)/description
+	Module to expose upnp information in gMap
+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)
+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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
+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 CONFIG_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
+endef
+
+define Package/$(PKG_NAME)/install
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	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)))

apps/gmap-mod-upnp/files/etc/runlevel.d/ap/10-remove-gmap-mod-upnp.sh

@@ -0,0 +1 @@
+opkg remove gmap-mod-upnp --force-depends

apps/gmap-server/Config.in

@@ -11,17 +11,13 @@ config SAH_AMX_GMAP_SERVER
     bool "Build gMap server"
     default y
 
-config SAH_AMX_GMAP_SERVER_ORDER
+config SAH_AMX_GMAP_SERVER_START_ORDER
     int "gMap server plugin startup order"
     default 71
 
-config AMX_GMAP_SERVER_NAME_ORDER
-    string "Priority list of device name sources (highest priority on the left). Source default is implicit and last (after searching alternatives for the device)."
-    default "webui,user,dil,tags,mdns,dhcp,lltd,plc,mac,upnp,usb,voice,default"
-
-config AMX_GMAP_MAX_DEVICES
-    int "The max number of gmap devices that can be present at the same time"
-    default 70
+config SAH_AMX_GMAP_SERVER_STOP_ORDER
+    int "gMap server plugin shutdown order"
+    default 29
 
 endmenu
 

apps/gmap-server/Makefile

@@ -1,13 +1,15 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gmap-server
-PKG_VERSION:=v1.9.6
+PKG_VERSION:=sah-next_v3.10.3
 SHORT_DESCRIPTION:=Service implementing the gmap data model
 
-PKG_SOURCE:=gmap-server-v1.9.6.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v1.9.6
-PKG_HASH:=28b46b82eef706ceec0b2f9d4d923066a7e3baa9b3a536f93c8b00b79a36bf11
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v1.9.6
+PKG_SOURCE:=gmap-server-sah-next_v3.10.3.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/sah-next_v3.10.3
+PKG_HASH:=71e2ced55ee6ec94427b3479a47719e4b92a2060a91a86266478149f7e76f941
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-sah-next_v3.10.3
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -15,27 +17,18 @@ 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/
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/etc/rc.d/S$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER)$(COMPONENT)
-endef
-
-define SAHBackupRestore/Install
-	install -d ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/backup 
-	install -d ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/restore 
-	install -d ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/import 
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/backup/B$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER)$(COMPONENT) 
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/restore/R$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER)$(COMPONENT) 
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/import/R$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER)$(COMPONENT) 
+	install -d $(1)/etc/rc.d/
+	ln -sfr $(1)/etc/init.d/$(COMPONENT) $(1)/etc/rc.d/S$(CONFIG_SAH_AMX_GMAP_SERVER_START_ORDER)$(COMPONENT)
+	ln -sfr $(1)/etc/init.d/$(COMPONENT) $(1)/etc/rc.d/K$(CONFIG_SAH_AMX_GMAP_SERVER_STOP_ORDER)$(COMPONENT)
 endef
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
-  CATEGORY:=gmap
-  SUBMENU:=Applications
+  CATEGORY:=prpl Foundation
+  SUBMENU:=gMap
   TITLE:=$(SHORT_DESCRIPTION)
   URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server
   DEPENDS += +libamxc
@@ -43,9 +36,11 @@ define Package/$(PKG_NAME)
   DEPENDS += +libamxp
   DEPENDS += +libamxb
   DEPENDS += +libamxo
+  DEPENDS += +libamxs
   DEPENDS += +libgmap-client
   DEPENDS += +libsahtrace
   DEPENDS += +libuuid
+  DEPENDS += +mod-pcm-svc
   MENU:=1
 endef
 
@@ -54,21 +49,18 @@ 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 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))
+	$(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_AMX_GMAP_SERVER_START_ORDER=$(CONFIG_SAH_AMX_GMAP_SERVER_START_ORDER) CONFIG_SAH_AMX_GMAP_SERVER_STOP_ORDER=$(CONFIG_SAH_AMX_GMAP_SERVER_STOP_ORDER))
 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_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 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_START_ORDER=$(CONFIG_SAH_AMX_GMAP_SERVER_START_ORDER) CONFIG_SAH_AMX_GMAP_SERVER_STOP_ORDER=$(CONFIG_SAH_AMX_GMAP_SERVER_STOP_ORDER))
 
-	$(call SAHInit/Install)
-	$(call SAHBackupRestore/Install)
+	$(call SAHInit/Install,$(PKG_INSTALL_DIR))
 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_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))
+	$(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_SERVER_START_ORDER=$(CONFIG_SAH_AMX_GMAP_SERVER_START_ORDER) CONFIG_SAH_AMX_GMAP_SERVER_STOP_ORDER=$(CONFIG_SAH_AMX_GMAP_SERVER_STOP_ORDER))
+	$(call SAHInit/Install,$(STAGING_DIR))
 endef
 
 define Package/$(PKG_NAME)/install
@@ -76,6 +68,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

apps/gmap-server/files/etc/runlevel.d/ap/10-remove-gmap-server.sh

@@ -0,0 +1 @@
+opkg remove gmap-server --force-depends

configs/gmap-mibs-common/Makefile

@@ -1,24 +1,27 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gmap-mibs-common
-PKG_VERSION:=v0.5.2
+PKG_VERSION:=sah-next_v0.26.2
 SHORT_DESCRIPTION:=Generic mib files for the gmap service
 
-PKG_SOURCE:=gmap-mibs-common-v0.5.2.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/archive/v0.5.2
-PKG_HASH:=a0db3aeeb976dfa03d4a33d804175d889a836912d2458baf5fdae71c25b2d386
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.5.2
+PKG_SOURCE:=gmap-mibs-common-sah-next_v0.26.2.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/archive/sah-next_v0.26.2
+PKG_HASH:=866e1dd5eb88727efa2f1158ab507297cd669020e265fde2e258c2a0365c69e4
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-sah-next_v0.26.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
-  SUBMENU:=Configurations
+  CATEGORY:=prpl Foundation
+  SUBMENU:=gMap
   TITLE:=$(SHORT_DESCRIPTION)
   URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common
   DEPENDS += +gmap-server
@@ -26,9 +29,14 @@ define Package/$(PKG_NAME)
   DEPENDS += +libamxp
   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
 
@@ -41,14 +49,11 @@ 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)
-	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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
 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 CONFIG_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
 endef
 
 define Package/$(PKG_NAME)/install
@@ -56,6 +61,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)))

configs/gmap-mibs-common/files/etc/runlevel.d/ap/10-remove-gmap-mibs-common.sh

@@ -0,0 +1 @@
+opkg remove gmap-mibs-common --force-depends

libs/libgmap-client/Config.in

@@ -0,0 +1,20 @@
+config PACKAGE_libgmap-client
+    tristate
+    select SAH_LIB_GMAP-CLIENT
+
+if PACKAGE_libgmap-client
+
+menu "Select libgmap-client build options"
+    depends on PACKAGE_libgmap-client
+
+config SAH_LIB_GMAP-CLIENT
+    bool "Build libgmap-client"
+    default y
+
+config SAH_LIB_GMAP-CLIENT_SOP
+    bool "Build the libgmap-client library for SOP"
+    default n
+
+endmenu
+
+endif

libs/libgmap-client/Makefile

@@ -1,24 +1,27 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgmap-client
-PKG_VERSION:=v0.11.3
+PKG_VERSION:=sah-next-4.1_v0.1.0
 SHORT_DESCRIPTION:=Client library for gmap modules
 
-PKG_SOURCE:=libgmap-client-v0.11.3.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client/-/archive/v0.11.3
-PKG_HASH:=5992e750f350bdbc3332c889c5731e95e896f91c17f774f9525c20e09f74a821
-PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-client-v0.11.3
+PKG_SOURCE:=libgmap-client-sah-next-4.1_v0.1.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client/-/archive/sah-next-4.1_v0.1.0
+PKG_HASH:=f4365909fe3e095e25e8fe3d5b783d1682e52a5226a81390470110a16503ef74
+PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-client-sah-next-4.1_v0.1.0
 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
-  SUBMENU:=Libraries
+  CATEGORY:=prpl Foundation
+  SUBMENU:=gMap
   TITLE:=$(SHORT_DESCRIPTION)
   URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client
   DEPENDS += +libamxc
@@ -39,14 +42,11 @@ 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)
-	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
@@ -54,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)))

libs/libgmap-ext/Makefile

@@ -1,24 +1,27 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-ext/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgmap-ext
-PKG_VERSION:=v0.2.1
+PKG_VERSION:=sah-next_v1.6.0
 SHORT_DESCRIPTION:=Functionality common for gmap clients (not server)
 
-PKG_SOURCE:=libgmap-ext-v0.2.1.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-ext/-/archive/v0.2.1
-PKG_HASH:=674f45cb01b4a3b45db899bf0bc7ce12cb5f86e932aed5c8749e0f5e9ec34f55
-PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-ext-v0.2.1
+PKG_SOURCE:=libgmap-ext-sah-next_v1.6.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-ext/-/archive/sah-next_v1.6.0
+PKG_HASH:=be6524d929b3217293cac7b375a08ce71e391435da3fbd2d0e0ef3139282c774
+PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-ext-sah-next_v1.6.0
 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
-  SUBMENU:=Libraries
+  CATEGORY:=prpl Foundation
+  SUBMENU:=gMap
   TITLE:=$(SHORT_DESCRIPTION)
   URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-ext
   DEPENDS += +libamxc
@@ -27,6 +30,7 @@ define Package/$(PKG_NAME)
   DEPENDS += +libamxd
   DEPENDS += +libamxo
   DEPENDS += +libsahtrace
+  DEPENDS += +libgmap-client
   MENU:=1
 endef
 
@@ -35,18 +39,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 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 CONFIG_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
 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 CONFIG_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
 endef
 
 define Package/$(PKG_NAME)/install
@@ -54,6 +55,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)))