[CI] Update changelog for release master_v2.6.2

GitOrigin-RevId: 66026d121097de8f39df63d882ae2e469f552d30

CHANGELOG.md

@@ -0,0 +1,32 @@
+# 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 v2.6.2 - 2021-08-03(07:44:45 +0000)
+
+### Changes
+
+- [libamxt](https://gitlab.com/soft.at.home/ambiorix/libraries/libamxt): Auto detect file descriptor of terminal
+- [libamxd](https://gitlab.com/soft.at.home/ambiorix/libraries/libamxd): Make amxd_function_are_args_valid function public
+- [libamxd](https://gitlab.com/soft.at.home/ambiorix/libraries/libamxd): Destroy action callbacks must be called bottom-up
+- [libamxb](https://gitlab.com/soft.at.home/ambiorix/libraries/libamxb): Make it possible to invoke RPC methods that are not under an object
+
+## Release v2.6.1 - 2021-07-28(11:42:12 +0000)
+
+### Fixes
+
+- [mod-ba-cli](https://gitlab.com/soft.at.home/ambiorix/modules/amx_cli/mod-ba-cli): It must be possible to provide composite values to method arguments
+- [libamxj](https://gitlab.com/soft.at.home/ambiorix/libraries/libamxj): Fixes streamed reading from fd
+- [libamxj](https://gitlab.com/soft.at.home/ambiorix/libraries/libamxj): Fixes streaming parsing of json string
+
+### Changes
+
+- [libamxm](https://gitlab.com/soft.at.home/ambiorix/libraries/libamxm): Updates .gitignore
+- [amxrt](https://gitlab.com/soft.at.home/ambiorix/applications/amxrt): Adds simple rbus autodoetect socket
+

README.md

@@ -0,0 +1,52 @@
+# Feed_amx
+
+SoftAtHome feed of Openwrt packages for ambiorix components.
+
+## Included components
+
+Feed_amx includes the following components:
+
+### Applications
+
+- [amx-cli](https://gitlab.com/soft.at.home/ambiorix/applications/amx-cli) - Ambiorix interactive CLI
+- [amxb-inspect](https://gitlab.com/soft.at.home/ambiorix/applications/amxb-inspect) - Ambiorix Backend inspector/validation tool
+- [amxo-cg](https://gitlab.com/soft.at.home/ambiorix/applications/amxo-cg) - Object Definition Language Compiler/Generator
+- [amxrt](https://gitlab.com/soft.at.home/ambiorix/applications/amxrt) - Data model runtime
+
+### Libraries
+
+- [libamxb](https://gitlab.com/soft.at.home/ambiorix/libraries/libamxb) - Bus agnostic C API (mediator)
+- [libamxc](https://gitlab.com/soft.at.home/ambiorix/libraries/libamxc) - Libamxc is a library containing data containers, implemented in ansi C (C99).
+- [libamxd](https://gitlab.com/soft.at.home/ambiorix/libraries/libamxd) - Data model C-API
+- [libamxj](https://gitlab.com/soft.at.home/ambiorix/libraries/libamxj) - JSON parser & generator using yajl and libamxc variants
+- [libamxm](https://gitlab.com/soft.at.home/ambiorix/libraries/libamxm) - modularity api, simplifies creation of add-ons (plug-ins, modules)
+- [libamxo](https://gitlab.com/soft.at.home/ambiorix/libraries/libamxo) - Ambiorix Object Definition Language library
+- [libamxp](https://gitlab.com/soft.at.home/ambiorix/libraries/libamxp) - Common patterns implementation
+- [libamxt](https://gitlab.com/soft.at.home/ambiorix/libraries/libamxt) - Common patterns implementation
+- [libsahtrace](https://gitlab.com/soft.at.home/logging/libsahtrace) - Small and flexible library to enable tracing and logging
+
+### Modules
+
+- [mod-amxb-ubus](https://gitlab.com/soft.at.home/ambiorix/modules/amxb_backends/amxb_ubus) - Ubus Backend
+- [mod-ba-cli](https://gitlab.com/soft.at.home/ambiorix/modules/amx_cli/mod-ba-cli) - Bus Agnostic Command Line Interface
+- [mod-sahtrace](https://gitlab.com/soft.at.home/ambiorix/modules/mod-sahtrace) - Module for sahtrace logging
+
+### Other
+
+These components are not managed by SoftAtHome.
+
+- uriparser
+
+## How to add feed_amx to your OpenWrt build
+
+At the root of your OpenWrt tree, add the following to your `feeds.conf` file:
+
+```sh
+src-git feed_amx git@gitlab.com:soft.at.home/buildsystems/openwrt/feed_amx.git;main
+```
+
+Add the packages to your OpenWrt instance with the following commands:
+```sh
+./scripts/feeds update feed_amx #retrieve the feed from service/update to latest
+./scripts/feeds install -p feed_amx #make all of the feed packages available to the build
+```

apps/amx-cli/Makefile

@@ -0,0 +1,58 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=amx-cli
+PKG_VERSION:=v0.2.16
+SHORT_DESCRIPTION:=Ambiorix interactive CLI
+
+PKG_SOURCE:=amx-cli-v0.2.16.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/applications/amx-cli/-/archive/v0.2.16
+PKG_HASH:=4629ec56d246fa4fab2970acb73536a8c04cd8018fd6bb745bf41f06863f5900
+PKG_BUILD_DIR:=$(BUILD_DIR)/amx-cli-v0.2.16
+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:=ambiorix
+  SUBMENU:=Applications
+  TITLE:=$(SHORT_DESCRIPTION)
+  URL:=https://gitlab.com/soft.at.home/ambiorix/applications/amx-cli
+  DEPENDS += +libamxc
+  DEPENDS += +libamxp
+  DEPENDS += +libamxt
+  DEPENDS += +libamxm
+  DEPENDS += +libamxo
+  DEPENDS += +libamxj
+  DEPENDS += +libevent2
+  DEPENDS += +yajl
+  MENU:=1
+endef
+
+define Package/$(PKG_NAME)/description
+	Ambiorix interactive CLI
+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)
+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 {} +;
+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)
+endef
+
+define Package/$(PKG_NAME)/install
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))

apps/amxb-inspect/Config.in

@@ -1,16 +0,0 @@
-config PACKAGE_amxb-inspect
-    tristate
-    select SAH_SERVICES_AMXB_INSPECT
-
-if PACKAGE_amxb-inspect
-
-menu "Select amxb-inspect build options"
-    depends on PACKAGE_amxb-inspect
-
-config SAH_SERVICES_AMXB_INSPECT
-    bool "Build amxb-inspect application"
-    default y
-
-endmenu
-
-endif

apps/amxb-inspect/Makefile

@@ -1,57 +1,46 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=amxb-inspect
-PKG_VERSION:=v0.3.0
+PKG_VERSION:=v1.0.6
 SHORT_DESCRIPTION:=Ambiorix Backend inspector/validation tool
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.3.0
-PKG_SOURCE_URL:=git@gitlab.com:soft.at.home/ambiorix/applications/amxb-inspect.git
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=amxb-inspect-v1.0.6.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/applications/amxb-inspect/-/archive/v1.0.6
+PKG_HASH:=0d8413037f609ee980baf5ff7ef8f6d0045d998fe89321eb6a53a8f048073c73
+PKG_BUILD_DIR:=$(BUILD_DIR)/amxb-inspect-v1.0.6
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
-PKG_LICENSE:BSD-2-Clause-Patent
+PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
 
-MACHINE:=$(shell $(CC) -dumpmachine)
-
-PKG_RELEASE?=1
-PKG_INSTALL:=1
-
-PKG_BUILD_DEPENDS += libamxb
+PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
-  CATEGORY:=amx
+  CATEGORY:=ambiorix
   SUBMENU:=Applications
   TITLE:=$(SHORT_DESCRIPTION)
-  URL:=git@gitlab.com:soft.at.home/ambiorix/applications/amxb-inspect
+  URL:=https://gitlab.com/soft.at.home/ambiorix/applications/amxb-inspect
   DEPENDS += +libamxb
   MENU:=1
 endef
 
 define Package/$(PKG_NAME)/description
-	"Ambiorix Backend inspector/validation tool"
+	Ambiorix Backend inspector/validation tool
 endef
 
 define Build/Compile
-	echo "$(PKG_NAME): 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)
 endef
 
 define Build/Install
-	echo "$(PKG_NAME): 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 SAHConfig/Install)
 endef
 
 define Build/InstallDev
-	echo "$(PKG_NAME): 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)
 endef
 
@@ -59,8 +48,4 @@ define Package/$(PKG_NAME)/install
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
 
-define Package/$(PKG_NAME)/config
-	source "$(SOURCE)/Config.in"
-endef
-
 $(eval $(call BuildPackage,$(PKG_NAME)))

apps/amxo-cg/Config.in

@@ -1,16 +0,0 @@
-config PACKAGE_amxo-cg
-    tristate
-    select SAH_SERVICES_AMXO_CG
-
-if PACKAGE_amxo-cg
-
-menu "Select amxo-cg build options"
-    depends on PACKAGE_amxo-cg
-
-config SAH_SERVICES_AMXO_CG
-    bool "Build amxo-cg application"
-    default y
-
-endmenu
-
-endif

apps/amxo-cg/Makefile

@@ -1,61 +1,49 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=amxo-cg
-PKG_VERSION:=v0.2.5
+PKG_VERSION:=v1.1.6
 SHORT_DESCRIPTION:=Object Definition Language Compiler/Generator
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.2.5
-PKG_SOURCE_URL:=git@gitlab.com:soft.at.home/ambiorix/applications/amxo-cg.git
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=amxo-cg-v1.1.6.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/applications/amxo-cg/-/archive/v1.1.6
+PKG_HASH:=6e33ddc5d0e4bd92a0579a0dfb7c9bcaf8de8f4bc0607a814dcb0bfb9ad410d7
+PKG_BUILD_DIR:=$(BUILD_DIR)/amxo-cg-v1.1.6
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
-PKG_LICENSE:BSD-2-Clause-Patent
+PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
 
-MACHINE:=$(shell $(CC) -dumpmachine)
-
-PKG_RELEASE?=1
-PKG_INSTALL:=1
-
-PKG_BUILD_DEPENDS += libamxc
-PKG_BUILD_DEPENDS += libamxd
-PKG_BUILD_DEPENDS += libamxo
+PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
-  CATEGORY:=amx
+  CATEGORY:=ambiorix
   SUBMENU:=Applications
   TITLE:=$(SHORT_DESCRIPTION)
-  URL:=git@gitlab.com:soft.at.home/ambiorix/applications/amxo-cg
+  URL:=https://gitlab.com/soft.at.home/ambiorix/applications/amxo-cg
   DEPENDS += +libamxc
   DEPENDS += +libamxd
   DEPENDS += +libamxo
+  DEPENDS += +libxml2
   MENU:=1
 endef
 
 define Package/$(PKG_NAME)/description
-	"Object Definition Language Compiler/Generator"
+	Object Definition Language Compiler/Generator
 endef
 
 define Build/Compile
-	echo "$(PKG_NAME): 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)
 endef
 
 define Build/Install
-	echo "$(PKG_NAME): 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 SAHConfig/Install)
 endef
 
 define Build/InstallDev
-	echo "$(PKG_NAME): 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)
 endef
 
@@ -63,8 +51,4 @@ define Package/$(PKG_NAME)/install
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
 
-define Package/$(PKG_NAME)/config
-	source "$(SOURCE)/Config.in"
-endef
-
 $(eval $(call BuildPackage,$(PKG_NAME)))

apps/amxrt/Config.in

@@ -1,16 +0,0 @@
-config PACKAGE_amxrt
-    tristate
-    select SAH_SERVICES_AMXRT
-
-if PACKAGE_amxrt
-
-menu "Select amxrt build options"
-    depends on PACKAGE_amxrt
-
-config SAH_SERVICES_AMXRT
-    bool "Build libamxrt application"
-    default y
-
-endmenu
-
-endif

apps/amxrt/Makefile

@@ -1,37 +1,26 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=amxrt
-PKG_VERSION:=v0.4.3
+PKG_VERSION:=v1.1.3
 SHORT_DESCRIPTION:=Data model runtime
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.4.3
-PKG_SOURCE_URL:=git@gitlab.com:soft.at.home/ambiorix/applications/amxrt.git
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=amxrt-v1.1.3.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/applications/amxrt/-/archive/v1.1.3
+PKG_HASH:=012724b14ea80b82fc0ffabac93f804bec916246027cdc5df35940d3a0493c0f
+PKG_BUILD_DIR:=$(BUILD_DIR)/amxrt-v1.1.3
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
-PKG_LICENSE:
+PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
 
-MACHINE:=$(shell $(CC) -dumpmachine)
-
-PKG_RELEASE?=1
-PKG_INSTALL:=1
-
-PKG_BUILD_DEPENDS += libamxc
-PKG_BUILD_DEPENDS += libamxd
-PKG_BUILD_DEPENDS += libamxp
-PKG_BUILD_DEPENDS += libamxb
-PKG_BUILD_DEPENDS += libamxo
-PKG_BUILD_DEPENDS += libevent2
+PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
-  CATEGORY:=amx
+  CATEGORY:=ambiorix
   SUBMENU:=Applications
   TITLE:=$(SHORT_DESCRIPTION)
-  URL:=git@gitlab.com:soft.at.home/ambiorix/applications/amxrt
+  URL:=https://gitlab.com/soft.at.home/ambiorix/applications/amxrt
   DEPENDS += +libamxc
   DEPENDS += +libamxd
   DEPENDS += +libamxp
@@ -42,26 +31,21 @@ define Package/$(PKG_NAME)
 endef
 
 define Package/$(PKG_NAME)/description
-	"Data model runtime"
+	Data model runtime
 endef
 
 define Build/Compile
-	echo "$(PKG_NAME): 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)
 endef
 
 define Build/Install
-	echo "$(PKG_NAME): 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 SAHConfig/Install)
 endef
 
 define Build/InstallDev
-	echo "$(PKG_NAME): 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)
 endef
 
@@ -69,8 +53,4 @@ define Package/$(PKG_NAME)/install
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
 
-define Package/$(PKG_NAME)/config
-	source "$(SOURCE)/Config.in"
-endef
-
 $(eval $(call BuildPackage,$(PKG_NAME)))

libs/libamxb/Config.in

@@ -1,16 +0,0 @@
-config PACKAGE_libamxb
-    tristate
-    select SAH_LIB_AMXB
-
-if PACKAGE_libamxb
-
-menu "Select libamxb build options"
-    depends on PACKAGE_libamxb
-
-config SAH_LIB_AMXB
-    bool "Build libamxb"
-    default y
-
-endmenu
-
-endif

libs/libamxb/Makefile

@@ -1,35 +1,26 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=libamxb
-PKG_VERSION:=v2.1.2
+PKG_VERSION:=v3.4.2
 SHORT_DESCRIPTION:=Bus agnostic C API (mediator)
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v2.1.2
-PKG_SOURCE_URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxb.git
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=libamxb-v3.4.2.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxb/-/archive/v3.4.2
+PKG_HASH:=f1b80c231f32743b33a11bf9c74adbe942c9e57cbbeaeb9dfa003dfd40f3cae2
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxb-v3.4.2
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
-PKG_LICENSE:BSD-2-Clause-Patent
+PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
 
-MACHINE:=$(shell $(CC) -dumpmachine)
-
-PKG_RELEASE?=1
-PKG_INSTALL:=1
-
-PKG_BUILD_DEPENDS += libamxc
-PKG_BUILD_DEPENDS += libamxp
-PKG_BUILD_DEPENDS += libamxd
-PKG_BUILD_DEPENDS += uriparser
+PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
-  CATEGORY:=amx
+  CATEGORY:=ambiorix
   SUBMENU:=Libraries
   TITLE:=$(SHORT_DESCRIPTION)
-  URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxb
+  URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxb
   DEPENDS += +libamxc
   DEPENDS += +libamxp
   DEPENDS += +libamxd
@@ -38,26 +29,21 @@ define Package/$(PKG_NAME)
 endef
 
 define Package/$(PKG_NAME)/description
-	"Bus agnostic C API (mediator)"
+	Bus agnostic C API (mediator)
 endef
 
 define Build/Compile
-	echo "$(PKG_NAME): 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)
 endef
 
 define Build/Install
-	echo "$(PKG_NAME): 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 SAHConfig/Install)
 endef
 
 define Build/InstallDev
-	echo "$(PKG_NAME): 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)
 endef
 
@@ -65,8 +51,4 @@ define Package/$(PKG_NAME)/install
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
 
-define Package/$(PKG_NAME)/config
-	source "$(SOURCE)/Config.in"
-endef
-
 $(eval $(call BuildPackage,$(PKG_NAME)))

libs/libamxc/Config.in

@@ -1,16 +0,0 @@
-config PACKAGE_libamxc
-    tristate
-    select SAH_LIB_AMXC
-
-if PACKAGE_libamxc
-
-menu "Select libamxc build options"
-    depends on PACKAGE_libamxc
-
-config SAH_LIB_AMXC
-    bool "Build libamxc"
-    default y
-
-endmenu
-
-endif

libs/libamxc/Makefile

@@ -1,55 +1,45 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=libamxc
-PKG_VERSION:=v1.0.8
+PKG_VERSION:=v1.2.1
 SHORT_DESCRIPTION:=Libamxc is a library containing data containers, implemented in ansi C (C99)
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v1.0.8
-PKG_SOURCE_URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxc.git
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=libamxc-v1.2.1.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxc/-/archive/v1.2.1
+PKG_HASH:=0ccfba7b235c56244f02574b622756e1efcfb894401a6c167cbdf03c63a5a197
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxc-v1.2.1
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
-PKG_LICENSE:BSD-2-Clause-Patent
+PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
 
-MACHINE:=$(shell $(CC) -dumpmachine)
-
-PKG_RELEASE?=1
-PKG_INSTALL:=1
-
+PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
-  CATEGORY:=amx
+  CATEGORY:=ambiorix
   SUBMENU:=Libraries
   TITLE:=$(SHORT_DESCRIPTION)
-  URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxc
+  URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxc
   MENU:=1
 endef
 
 define Package/$(PKG_NAME)/description
-	"Libamxc is a library containing data containers, implemented in ansi C (C99)."
+	Libamxc is a library containing data containers, implemented in ansi C (C99).
 endef
 
 define Build/Compile
-	echo "$(PKG_NAME): 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)
 endef
 
 define Build/Install
-	echo "$(PKG_NAME): 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 SAHConfig/Install)
 endef
 
 define Build/InstallDev
-	echo "$(PKG_NAME): 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)
 endef
 
@@ -57,8 +47,4 @@ define Package/$(PKG_NAME)/install
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
 
-define Package/$(PKG_NAME)/config
-	source "$(SOURCE)/Config.in"
-endef
-
 $(eval $(call BuildPackage,$(PKG_NAME)))

libs/libamxd/Config.in

@@ -1,16 +0,0 @@
-config PACKAGE_libamxd
-    tristate
-    select SAH_LIB_AMXD
-
-if PACKAGE_libamxd
-
-menu "Select libamxd build options"
-    depends on PACKAGE_libamxd
-
-config SAH_LIB_AMXD
-    bool "Build libamxd"
-    default y
-
-endmenu
-
-endif

libs/libamxd/Makefile

@@ -1,59 +1,47 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=libamxd
-PKG_VERSION:=v1.2.9
+PKG_VERSION:=v3.2.1
 SHORT_DESCRIPTION:=Data model C-API
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v1.2.9
-PKG_SOURCE_URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxd.git
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=libamxd-v3.2.1.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxd/-/archive/v3.2.1
+PKG_HASH:=b8855cd1085a2148ea4479810d31d9ddb9c389e668860e20e21dfca82115e4f3
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxd-v3.2.1
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
-PKG_LICENSE:BSD-2-Clause-Patent
+PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
 
-MACHINE:=$(shell $(CC) -dumpmachine)
-
-PKG_RELEASE?=1
-PKG_INSTALL:=1
-
-PKG_BUILD_DEPENDS += libamxc
-PKG_BUILD_DEPENDS += libamxp
+PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
-  CATEGORY:=amx
+  CATEGORY:=ambiorix
   SUBMENU:=Libraries
   TITLE:=$(SHORT_DESCRIPTION)
-  URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxd
+  URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxd
   DEPENDS += +libamxc
   DEPENDS += +libamxp
   MENU:=1
 endef
 
 define Package/$(PKG_NAME)/description
-	"Data model C-API"
+	Data model C-API
 endef
 
 define Build/Compile
-	echo "$(PKG_NAME): 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)
 endef
 
 define Build/Install
-	echo "$(PKG_NAME): 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 SAHConfig/Install)
 endef
 
 define Build/InstallDev
-	echo "$(PKG_NAME): 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)
 endef
 
@@ -61,8 +49,4 @@ define Package/$(PKG_NAME)/install
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
 
-define Package/$(PKG_NAME)/config
-	source "$(SOURCE)/Config.in"
-endef
-
 $(eval $(call BuildPackage,$(PKG_NAME)))

libs/libamxj/Config.in

@@ -1,16 +0,0 @@
-config PACKAGE_libamxj
-    tristate
-    select SAH_LIB_AMXJ
-
-if PACKAGE_libamxj
-
-menu "Select libamxj build options"
-    depends on PACKAGE_libamxj
-
-config SAH_LIB_AMXJ
-    bool "Build libamxj"
-    default y
-
-endmenu
-
-endif

libs/libamxj/Makefile

@@ -1,59 +1,47 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=libamxj
-PKG_VERSION:=v0.3.7
+PKG_VERSION:=v0.3.23
 SHORT_DESCRIPTION:=JSON parser & generator using yajl and libamxc variants
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.3.7
-PKG_SOURCE_URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxj.git
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=libamxj-v0.3.23.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxj/-/archive/v0.3.23
+PKG_HASH:=92db78bf949cdaf7ae27fe90f83efe82c6573b8aadf5f58366e653204c6ffa7d
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxj-v0.3.23
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
-PKG_LICENSE:BSD-2-Clause-Patent
+PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
 
-MACHINE:=$(shell $(CC) -dumpmachine)
-
-PKG_RELEASE?=1
-PKG_INSTALL:=1
-
-PKG_BUILD_DEPENDS += libamxc
-PKG_BUILD_DEPENDS += yajl
+PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
-  CATEGORY:=amx
+  CATEGORY:=ambiorix
   SUBMENU:=Libraries
   TITLE:=$(SHORT_DESCRIPTION)
-  URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxj
+  URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxj
   DEPENDS += +libamxc
   DEPENDS += +yajl
   MENU:=1
 endef
 
 define Package/$(PKG_NAME)/description
-	"JSON parser & generator using yajl and libamxc variants"
+	JSON parser & generator using yajl and libamxc variants
 endef
 
 define Build/Compile
-	echo "$(PKG_NAME): 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)
 endef
 
 define Build/Install
-	echo "$(PKG_NAME): 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 SAHConfig/Install)
 endef
 
 define Build/InstallDev
-	echo "$(PKG_NAME): 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)
 endef
 
@@ -61,8 +49,4 @@ define Package/$(PKG_NAME)/install
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
 
-define Package/$(PKG_NAME)/config
-	source "$(SOURCE)/Config.in"
-endef
-
 $(eval $(call BuildPackage,$(PKG_NAME)))

libs/libamxm/Config.in

@@ -1,16 +0,0 @@
-config PACKAGE_libamxm
-    tristate
-    select SAH_LIB_AMXP
-
-if PACKAGE_libamxm
-
-menu "Select libamxm build options"
-    depends on PACKAGE_libamxm
-
-config SAH_LIB_AMXP
-    bool "Build libamxm"
-    default y
-
-endmenu
-
-endif

libs/libamxm/Makefile

@@ -1,59 +1,47 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=libamxm
-PKG_VERSION:=v0.0.14
+PKG_VERSION:=v0.0.28
 SHORT_DESCRIPTION:=modularity api, simplifies creation of add-ons (plug-ins, modules)
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.0.14
-PKG_SOURCE_URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxm.git
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=libamxm-v0.0.28.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxm/-/archive/v0.0.28
+PKG_HASH:=b2c88c06f6c26a193d20923ef60410296292f4bea96ecf72d42292fc365043d1
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxm-v0.0.28
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
-PKG_LICENSE:BSD-2-Clause-Patent
+PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
 
-MACHINE:=$(shell $(CC) -dumpmachine)
-
-PKG_RELEASE?=1
-PKG_INSTALL:=1
-
-PKG_BUILD_DEPENDS += libamxc
-PKG_BUILD_DEPENDS += libamxp
+PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
-  CATEGORY:=amx
+  CATEGORY:=ambiorix
   SUBMENU:=Libraries
   TITLE:=$(SHORT_DESCRIPTION)
-  URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxm
+  URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxm
   DEPENDS += +libamxc
   DEPENDS += +libamxp
   MENU:=1
 endef
 
 define Package/$(PKG_NAME)/description
-	"modularity api, simplifies creation of add-ons (plug-ins, modules)"
+	modularity api, simplifies creation of add-ons (plug-ins, modules)
 endef
 
 define Build/Compile
-	echo "$(PKG_NAME): 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)
 endef
 
 define Build/Install
-	echo "$(PKG_NAME): 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 SAHConfig/Install)
 endef
 
 define Build/InstallDev
-	echo "$(PKG_NAME): 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)
 endef
 
@@ -61,8 +49,4 @@ define Package/$(PKG_NAME)/install
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
 
-define Package/$(PKG_NAME)/config
-	source "$(SOURCE)/Config.in"
-endef
-
 $(eval $(call BuildPackage,$(PKG_NAME)))

libs/libamxo/Config.in

@@ -1,16 +0,0 @@
-config PACKAGE_libamxo
-    tristate
-    select SAH_LIB_AMXO
-
-if PACKAGE_libamxo
-
-menu "Select libamxo build options"
-    depends on PACKAGE_libamxo
-
-config SAH_LIB_AMXO
-    bool "Build libamxo"
-    default y
-
-endmenu
-
-endif

libs/libamxo/Makefile

@@ -1,34 +1,26 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=libamxo
-PKG_VERSION:=v0.7.1
+PKG_VERSION:=v1.3.3
 SHORT_DESCRIPTION:=Ambiorix Object Definition Language library
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.7.1
-PKG_SOURCE_URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxo.git
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=libamxo-v1.3.3.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxo/-/archive/v1.3.3
+PKG_HASH:=11fac5e4cd823aa222e47e737f58d9497d28f3ce9da71097aba2b708fe96845e
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxo-v1.3.3
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
-PKG_LICENSE:BSD-2-Clause-Patent
+PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
 
-MACHINE:=$(shell $(CC) -dumpmachine)
-
-PKG_RELEASE?=1
-PKG_INSTALL:=1
-
-PKG_BUILD_DEPENDS += libamxc
-PKG_BUILD_DEPENDS += libamxp
-PKG_BUILD_DEPENDS += libamxd
+PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
-  CATEGORY:=amx
+  CATEGORY:=ambiorix
   SUBMENU:=Libraries
   TITLE:=$(SHORT_DESCRIPTION)
-  URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxo
+  URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxo
   DEPENDS += +libamxc
   DEPENDS += +libamxp
   DEPENDS += +libamxd
@@ -36,26 +28,21 @@ define Package/$(PKG_NAME)
 endef
 
 define Package/$(PKG_NAME)/description
-	"Ambiorix Object Definition Language library"
+	Ambiorix Object Definition Language library
 endef
 
 define Build/Compile
-	echo "$(PKG_NAME): 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)
 endef
 
 define Build/Install
-	echo "$(PKG_NAME): 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 SAHConfig/Install)
 endef
 
 define Build/InstallDev
-	echo "$(PKG_NAME): 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)
 endef
 
@@ -63,8 +50,4 @@ define Package/$(PKG_NAME)/install
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
 
-define Package/$(PKG_NAME)/config
-	source "$(SOURCE)/Config.in"
-endef
-
 $(eval $(call BuildPackage,$(PKG_NAME)))

libs/libamxp/Config.in

@@ -1,16 +0,0 @@
-config PACKAGE_libamxp
-    tristate
-    select SAH_LIB_AMXP
-
-if PACKAGE_libamxp
-
-menu "Select libamxp build options"
-    depends on PACKAGE_libamxp
-
-config SAH_LIB_AMXP
-    bool "Build libamxp"
-    default y
-
-endmenu
-
-endif

libs/libamxp/Makefile

@@ -1,57 +1,46 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=libamxp
-PKG_VERSION:=v0.6.7
+PKG_VERSION:=v0.9.3
 SHORT_DESCRIPTION:=Common patterns implementation
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.6.7
-PKG_SOURCE_URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxp.git
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=libamxp-v0.9.3.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxp/-/archive/v0.9.3
+PKG_HASH:=91f4b3ea1ac1259f7661cd4d7548392d8ec6b95fd2b7fc7c2665aafc44e8f917
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxp-v0.9.3
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
-PKG_LICENSE:BSD-2-Clause-Patent
+PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
 
-MACHINE:=$(shell $(CC) -dumpmachine)
-
-PKG_RELEASE?=1
-PKG_INSTALL:=1
-
-PKG_BUILD_DEPENDS += libamxc
+PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
-  CATEGORY:=amx
+  CATEGORY:=ambiorix
   SUBMENU:=Libraries
   TITLE:=$(SHORT_DESCRIPTION)
-  URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxp
+  URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxp
   DEPENDS += +libamxc
   MENU:=1
 endef
 
 define Package/$(PKG_NAME)/description
-	"Common patterns implementation"
+	Common patterns implementation
 endef
 
 define Build/Compile
-	echo "$(PKG_NAME): 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)
 endef
 
 define Build/Install
-	echo "$(PKG_NAME): 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 SAHConfig/Install)
 endef
 
 define Build/InstallDev
-	echo "$(PKG_NAME): 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)
 endef
 
@@ -59,8 +48,4 @@ define Package/$(PKG_NAME)/install
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
 
-define Package/$(PKG_NAME)/config
-	source "$(SOURCE)/Config.in"
-endef
-
 $(eval $(call BuildPackage,$(PKG_NAME)))

libs/libamxt/Config.in

@@ -1,16 +0,0 @@
-config PACKAGE_libamxt
-    tristate
-    select SAH_LIB_AMXP
-
-if PACKAGE_libamxt
-
-menu "Select libamxt build options"
-    depends on PACKAGE_libamxt
-
-config SAH_LIB_AMXP
-    bool "Build libamxt"
-    default y
-
-endmenu
-
-endif

libs/libamxt/Makefile

@@ -1,59 +1,47 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=libamxt
-PKG_VERSION:=v0.1.8
+PKG_VERSION:=v0.1.26
 SHORT_DESCRIPTION:=Common patterns implementation
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.1.8
-PKG_SOURCE_URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxt.git
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=libamxt-v0.1.26.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxt/-/archive/v0.1.26
+PKG_HASH:=64c5b11a92e88442177165cd1c60311dfb14f826d9c4a3ce0ec0f8c362cc43de
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxt-v0.1.26
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
-PKG_LICENSE:BSD-2-Clause-Patent
+PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
 
-MACHINE:=$(shell $(CC) -dumpmachine)
-
-PKG_RELEASE?=1
-PKG_INSTALL:=1
-
-PKG_BUILD_DEPENDS += libamxc
-PKG_BUILD_DEPENDS += libamxp
+PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
-  CATEGORY:=amx
+  CATEGORY:=ambiorix
   SUBMENU:=Libraries
   TITLE:=$(SHORT_DESCRIPTION)
-  URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxt
+  URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxt
   DEPENDS += +libamxc
   DEPENDS += +libamxp
   MENU:=1
 endef
 
 define Package/$(PKG_NAME)/description
-	"Common patterns implementation"
+	Common patterns implementation
 endef
 
 define Build/Compile
-	echo "$(PKG_NAME): 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)
 endef
 
 define Build/Install
-	echo "$(PKG_NAME): 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 SAHConfig/Install)
 endef
 
 define Build/InstallDev
-	echo "$(PKG_NAME): 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)
 endef
 
@@ -61,8 +49,4 @@ define Package/$(PKG_NAME)/install
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
 
-define Package/$(PKG_NAME)/config
-	source "$(SOURCE)/Config.in"
-endef
-
 $(eval $(call BuildPackage,$(PKG_NAME)))

libs/libsahtrace/Makefile

@@ -0,0 +1,50 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libsahtrace
+PKG_VERSION:=v1.0.0
+SHORT_DESCRIPTION:=Small and flexible library to enable tracing and logging
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/logging/libsahtrace/-/archive/$(PKG_VERSION)
+PKG_HASH:=6ee4a8b8e7ee39f94b731e9ca0aa0b342cf6565916033f39fb4ae99d3b758ab2
+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:=ambiorix
+  SUBMENU:=Libraries
+  TITLE:=$(SHORT_DESCRIPTION)
+  URL:=https://gitlab.com/soft.at.home/logging/libsahtrace
+  MENU:=1
+endef
+
+define Package/$(PKG_NAME)/description
+	Small and flexible library to enable tracing and logging
+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)
+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 {} +;
+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)
+endef
+
+define Package/$(PKG_NAME)/install
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))

libs/uriparser/Makefile

@@ -16,18 +16,25 @@ include $(INCLUDE_DIR)/cmake.mk
 
 define Package/$(PKG_NAME)
 	SECTION:=libs
-	CATEGORY:=amx
+	CATEGORY:=ambiorix
 	SUBMENU:=Libraries
 	TITLE:=RFC 3986 compliant URI parsing and handling library
 	URL:=https://uriparser.github.io/
 endef
 
 define Package/$(PKG_NAME)/description
-	"uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C89 ("ANSI C"). uriparser is cross-platform, fast, supports Unicode, and is licensed under the New BSD license."
+	Uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C89 ("ANSI C"). Uriparser is cross-platform, fast, supports Unicode, and is licensed under the New BSD license.
 endef
 
 CMAKE_OPTIONS += -DURIPARSER_BUILD_DOCS:BOOL=OFF -DURIPARSER_BUILD_TESTS:BOOL=OFF
 
+define Build/Install
+	$(call Build/Install/Default)
+	find $(PKG_INSTALL_DIR) -name *.cmake -exec rm {} +;
+	find $(PKG_INSTALL_DIR) -name *.h -exec rm {} +;
+	find $(PKG_INSTALL_DIR) -name *.pc -exec rm {} +;
+endef
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/uriparser
 	$(CP) $(PKG_BUILD_DIR)/include/uriparser $(STAGING_DIR)/usr/include/

mods/mod-amxb-ubus/Config.in

@@ -1,16 +0,0 @@
-config PACKAGE_mod-amxb-ubus
-    tristate
-    select SAH_LIB_AMXB_UBUS
-
-if PACKAGE_mod-amxb-ubus
-
-menu "Select mod-amxb-ubus build options"
-    depends on PACKAGE_mod-amxb-ubus
-
-config SAH_LIB_AMXB_UBUS
-    bool "Build ubus backend for ambiorix"
-    default y
-
-endmenu
-
-endif

mods/mod-amxb-ubus/Makefile

@@ -1,65 +1,49 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=mod-amxb-ubus
-PKG_VERSION:=v1.0.6
+PKG_VERSION:=v2.1.4
 SHORT_DESCRIPTION:=Ubus Backend
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v1.0.6
-PKG_SOURCE_URL:=git@gitlab.com:soft.at.home/ambiorix/modules/amxb_backends/amxb_ubus.git
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=amxb_ubus-v2.1.4.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/modules/amxb_backends/amxb_ubus/-/archive/v2.1.4
+PKG_HASH:=36089bae403967d0f225e057ef9ebae33682a23dec7d3269cb936521a50a4086
+PKG_BUILD_DIR:=$(BUILD_DIR)/amxb_ubus-v2.1.4
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
-PKG_LICENSE:BSD-2-Clause-Patent
+PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
 
-MACHINE:=$(shell $(CC) -dumpmachine)
-
-PKG_RELEASE?=1
-PKG_INSTALL:=1
-
-PKG_BUILD_DEPENDS += libamxc
-PKG_BUILD_DEPENDS += libamxb
-PKG_BUILD_DEPENDS += libamxd
-PKG_BUILD_DEPENDS += libubox
-PKG_BUILD_DEPENDS += ubus
+PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
-  CATEGORY:=amx
+  CATEGORY:=ambiorix
   SUBMENU:=Modules
   TITLE:=$(SHORT_DESCRIPTION)
-  URL:=git@gitlab.com:soft.at.home/ambiorix/modules/amxb_backends/amxb_ubus
+  URL:=https://gitlab.com/soft.at.home/ambiorix/modules/amxb_backends/amxb_ubus
   DEPENDS += +libamxc
   DEPENDS += +libamxb
   DEPENDS += +libamxd
-  DEPENDS += +libubox
   DEPENDS += +ubus
   MENU:=1
 endef
 
 define Package/$(PKG_NAME)/description
-	"Ubus Backend"
+	Ubus Backend
 endef
 
 define Build/Compile
-	echo "$(PKG_NAME): 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)
 endef
 
 define Build/Install
-	echo "$(PKG_NAME): 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 SAHConfig/Install)
 endef
 
 define Build/InstallDev
-	echo "$(PKG_NAME): 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)
 endef
 
@@ -67,8 +51,4 @@ define Package/$(PKG_NAME)/install
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
 
-define Package/$(PKG_NAME)/config
-	source "$(SOURCE)/Config.in"
-endef
-
 $(eval $(call BuildPackage,$(PKG_NAME)))

mods/mod-ba-cli/Config.in

@@ -0,0 +1,24 @@
+config PACKAGE_mod-ba-cli
+    tristate
+    select SAH_MOD_BA_CLI
+
+if PACKAGE_mod-ba-cli
+
+menu "Select mod-ba-cli build options"
+    depends on PACKAGE_mod-ba-cli
+
+config SAH_MOD_BA_CLI
+    bool "Build Bus Agnostic Command Line Interface Module"
+    default y
+
+config SAH_MOD_BA_CLI_INSTALL_UBUS_CLI
+    bool "Install ubus cli"
+    default y
+
+config SAH_MOD_BA_CLI_INSTALL_PCB_CLI
+    bool "Install pcb cli"
+    default y
+
+endmenu
+
+endif

mods/mod-ba-cli/Makefile

@@ -0,0 +1,62 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mod-ba-cli
+PKG_VERSION:=v0.3.4
+SHORT_DESCRIPTION:=Bus Agnostic Command Line Interface
+
+PKG_SOURCE:=mod-ba-cli-v0.3.4.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/modules/amx_cli/mod-ba-cli/-/archive/v0.3.4
+PKG_HASH:=87b3913cbb768c76a7e7f040cc4834d499b3d8b677de013a274d6407d2f7de87
+PKG_BUILD_DIR:=$(BUILD_DIR)/mod-ba-cli-v0.3.4
+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:=ambiorix
+  SUBMENU:=Modules
+  TITLE:=$(SHORT_DESCRIPTION)
+  URL:=https://gitlab.com/soft.at.home/ambiorix/modules/amx_cli/mod-ba-cli
+  DEPENDS += +libamxc
+  DEPENDS += +libamxt
+  DEPENDS += +libamxm
+  DEPENDS += +libamxp
+  DEPENDS += +libamxd
+  DEPENDS += +libamxb
+  DEPENDS += +libamxo
+  DEPENDS += +amx-cli
+  MENU:=1
+endef
+
+define Package/$(PKG_NAME)/description
+	Bus Agnostic Command Line Interface
+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)
+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 {} +;
+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)
+endef
+
+define Package/$(PKG_NAME)/install
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+endef
+
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))

mods/mod-sahtrace/Makefile

@@ -0,0 +1,54 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mod-sahtrace
+PKG_VERSION:=v0.0.8
+SHORT_DESCRIPTION:=Module for sahtrace logging
+
+PKG_SOURCE:=mod-sahtrace-v0.0.8.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/modules/mod-sahtrace/-/archive/v0.0.8
+PKG_HASH:=53907730d48c4ecc8bee43cb1f9cf0481152cc358ef8f37d79d0eeb5e92e7fb2
+PKG_BUILD_DIR:=$(BUILD_DIR)/mod-sahtrace-v0.0.8
+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:=ambiorix
+  SUBMENU:=Modules
+  TITLE:=$(SHORT_DESCRIPTION)
+  URL:=https://gitlab.com/soft.at.home/ambiorix/modules/mod-sahtrace
+  DEPENDS += +libamxc
+  DEPENDS += +libamxd
+  DEPENDS += +libamxo
+  DEPENDS += +libsahtrace
+  MENU:=1
+endef
+
+define Package/$(PKG_NAME)/description
+	Module for sahtrace logging
+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)
+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 {} +;
+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)
+endef
+
+define Package/$(PKG_NAME)/install
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))