Upstep amxb_ubus

GitOrigin-RevId: 546c5e0dcdeb31b52422c7039be90acbb882fd65

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.2
 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.2.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/applications/amxb-inspect/-/archive/v1.0.2
+PKG_HASH:=51e7f28a8c371a32217e233bb77700ba68d1f40b87c6938b1de73129f153899f
+PKG_BUILD_DIR:=$(BUILD_DIR)/amxb-inspect-v1.0.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 += 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,34 +1,27 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=amxo-cg
-PKG_VERSION:=v0.2.5
+PKG_VERSION:=v1.0.4
 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_SOURCE:=amxo-cg-v1.0.4.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/applications/amxo-cg/-/archive/v1.0.4
+PKG_HASH:=e746ca6db15a418af2eb30f308edef50e9ba12afd15123098fb49462484011ba
 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:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
 
-MACHINE:=$(shell $(CC) -dumpmachine)
+PKG_RELEASE:=1
 
-PKG_RELEASE?=1
-PKG_INSTALL:=1
-
-PKG_BUILD_DEPENDS += libamxc
-PKG_BUILD_DEPENDS += libamxd
-PKG_BUILD_DEPENDS += libamxo
 
 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
@@ -36,26 +29,21 @@ define Package/$(PKG_NAME)
 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,39 +1,26 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=amxrt
-PKG_VERSION:=v0.4.5
+PKG_VERSION:=v1.0.2
 SHORT_DESCRIPTION:=Data model runtime
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.4.5
-PKG_SOURCE_URL:=git@gitlab.com:soft.at.home/ambiorix/applications/amxrt.git
-PKG_MIRROR_HASH:=7dc241b295dc97ead71e22f97f55239f0f64eac06f3c74742400980aa567d163
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=amxrt-v1.0.2.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/applications/amxrt/-/archive/v1.0.2
+PKG_HASH:=4de4f8d45e3ceb31b436229bd5d0860f108a5b4896b745f1d8fa2ab969b325fd
+PKG_BUILD_DIR:=$(BUILD_DIR)/amxrt-v1.0.2
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
 
-MACHINE:=$(shell $(CC) -dumpmachine)
-COMPONENT:=amxrt
-
-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
@@ -44,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
 
@@ -71,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,36 +1,26 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=libamxb
-PKG_VERSION:=v2.1.3
+PKG_VERSION:=v3.1.1
 SHORT_DESCRIPTION:=Bus agnostic C API (mediator)
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v2.1.3
-PKG_SOURCE_URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxb.git
-PKG_MIRROR_HASH:=59b318b2a1f3b4d86c19b5a6c6fee349739963913fd619901d74b7f0d7277a23
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=libamxb-v3.1.1.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxb/-/archive/v3.1.1
+PKG_HASH:=3fbf9b487380507eb0e126c59552a6a2f9eb3332a5b415009b6dc88ed36974f8
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxb-v3.1.1
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 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
@@ -39,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
 
@@ -66,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,56 +1,45 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=libamxc
-PKG_VERSION:=v1.0.9
+PKG_VERSION:=v1.0.14
 SHORT_DESCRIPTION:=Libamxc is a library containing data containers, implemented in ansi C (C99)
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v1.0.9
-PKG_SOURCE_URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxc.git
-PKG_MIRROR_HASH:=f5a164d6a3016e461066c8633f5d715b5d72d568de54589222f1ed4f597269f1
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=libamxc-v1.0.14.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxc/-/archive/v1.0.14
+PKG_HASH:=365cab7abc78ac9cafc37724d67d18c55fd479188b5253c395b8bd85cc98d2d4
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxc-v1.0.14
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 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
 
@@ -58,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,60 +1,47 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=libamxd
-PKG_VERSION:=v1.3.1
+PKG_VERSION:=v2.0.9
 SHORT_DESCRIPTION:=Data model C-API
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v1.3.1
-PKG_SOURCE_URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxd.git
-PKG_MIRROR_HASH:=5ba5fba51627096ab6ff94af8ac9b9db0b975f7e67f28013c5495b62cd574de8
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=libamxd-v2.0.9.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxd/-/archive/v2.0.9
+PKG_HASH:=b5be8759222302aecf901adf6ef03fe0fc8aaf854a0ebcc0d6d0aa81aefdbcbe
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxd-v2.0.9
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 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
 
@@ -62,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,60 +1,47 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=libamxj
-PKG_VERSION:=v0.3.8
+PKG_VERSION:=v0.3.16
 SHORT_DESCRIPTION:=JSON parser & generator using yajl and libamxc variants
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.3.8
-PKG_SOURCE_URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxj.git
-PKG_MIRROR_HASH:=ef720947b8c2604953ea41cadd566c57c92780caa7f5b80aeb5251f5bdf77148
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=libamxj-v0.3.16.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxj/-/archive/v0.3.16
+PKG_HASH:=70e49b4754f92304148a270468d8c8eaf02e2ca30973d81acd8e6bc74252f0b9
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxj-v0.3.16
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 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
 
@@ -62,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,60 +1,47 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=libamxm
-PKG_VERSION:=v0.0.15
+PKG_VERSION:=v0.0.20
 SHORT_DESCRIPTION:=modularity api, simplifies creation of add-ons (plug-ins, modules)
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.0.15
-PKG_SOURCE_URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxm.git
-PKG_MIRROR_HASH:=66dde86ee6ed69fca37d12a3c510f7ad97cd133fbf7dcdf6db2f4220f9bf28ed
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=libamxm-v0.0.20.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxm/-/archive/v0.0.20
+PKG_HASH:=9f2ebad0dc1e76019f2c46a15d9054f439cbc0e5ecd67d263d0be648949ee5ed
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxm-v0.0.20
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 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
 
@@ -62,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,36 +1,26 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=libamxo
-PKG_VERSION:=v0.8.1
+PKG_VERSION:=v1.1.4
 SHORT_DESCRIPTION:=Ambiorix Object Definition Language library
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.8.1
-PKG_SOURCE_URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxo.git
-PKG_MIRROR_HASH:=5a579e194a59dc8438dbaaa0c486d31b65a0fea4c6edd3dd94ea242abf1798fd
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=libamxo-v1.1.4.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxo/-/archive/v1.1.4
+PKG_HASH:=200ba679585bb814642a50b30e4adef77e634fe6c47c785c59248f22490e7b56
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxo-v1.1.4
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
 
-MACHINE:=$(shell $(CC) -dumpmachine)
-COMPONENT:=libamxo
-
-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
@@ -38,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
 
@@ -65,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,58 +1,46 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=libamxp
-PKG_VERSION:=v0.6.8
+PKG_VERSION:=v0.7.2
 SHORT_DESCRIPTION:=Common patterns implementation
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.6.8
-PKG_SOURCE_URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxp.git
-PKG_MIRROR_HASH:=bc5735be16110c4bcc911193423cc21ce1903c21920d88a47b9c2062cc40f397
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=libamxp-v0.7.2.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxp/-/archive/v0.7.2
+PKG_HASH:=1a81f40815be2b7d7017b5190fe034ca7c6be6658f9d2d36c887bf4eb923312e
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxp-v0.7.2
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 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
 
@@ -60,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,60 +1,47 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=libamxt
-PKG_VERSION:=v0.1.9
+PKG_VERSION:=v0.1.18
 SHORT_DESCRIPTION:=Common patterns implementation
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.1.9
-PKG_SOURCE_URL:=git@gitlab.com:soft.at.home/ambiorix/libraries/libamxt.git
-PKG_MIRROR_HASH:=2abf0e97994b6322255c17dcafe24c95f750215fa5a913fa8ea1c0f0e7a6368f
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=libamxt-v0.1.18.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/libraries/libamxt/-/archive/v0.1.18
+PKG_HASH:=30220655133ca734a771c0b0b0b0b697c9f8b432dab6075ce73e88eba467d577
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxt-v0.1.18
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 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
 
@@ -62,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,67 +1,49 @@
 include $(TOPDIR)/rules.mk
--include $(STAGING_DIR)/components.config
 
 PKG_NAME:=mod-amxb-ubus
-PKG_VERSION:=v1.0.7
+PKG_VERSION:=v2.0.10
 SHORT_DESCRIPTION:=Ubus Backend
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v1.0.7
-PKG_SOURCE_URL:=git@gitlab.com:soft.at.home/ambiorix/modules/amxb_backends/amxb_ubus.git
-PKG_MIRROR_HASH:=b8dc88f2d2ee7e71e7aee170539de4637819c46ee30b182b70b8e2ce70b9fe91
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=amxb_ubus-v2.0.10.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/modules/amxb_backends/amxb_ubus/-/archive/v2.0.10
+PKG_HASH:=c0b3914d381b4d1c02d9e7c6e50eccf6445d354d3936d4594bde8eb0d65ef8df
+PKG_BUILD_DIR:=$(BUILD_DIR)/amxb_ubus-v2.0.10
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
 
-MACHINE:=$(shell $(CC) -dumpmachine)
-COMPONENT:=mod-amxb-ubus
-
-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
 
@@ -69,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-sahtrace/Makefile

@@ -0,0 +1,54 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mod-sahtrace
+PKG_VERSION:=v0.0.7
+SHORT_DESCRIPTION:=Module for sahtrace logging
+
+PKG_SOURCE:=mod-sahtrace-v0.0.7.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/ambiorix/modules/mod-sahtrace/-/archive/v0.0.7
+PKG_HASH:=1242089b7fa343f73c3c4a9354869e53c197fcf620300383c8c36360bc3c8acf
+PKG_BUILD_DIR:=$(BUILD_DIR)/mod-sahtrace-v0.0.7
+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)))