mirror of
https://gitlab.com/prpl-foundation/prplos/feeds/feed_amx.git
synced 2026-01-14 21:04:20 +00:00
Compare commits
4 Commits
bugfix/PPM
...
dev_mf
| Author | SHA1 | Date | |
|---|---|---|---|
|
7a6f66f585 | ||
|
|
c2565562bf | ||
|
|
5e7396d050 | ||
|
|
eacf1d64e5 |
@@ -1,4 +1,2 @@
|
||||
---
|
||||
|
||||
include:
|
||||
- remote: 'https://gitlab.com/prpl-foundation/tooling/yml-templates/raw/main/.feed-pipeline.yml'
|
||||
- remote: 'https://gitlab.com/prpl-foundation/tooling/yml-templates/raw/main/.feed-pipeline.yml'
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
config PACKAGE_acl-manager
|
||||
tristate
|
||||
select SAH_SERVICES_ACL-MANAGER
|
||||
|
||||
if PACKAGE_acl-manager
|
||||
|
||||
menu "Select acl-manager build options"
|
||||
depends on PACKAGE_acl-manager
|
||||
|
||||
config SAH_SERVICES_ACL-MANAGER
|
||||
bool "The ACL manager will monitor the ACL directory and merge ACL files together to create a single master ACL file per role."
|
||||
default y
|
||||
|
||||
config SAH_SERVICES_ACL-MANAGER_REQUIRES_USERS
|
||||
bool "Add a dependency on Users.Group.acl-group that is required on prpl OS"
|
||||
default y
|
||||
|
||||
endmenu
|
||||
|
||||
endif
|
||||
@@ -1,13 +1,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=acl-manager
|
||||
PKG_VERSION:=v0.7.1
|
||||
PKG_VERSION:=v0.6.7
|
||||
SHORT_DESCRIPTION:=The ACL manager monitors ACL directory and merges ACL files
|
||||
|
||||
PKG_SOURCE:=acl-manager-v0.7.1.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/acl-manager/-/archive/v0.7.1
|
||||
PKG_HASH:=9a8c39941825da35d505f33cd8817bc5fe7674cbbb624b4b62e10f2251359b81
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/acl-manager-v0.7.1
|
||||
PKG_SOURCE:=acl-manager-v0.6.7.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/acl-manager/-/archive/v0.6.7
|
||||
PKG_HASH:=32302424e772cd7b00b4603f77596170e8430e2db7a7bf0541849f3267c34d9c
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/acl-manager-v0.6.7
|
||||
PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
|
||||
PKG_LICENSE:=BSD-2-Clause-Patent
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
@@ -44,17 +44,17 @@ define Package/$(PKG_NAME)/description
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_SERVICES_ACL-MANAGER_REQUIRES_USERS=$(CONFIG_SAH_SERVICES_ACL-MANAGER_REQUIRES_USERS))
|
||||
$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
|
||||
endef
|
||||
|
||||
define Build/Install
|
||||
$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_SERVICES_ACL-MANAGER_REQUIRES_USERS=$(CONFIG_SAH_SERVICES_ACL-MANAGER_REQUIRES_USERS))
|
||||
$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
|
||||
|
||||
$(call SAHInit/Install)
|
||||
endef
|
||||
|
||||
define Build/InstallDev
|
||||
$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_SERVICES_ACL-MANAGER_REQUIRES_USERS=$(CONFIG_SAH_SERVICES_ACL-MANAGER_REQUIRES_USERS))
|
||||
$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/install
|
||||
@@ -67,8 +67,4 @@ define Package/$(PKG_NAME)/install
|
||||
find $(1) -name *.pc -exec rm {} +;
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/config
|
||||
source "$(SOURCE)/Config.in"
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,$(PKG_NAME)))
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=amx-cli
|
||||
PKG_VERSION:=v0.5.2
|
||||
PKG_VERSION:=v0.5.1
|
||||
SHORT_DESCRIPTION:=Ambiorix interactive CLI
|
||||
|
||||
PKG_SOURCE:=amx-cli-v0.5.2.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/amx-cli/-/archive/v0.5.2
|
||||
PKG_HASH:=a05aa44845a016db7b937ed7ad518decbd45e7484d56f62d1c1c72dee5793aef
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/amx-cli-v0.5.2
|
||||
PKG_SOURCE:=amx-cli-v0.5.1.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/amx-cli/-/archive/v0.5.1
|
||||
PKG_HASH:=74f98759b38c9154c7af757713942bdbbfeb51c2f2548c1248c03dfd44f6980e
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/amx-cli-v0.5.1
|
||||
PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
|
||||
PKG_LICENSE:=BSD-2-Clause-Patent
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=amx-fcgi
|
||||
PKG_VERSION:=v1.3.13
|
||||
PKG_VERSION:=v1.3.9
|
||||
SHORT_DESCRIPTION:=Ambiorix Fast CGI app for web-servers
|
||||
|
||||
PKG_SOURCE:=amx-fcgi-v1.3.13.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/amx-fcgi/-/archive/v1.3.13
|
||||
PKG_HASH:=4f245bac44238809855f52b1ea06a8b0f0f9cc2a9540a180ed0151cec39f6eff
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/amx-fcgi-v1.3.13
|
||||
PKG_SOURCE:=amx-fcgi-v1.3.9.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/amx-fcgi/-/archive/v1.3.9
|
||||
PKG_HASH:=8dafdcf8cd619c2913db3aae81b298050e9413b4411ede2a45fa839ecaf670e8
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/amx-fcgi-v1.3.9
|
||||
PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
|
||||
PKG_LICENSE:=BSD-2-Clause-Patent
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=amxo-cg
|
||||
PKG_VERSION:=v1.6.5
|
||||
PKG_VERSION:=v1.4.3
|
||||
SHORT_DESCRIPTION:=Object Definition Language Compiler/Generator
|
||||
|
||||
PKG_SOURCE:=amxo-cg-v1.6.5.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/amxo-cg/-/archive/v1.6.5
|
||||
PKG_HASH:=132ef529452b32dacdb9f9ca84abb74a44b88b44dae28eb597d2ca0fcbc1d889
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/amxo-cg-v1.6.5
|
||||
PKG_SOURCE:=amxo-cg-v1.4.3.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/amxo-cg/-/archive/v1.4.3
|
||||
PKG_HASH:=bb6b4a7ef58c2163a77fbb3567e53f5f5418a23954bf3f7ef7e3a4a3d32828c8
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/amxo-cg-v1.4.3
|
||||
PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
|
||||
PKG_LICENSE:=BSD-2-Clause-Patent
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
@@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/$(PKG_NAME)
|
||||
CATEGORY:=prpl Foundation
|
||||
SUBMENU:=Applications
|
||||
SUBMENU:=Ambiorix
|
||||
TITLE:=$(SHORT_DESCRIPTION)
|
||||
URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/amxo-cg
|
||||
DEPENDS += +libamxc
|
||||
@@ -29,7 +29,6 @@ define Package/$(PKG_NAME)
|
||||
DEPENDS += +libamxo
|
||||
DEPENDS += +libxml2
|
||||
DEPENDS += +yajl
|
||||
DEPENDS += +libamxs
|
||||
MENU:=1
|
||||
endef
|
||||
|
||||
|
||||
@@ -1,27 +1,20 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=amxrt
|
||||
PKG_VERSION:=v2.2.4
|
||||
PKG_VERSION:=v2.1.3
|
||||
SHORT_DESCRIPTION:=Data model runtime
|
||||
|
||||
PKG_SOURCE:=amxrt-v2.2.4.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/amxrt/-/archive/v2.2.4
|
||||
PKG_HASH:=44a4086d169cb5369635ea131a35ab5dc4befeaf59c92dc92bdfac9bca24e62b
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/amxrt-v2.2.4
|
||||
PKG_SOURCE:=amxrt-v2.1.3.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/amxrt/-/archive/v2.1.3
|
||||
PKG_HASH:=a414dbf2d596753641456e755521448f52d71b1f3418d9f5dba88d70b0be7678
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/amxrt-v2.1.3
|
||||
PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
|
||||
PKG_LICENSE:=BSD-2-Clause-Patent
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
COMPONENT:=amxrt
|
||||
|
||||
PKG_RELEASE:=1
|
||||
|
||||
define SAHInit/Install
|
||||
install -d ${PKG_INSTALL_DIR}/etc/rc.d/
|
||||
ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/amx-shutdown-wait ${PKG_INSTALL_DIR}/etc/rc.d/S90amx-shutdown-wait
|
||||
ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/amx-shutdown-wait ${PKG_INSTALL_DIR}/etc/rc.d/K90amx-shutdown-wait
|
||||
endef
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/$(PKG_NAME)
|
||||
@@ -51,8 +44,6 @@ endef
|
||||
|
||||
define Build/Install
|
||||
$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
|
||||
|
||||
$(call SAHInit/Install)
|
||||
endef
|
||||
|
||||
define Build/InstallDev
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=dmtui
|
||||
PKG_VERSION:=v0.3.3
|
||||
SHORT_DESCRIPTION:=Simple example application that creates a data model using the Ambiorix framework
|
||||
|
||||
PKG_SOURCE:=dmtui-v0.3.3.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/amxlab/tui/applications/dmtui/-/archive/v0.3.3
|
||||
PKG_HASH:=51cfd6d4269e8d51722bbe6553c63fda040fadaa28787feb0d6f139c99f6137f
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/dmtui-v0.3.3
|
||||
PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
|
||||
PKG_LICENSE:=BSD-2-Clause-Patent
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
|
||||
PKG_RELEASE:=1
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/$(PKG_NAME)
|
||||
CATEGORY:=prpl Foundation
|
||||
SUBMENU:=Examples
|
||||
TITLE:=$(SHORT_DESCRIPTION)
|
||||
URL:=https://gitlab.com/prpl-foundation/components/ambiorix/amxlab/tui/applications/dmtui
|
||||
DEPENDS += +libamxc
|
||||
DEPENDS += +libamxp
|
||||
DEPENDS += +libamxt
|
||||
DEPENDS += +libamxd
|
||||
DEPENDS += +libamxo
|
||||
DEPENDS += +libamxb
|
||||
DEPENDS += +libamxtui
|
||||
MENU:=1
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/description
|
||||
Simple example application that creates a data model using the Ambiorix framework
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
|
||||
endef
|
||||
|
||||
define Build/Install
|
||||
$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
|
||||
endef
|
||||
|
||||
define Build/InstallDev
|
||||
$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/install
|
||||
$(CP) $(PKG_INSTALL_DIR)/* $(1)/
|
||||
if [ -d ./files ]; then \
|
||||
$(CP) ./files/* $(1)/; \
|
||||
fi
|
||||
find $(1) -name *.a -exec rm {} +;
|
||||
find $(1) -name *.h -exec rm {} +;
|
||||
find $(1) -name *.pc -exec rm {} +;
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,$(PKG_NAME)))
|
||||
@@ -1,13 +1,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libamxa
|
||||
PKG_VERSION:=v0.11.1
|
||||
PKG_VERSION:=v0.11.0
|
||||
SHORT_DESCRIPTION:=Access control verification
|
||||
|
||||
PKG_SOURCE:=libamxa-v0.11.1.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxa/-/archive/v0.11.1
|
||||
PKG_HASH:=c4ce80b236e2e6bef000e6c90df0b4be995e8ce689f88bbbbc1a3dcf6199d664
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/libamxa-v0.11.1
|
||||
PKG_SOURCE:=libamxa-v0.11.0.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxa/-/archive/v0.11.0
|
||||
PKG_HASH:=18bdeaf99a56530c7b2725cc3bced0eb92e04e54c57ae0f3aa98ac4c005588a9
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/libamxa-v0.11.0
|
||||
PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
|
||||
PKG_LICENSE:=BSD-2-Clause-Patent
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libamxb
|
||||
PKG_VERSION:=v4.12.0
|
||||
PKG_VERSION:=v4.9.3
|
||||
SHORT_DESCRIPTION:=Bus agnostic C API (mediator)
|
||||
|
||||
PKG_SOURCE:=libamxb-v4.12.0.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxb/-/archive/v4.12.0
|
||||
PKG_HASH:=568f6c901e6da48f15f6abd7f81faa9639fec3ffea85bdec6d2c8c1c60b7bf3a
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/libamxb-v4.12.0
|
||||
PKG_SOURCE:=libamxb-v4.9.3.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxb/-/archive/v4.9.3
|
||||
PKG_HASH:=cc634b4aa5652999a94687b4855c02cfb49e192d8f27af4aa949b78d2e5dc6c2
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/libamxb-v4.9.3
|
||||
PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
|
||||
PKG_LICENSE:=BSD-2-Clause-Patent
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
|
||||
PKG_RELEASE:=2
|
||||
PKG_RELEASE:=1
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
From f9a1bb02c2ddffb75196d3e85a1c8e505b7b85d1 Mon Sep 17 00:00:00 2001
|
||||
From: sahbot <support.opensource@softathome.com>
|
||||
Date: Tue, 25 Mar 2025 06:42:43 +0000
|
||||
Subject: [PATCH] amxb_log: Possible NULL pointer dereference
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Problem:
|
||||
========
|
||||
|
||||
In the unit-tests of the python bindings an segmentation fault occurs in amxb_log due to a NULL pointer dereference
|
||||
|
||||
==3058726== Invalid read of size 8
|
||||
==3058726== at 0x74AB48A: amxb_log (amxb_config.c:86)
|
||||
==3058726== by 0x74A5B4E: amxb_get_supported (amxb_ba_op_get_sup.c:152)
|
||||
==3058726== by 0x7442F1F: pamx_get_supported (python_amx_connection_object.c:587)
|
||||
==3058726== by 0x551BBD: ??? (in /usr/bin/python3.11)
|
||||
==3058726== by 0x53B6AB: PyObject_Vectorcall (in /usr/bin/python3.11)
|
||||
==3058726== by 0x52C2EF: _PyEval_EvalFrameDefault (in /usr/bin/python3.11)
|
||||
==3058726== by 0x55D960: _PyFunction_Vectorcall (in /usr/bin/python3.11)
|
||||
==3058726== by 0x53034D: _PyEval_EvalFrameDefault (in /usr/bin/python3.11)
|
||||
==3058726== by 0x55D960: _PyFunction_Vectorcall (in /usr/bin/python3.11)
|
||||
==3058726== by 0x53034D: _PyEval_EvalFrameDefault (in /usr/bin/python3.11)
|
||||
==3058726== by 0x55D960: _PyFunction_Vectorcall (in /usr/bin/python3.11)
|
||||
==3058726== by 0x51FB45: _PyObject_FastCallDictTstate (in /usr/bin/python3.11)
|
||||
==3058726== Address 0x30 is not stack'd, malloc'd or (recently) free'd
|
||||
==3058726==
|
||||
Fatal Python error: Segmentation fault
|
||||
|
||||
Cause:
|
||||
======
|
||||
|
||||
The bus ctx in the python bindings unit tests is not a correctly initialized bus context.
|
||||
A dummy bus context is often used in unit tests, which could cause these kind of segmentation faults.
|
||||
|
||||
Solution:
|
||||
=========
|
||||
|
||||
Add an extra NULL pointer check.
|
||||
This issue will not occur in production code as the bus contexts are always correctly created.
|
||||
|
||||
Fixes: PPM-3259
|
||||
Reported-by: Dmytro Puz <d.puz@inango-systems.com>
|
||||
Signed-off-by: Petr Štetiar <petr.stetiar@prplfoundation.org> [backport]
|
||||
(cherry picked from commit 71ca42da04dd9df26a6bcb54fbad8864f7f7a36d)
|
||||
---
|
||||
src/amxb_config.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/amxb_config.c b/src/amxb_config.c
|
||||
index cf454f78c597..01c7abc5f926 100644
|
||||
--- a/src/amxb_config.c
|
||||
+++ b/src/amxb_config.c
|
||||
@@ -83,6 +83,7 @@ void amxb_log(amxb_bus_ctx_t* ctx,
|
||||
const char* bus_name = NULL;
|
||||
|
||||
when_null(ctx, exit);
|
||||
+ when_null(ctx->bus_fn, exit);
|
||||
bus_name = ctx->bus_fn->name;
|
||||
|
||||
// In case of a timeout, write to syslog anyway
|
||||
@@ -1,13 +1,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libamxc
|
||||
PKG_VERSION:=v2.3.1
|
||||
PKG_VERSION:=v2.0.0
|
||||
SHORT_DESCRIPTION:=library providing generic reusable data containers
|
||||
|
||||
PKG_SOURCE:=libamxc-v2.3.1.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxc/-/archive/v2.3.1
|
||||
PKG_HASH:=7422bec681804bd0f9e54186e7f146f6f9d84627e12d2372285362546e66e221
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/libamxc-v2.3.1
|
||||
PKG_SOURCE:=libamxc-v2.0.0.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxc/-/archive/v2.0.0
|
||||
PKG_HASH:=c028c1d877c426b734b88b29c2a14e81c781e7e7cf05022321aaf9354dc07824
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/libamxc-v2.0.0
|
||||
PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
|
||||
PKG_LICENSE:=BSD-2-Clause-Patent
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libamxd
|
||||
PKG_VERSION:=v6.7.3
|
||||
PKG_VERSION:=v6.5.1
|
||||
SHORT_DESCRIPTION:=Data model C-API
|
||||
|
||||
PKG_SOURCE:=libamxd-v6.7.3.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxd/-/archive/v6.7.3
|
||||
PKG_HASH:=02520fde4a0888bfc972a099ee08b9ef774c951ec9f023567446e21c1fffb7c7
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/libamxd-v6.7.3
|
||||
PKG_SOURCE:=libamxd-v6.5.1.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxd/-/archive/v6.5.1
|
||||
PKG_HASH:=4a2fd2ee1af2d0e023c21dcce9ee76090bf08361023868c9d44021421250c93f
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/libamxd-v6.5.1
|
||||
PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
|
||||
PKG_LICENSE:=BSD-2-Clause-Patent
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libamxj
|
||||
PKG_VERSION:=v1.0.4
|
||||
PKG_VERSION:=v1.0.0
|
||||
SHORT_DESCRIPTION:=JSON parser & generator using yajl and libamxc variants
|
||||
|
||||
PKG_SOURCE:=libamxj-v1.0.4.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxj/-/archive/v1.0.4
|
||||
PKG_HASH:=4caa4c4c1505ee2eab189042058b978875f3e03cead3a115eb8eba08a168f865
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/libamxj-v1.0.4
|
||||
PKG_SOURCE:=libamxj-v1.0.0.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxj/-/archive/v1.0.0
|
||||
PKG_HASH:=f6e5ccf1ee6fb54d756895e5fa85090c3960bcda5062e1a90bb0fd459a1f6576
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/libamxj-v1.0.0
|
||||
PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
|
||||
PKG_LICENSE:=BSD-2-Clause-Patent
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libamxm
|
||||
PKG_VERSION:=v0.1.0
|
||||
PKG_VERSION:=v0.0.65
|
||||
SHORT_DESCRIPTION:=modularity API, simplifies creation of plug-ins
|
||||
|
||||
PKG_SOURCE:=libamxm-v0.1.0.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxm/-/archive/v0.1.0
|
||||
PKG_HASH:=b98980d2cf88c34a674f9a62cc2e71dc1cf9e94d2f38c52f513958669deb21f5
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/libamxm-v0.1.0
|
||||
PKG_SOURCE:=libamxm-v0.0.65.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxm/-/archive/v0.0.65
|
||||
PKG_HASH:=e65553d4f346afba2f49c1fb25ae025a807e30d0382b64e0b4e3da4762148fc6
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/libamxm-v0.0.65
|
||||
PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
|
||||
PKG_LICENSE:=BSD-2-Clause-Patent
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
|
||||
# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxo/-/blob/main/baf.yml instead
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libamxo
|
||||
PKG_VERSION:=v5.3.4
|
||||
PKG_VERSION:=v5.0.0
|
||||
SHORT_DESCRIPTION:=Ambiorix Object Definition Language library
|
||||
|
||||
PKG_SOURCE:=libamxo-v5.3.4.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxo/-/archive/v5.3.4
|
||||
PKG_HASH:=5ba10e068fa7ddcf2aeaace53985b340b1b6eff61a66ced1dbda0e3d87654d82
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/libamxo-v5.3.4
|
||||
PKG_SOURCE:=libamxo-v5.0.0.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxo/-/archive/v5.0.0
|
||||
PKG_HASH:=f9395be04d6e77a18ad8f6b9e1841826465fdcebd495b3e77d31bfd32e3807f5
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/libamxo-v5.0.0
|
||||
PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
|
||||
PKG_LICENSE:=BSD-2-Clause-Patent
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
|
||||
PKG_RELEASE:=1
|
||||
PKG_BUILD_DEPENDS += bison/host
|
||||
PKG_BUILD_DEPENDS += flex/host
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
||||
@@ -1,19 +1,21 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libamxp
|
||||
PKG_VERSION:=v2.7.0
|
||||
PKG_VERSION:=v2.0.0
|
||||
SHORT_DESCRIPTION:=Common patterns implementation
|
||||
|
||||
PKG_SOURCE:=libamxp-v2.7.0.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxp/-/archive/v2.7.0
|
||||
PKG_HASH:=bbe32b48049a7818b2685d3159c430a1ebe3a2aaa87147868d20020574c8e4ef
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/libamxp-v2.7.0
|
||||
PKG_SOURCE:=libamxp-v2.0.0.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxp/-/archive/v2.0.0
|
||||
PKG_HASH:=e69c113fe6448bce5133e37a499084c4497364aaeec7e7d682a6cae5ee4e1343
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/libamxp-v2.0.0
|
||||
PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
|
||||
PKG_LICENSE:=BSD-2-Clause-Patent
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
|
||||
PKG_RELEASE:=1
|
||||
PKG_BUILD_DEPENDS += bison/host
|
||||
PKG_BUILD_DEPENDS += flex/host
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
@@ -23,7 +25,6 @@ define Package/$(PKG_NAME)
|
||||
TITLE:=$(SHORT_DESCRIPTION)
|
||||
URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxp
|
||||
DEPENDS += +libamxc
|
||||
DEPENDS += +libcap-ng
|
||||
MENU:=1
|
||||
endef
|
||||
|
||||
|
||||
@@ -10,23 +10,11 @@ menu "Select libamxrt build options"
|
||||
config SAH_LIB_AMXRT
|
||||
bool "Build libamxrt"
|
||||
default y
|
||||
select KERNEL_EXT4_FS_SECURITY if USES_EXT4 || PACKAGE_kmod-fs-ext4
|
||||
select KERNEL_JFFS2_FS_SECURITY if USES_JFFS2 || USES_JFFS2_NAND
|
||||
select KERNEL_UBIFS_FS_SECURITY if USES_UBIFS
|
||||
select KERNEL_F2FS_FS_SECURITY if PACKAGE_mkf2fs
|
||||
|
||||
config SAH_AMXRT_RWDATAPATH
|
||||
string "Persistent storage location"
|
||||
default "/etc/config"
|
||||
|
||||
config FORCE_RUNNING_AS_ROOT
|
||||
bool "INSECURE: This options forces ambiorix components to run as the root user, even if they request to run as a different user"
|
||||
default y
|
||||
|
||||
config REMOVE_CAPS_ODLS
|
||||
bool "INSECURE: This option removes all the capability ODLs (*_caps.odl) from /etc/amx and subdirectories during first boot. This will also force all components to run as root"
|
||||
default y
|
||||
|
||||
endmenu
|
||||
|
||||
endif
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libamxrt
|
||||
PKG_VERSION:=v0.6.6
|
||||
PKG_VERSION:=v0.5.1
|
||||
SHORT_DESCRIPTION:=Ambiorix Run Time API
|
||||
|
||||
PKG_SOURCE:=libamxrt-v0.6.6.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxrt/-/archive/v0.6.6
|
||||
PKG_HASH:=dea27aaa844cc66437a97913eb3f9a22c5fbecb55846e1174960df7d4a876f19
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/libamxrt-v0.6.6
|
||||
PKG_SOURCE:=libamxrt-v0.5.1.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxrt/-/archive/v0.5.1
|
||||
PKG_HASH:=20121b68f6079515a2d11d129979d4392a418274d8f119d583cee1fe86646258
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/libamxrt-v0.5.1
|
||||
PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
|
||||
PKG_LICENSE:=BSD-2-Clause-Patent
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
@@ -38,15 +38,15 @@ define Package/$(PKG_NAME)/description
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_AMXRT_RWDATAPATH=$(CONFIG_SAH_AMXRT_RWDATAPATH) CONFIG_FORCE_RUNNING_AS_ROOT=$(CONFIG_FORCE_RUNNING_AS_ROOT) CONFIG_REMOVE_CAPS_ODLS=$(CONFIG_REMOVE_CAPS_ODLS))
|
||||
$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_AMXRT_RWDATAPATH=$(CONFIG_SAH_AMXRT_RWDATAPATH))
|
||||
endef
|
||||
|
||||
define Build/Install
|
||||
$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_AMXRT_RWDATAPATH=$(CONFIG_SAH_AMXRT_RWDATAPATH) CONFIG_FORCE_RUNNING_AS_ROOT=$(CONFIG_FORCE_RUNNING_AS_ROOT) CONFIG_REMOVE_CAPS_ODLS=$(CONFIG_REMOVE_CAPS_ODLS))
|
||||
$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_AMXRT_RWDATAPATH=$(CONFIG_SAH_AMXRT_RWDATAPATH))
|
||||
endef
|
||||
|
||||
define Build/InstallDev
|
||||
$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_AMXRT_RWDATAPATH=$(CONFIG_SAH_AMXRT_RWDATAPATH) CONFIG_FORCE_RUNNING_AS_ROOT=$(CONFIG_FORCE_RUNNING_AS_ROOT) CONFIG_REMOVE_CAPS_ODLS=$(CONFIG_REMOVE_CAPS_ODLS))
|
||||
$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_AMXRT_RWDATAPATH=$(CONFIG_SAH_AMXRT_RWDATAPATH))
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/install
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libamxs
|
||||
PKG_VERSION:=v0.8.1
|
||||
PKG_VERSION:=v0.6.0
|
||||
SHORT_DESCRIPTION:=Data model synchronization C-API
|
||||
|
||||
PKG_SOURCE:=libamxs-v0.8.1.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxs/-/archive/v0.8.1
|
||||
PKG_HASH:=14f3db230f42686381c690fc8ba92c7b724f43756baf102d10056b89ccd40715
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/libamxs-v0.8.1
|
||||
PKG_SOURCE:=libamxs-v0.6.0.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxs/-/archive/v0.6.0
|
||||
PKG_HASH:=fd1889cdd9cd1cac6816973f490fd66c02d2dcc9887d31cf306e6cf2c38331c0
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/libamxs-v0.6.0
|
||||
PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
|
||||
PKG_LICENSE:=BSD-2-Clause-Patent
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
@@ -1,58 +0,0 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libamxtui
|
||||
PKG_VERSION:=v0.1.7
|
||||
SHORT_DESCRIPTION:=Libamxtui is a library that provides terminal user interface widgets based on ncurses
|
||||
|
||||
PKG_SOURCE:=libamxtui-v0.1.7.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/amxlab/tui/libraries/libamxtui/-/archive/v0.1.7
|
||||
PKG_HASH:=6bf9aa7276417534471d09925e31f99276e290348bbfced3534f7f5075622824
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/libamxtui-v0.1.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:=prpl Foundation
|
||||
SUBMENU:=Ambiorix
|
||||
TITLE:=$(SHORT_DESCRIPTION)
|
||||
URL:=https://gitlab.com/prpl-foundation/components/ambiorix/amxlab/tui/libraries/libamxtui
|
||||
DEPENDS += +libamxc
|
||||
DEPENDS += +libamxt
|
||||
DEPENDS += +libamxp
|
||||
DEPENDS += +libncurses
|
||||
MENU:=1
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/description
|
||||
Libamxtui is a library that provides terminal user interface widgets based on ncurses.
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
|
||||
endef
|
||||
|
||||
define Build/Install
|
||||
$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
|
||||
endef
|
||||
|
||||
define Build/InstallDev
|
||||
$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/install
|
||||
$(CP) $(PKG_INSTALL_DIR)/* $(1)/
|
||||
if [ -d ./files ]; then \
|
||||
$(CP) ./files/* $(1)/; \
|
||||
fi
|
||||
find $(1) -name *.a -exec rm {} +;
|
||||
find $(1) -name *.h -exec rm {} +;
|
||||
find $(1) -name *.pc -exec rm {} +;
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,$(PKG_NAME)))
|
||||
@@ -1,37 +1,41 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=mod-busstats
|
||||
PKG_VERSION:=v0.3.0
|
||||
SHORT_DESCRIPTION:=Bus statistics
|
||||
PKG_NAME:=mod-amxb-pcb
|
||||
PKG_VERSION:=v3.10.1
|
||||
SHORT_DESCRIPTION:=PCB backend implementation for amxb
|
||||
|
||||
PKG_SOURCE:=mod-busstats-v0.3.0.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/modules/amx_dm_mods/mod-busstats/-/archive/v0.3.0
|
||||
PKG_HASH:=9170310e598d70a165c163cb09f7733416e5bcd27461ba8945d54324b514f7d5
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/mod-busstats-v0.3.0
|
||||
PKG_SOURCE:=amxb_pcb-v3.10.1.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/modules/amxb_backends/amxb_pcb/-/archive/v3.10.1
|
||||
PKG_HASH:=8ae2617bcd49144357a54131f00b470451f0844121fc3df29f9474b86de60d1e
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/amxb_pcb-v3.10.1
|
||||
PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
|
||||
PKG_LICENSE:=BSD-2-Clause-Patent
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
|
||||
PKG_RELEASE:=1
|
||||
PKG_BUILD_DEPENDS += libamxo
|
||||
PKG_BUILD_DEPENDS += libsahtrace
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/$(PKG_NAME)
|
||||
CATEGORY:=prpl Foundation
|
||||
SUBMENU:=Modules
|
||||
SUBMENU:=Ambiorix
|
||||
TITLE:=$(SHORT_DESCRIPTION)
|
||||
URL:=https://gitlab.com/prpl-foundation/components/ambiorix/modules/amx_dm_mods/mod-busstats
|
||||
URL:=https://gitlab.com/prpl-foundation/components/ambiorix/modules/amxb_backends/amxb_pcb
|
||||
DEPENDS += +libamxc
|
||||
DEPENDS += +libamxj
|
||||
DEPENDS += +libamxp
|
||||
DEPENDS += +libamxd
|
||||
DEPENDS += +libamxb
|
||||
DEPENDS += +libpcb
|
||||
DEPENDS += +libamxa
|
||||
DEPENDS += +libusermngt
|
||||
DEPENDS += +yajl
|
||||
MENU:=1
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/description
|
||||
Bus statistics
|
||||
PCB backend implementation for amxb
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
@@ -1,20 +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
|
||||
|
||||
config SAH_LIB_AMXB_UBUS_ORDER
|
||||
string "Backend load order"
|
||||
default "05-"
|
||||
|
||||
endmenu
|
||||
|
||||
endif
|
||||
@@ -1,13 +1,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=mod-amxb-ubus
|
||||
PKG_VERSION:=v3.9.0
|
||||
PKG_VERSION:=v3.3.2
|
||||
SHORT_DESCRIPTION:=Ubus Backend
|
||||
|
||||
PKG_SOURCE:=amxb_ubus-v3.9.0.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/modules/amxb_backends/amxb_ubus/-/archive/v3.9.0
|
||||
PKG_HASH:=28e1e418e72579ecf86f2fc866b1afda2727098227b821ce52a387072d8c4631
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/amxb_ubus-v3.9.0
|
||||
PKG_SOURCE:=amxb_ubus-v3.3.2.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/modules/amxb_backends/amxb_ubus/-/archive/v3.3.2
|
||||
PKG_HASH:=ae6a43b05af2aa2660d91b9636100821c56e3927f52eb985e7b42f1dc21b720e
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/amxb_ubus-v3.3.2
|
||||
PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
|
||||
PKG_LICENSE:=BSD-2-Clause-Patent
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
@@ -25,7 +25,7 @@ define Package/$(PKG_NAME)
|
||||
DEPENDS += +libamxc
|
||||
DEPENDS += +libamxb
|
||||
DEPENDS += +libamxd
|
||||
DEPENDS += +libubus
|
||||
DEPENDS += +ubus
|
||||
MENU:=1
|
||||
endef
|
||||
|
||||
@@ -34,15 +34,15 @@ define Package/$(PKG_NAME)/description
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_LIB_AMXB_UBUS_ORDER=$(CONFIG_SAH_LIB_AMXB_UBUS_ORDER))
|
||||
$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
|
||||
endef
|
||||
|
||||
define Build/Install
|
||||
$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_LIB_AMXB_UBUS_ORDER=$(CONFIG_SAH_LIB_AMXB_UBUS_ORDER))
|
||||
$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
|
||||
endef
|
||||
|
||||
define Build/InstallDev
|
||||
$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_LIB_AMXB_UBUS_ORDER=$(CONFIG_SAH_LIB_AMXB_UBUS_ORDER))
|
||||
$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/install
|
||||
@@ -55,8 +55,4 @@ define Package/$(PKG_NAME)/install
|
||||
find $(1) -name *.pc -exec rm {} +;
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/config
|
||||
source "$(SOURCE)/Config.in"
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,$(PKG_NAME)))
|
||||
|
||||
@@ -19,10 +19,6 @@ config SAH_MOD_BA_CLI_INSTALL_PCB_CLI
|
||||
bool "Install pcb cli"
|
||||
default y
|
||||
|
||||
config SAH_MOD_BA_CLI_INSTALL_RBUS_CLI
|
||||
bool "Install rbus cli"
|
||||
default y
|
||||
|
||||
endmenu
|
||||
|
||||
endif
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=mod-ba-cli
|
||||
PKG_VERSION:=v0.14.0
|
||||
PKG_VERSION:=v0.11.3
|
||||
SHORT_DESCRIPTION:=Bus Agnostic Command Line Interface
|
||||
|
||||
PKG_SOURCE:=mod-ba-cli-v0.14.0.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/modules/amx_cli/mod-ba-cli/-/archive/v0.14.0
|
||||
PKG_HASH:=169ef518f965f59a0a0fefe76f270f97e02cbd317e016d36b1bec88103cae46e
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/mod-ba-cli-v0.14.0
|
||||
PKG_SOURCE:=mod-ba-cli-v0.11.3.tar.gz
|
||||
PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/modules/amx_cli/mod-ba-cli/-/archive/v0.11.3
|
||||
PKG_HASH:=1aa359b86ca3e5f0e0b9bf4678ba5d32682592ddb96547b5bb07df94c78e9fbe
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/mod-ba-cli-v0.11.3
|
||||
PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
|
||||
PKG_LICENSE:=BSD-2-Clause-Patent
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
@@ -29,7 +29,6 @@ define Package/$(PKG_NAME)
|
||||
DEPENDS += +libamxd
|
||||
DEPENDS += +libamxb
|
||||
DEPENDS += +libamxa
|
||||
DEPENDS += +libamxo
|
||||
DEPENDS += +amx-cli
|
||||
MENU:=1
|
||||
endef
|
||||
@@ -39,15 +38,15 @@ define Package/$(PKG_NAME)/description
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_MOD_BA_CLI_INSTALL_UBUS_CLI=$(CONFIG_SAH_MOD_BA_CLI_INSTALL_UBUS_CLI) CONFIG_SAH_MOD_BA_CLI_INSTALL_PCB_CLI=$(CONFIG_SAH_MOD_BA_CLI_INSTALL_PCB_CLI) CONFIG_SAH_MOD_BA_CLI_INSTALL_RBUS_CLI=$(CONFIG_SAH_MOD_BA_CLI_INSTALL_RBUS_CLI))
|
||||
$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_MOD_BA_CLI_INSTALL_UBUS_CLI=$(CONFIG_SAH_MOD_BA_CLI_INSTALL_UBUS_CLI) CONFIG_SAH_MOD_BA_CLI_INSTALL_PCB_CLI=$(CONFIG_SAH_MOD_BA_CLI_INSTALL_PCB_CLI))
|
||||
endef
|
||||
|
||||
define Build/Install
|
||||
$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_MOD_BA_CLI_INSTALL_UBUS_CLI=$(CONFIG_SAH_MOD_BA_CLI_INSTALL_UBUS_CLI) CONFIG_SAH_MOD_BA_CLI_INSTALL_PCB_CLI=$(CONFIG_SAH_MOD_BA_CLI_INSTALL_PCB_CLI) CONFIG_SAH_MOD_BA_CLI_INSTALL_RBUS_CLI=$(CONFIG_SAH_MOD_BA_CLI_INSTALL_RBUS_CLI))
|
||||
$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_MOD_BA_CLI_INSTALL_UBUS_CLI=$(CONFIG_SAH_MOD_BA_CLI_INSTALL_UBUS_CLI) CONFIG_SAH_MOD_BA_CLI_INSTALL_PCB_CLI=$(CONFIG_SAH_MOD_BA_CLI_INSTALL_PCB_CLI))
|
||||
endef
|
||||
|
||||
define Build/InstallDev
|
||||
$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_MOD_BA_CLI_INSTALL_UBUS_CLI=$(CONFIG_SAH_MOD_BA_CLI_INSTALL_UBUS_CLI) CONFIG_SAH_MOD_BA_CLI_INSTALL_PCB_CLI=$(CONFIG_SAH_MOD_BA_CLI_INSTALL_PCB_CLI) CONFIG_SAH_MOD_BA_CLI_INSTALL_RBUS_CLI=$(CONFIG_SAH_MOD_BA_CLI_INSTALL_RBUS_CLI))
|
||||
$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_MOD_BA_CLI_INSTALL_UBUS_CLI=$(CONFIG_SAH_MOD_BA_CLI_INSTALL_UBUS_CLI) CONFIG_SAH_MOD_BA_CLI_INSTALL_PCB_CLI=$(CONFIG_SAH_MOD_BA_CLI_INSTALL_PCB_CLI))
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/install
|
||||
|
||||
Reference in New Issue
Block a user