From 1acddd2ce368b138e79606f60ed912b4485e53b7 Mon Sep 17 00:00:00 2001 From: Roman Shcherbakov Date: Mon, 4 Aug 2025 20:18:37 +0300 Subject: [PATCH] profiles: prpl: add Extender profiles Add two profiles to build Extender firmware: * extender_minimal.yml: minimal version of the Extender firmware; * extender_full.yml: full version of the Extender firmware. The same as minimal + support LCM and TR-069/369 management. Add new CI goals for these new profiles. References: PCF-1849, FEAT-84 Signed-off-by: Roman Shcherbakov --- .gitlab-ci.yml | 6 ++++++ .../tests/cram/mxl25641-hdk-6/005-build-config.t | 2 ++ .../tests/cram/wnc-freedom/005-build-config.t | 2 ++ profiles/extender_full.yml | 16 ++++++++++++++++ profiles/extender_minimal.yml | 14 ++++++++++++++ profiles/lcm.yml | 3 ++- profiles/prpl_core.yml | 6 +++--- profiles/qca_ipq95xx.yml | 2 +- 8 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 profiles/extender_full.yml create mode 100644 profiles/extender_minimal.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bfb61e949f..584f07066d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,6 +54,12 @@ build test ipq807x prpl security: build test qca_ipq95xx prpl cellular security thread: extends: .build test config +build test qca_ipq95xx extender_minimal cellular security thread: + extends: .build test config + +build test qca_ipq95xx extender_full cellular security thread: + extends: .build test config + coverity scan ipq807x prpl: extends: .coverity scan config variables: diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t b/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t index 14084146c8..3c26f332ab 100644 --- a/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t +++ b/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t @@ -817,6 +817,8 @@ Assure expected build configuration (PCF-1413): CONFIG_PON_SDK_VERSION="2.1.0" CONFIG_PRPLMESH_ENABLE_UNIT_TESTS=y CONFIG_PRPL_CONTROLLER_ROOT_PATH="X_PRPLWARE-COM_WiFiController" + CONFIG_PRPL_CPE_OPMODE="gateway" + CONFIG_PRPL_CPE_OPMODE_GATEWAY=y CONFIG_PRPL_IP_DIAGNOSTIC_UPLOAD_DOWNLOAD=y CONFIG_REMOVE_CAPS_ODLS=y CONFIG_SAH_AMXRT_RWDATAPATH="/etc/config" diff --git a/.gitlab/tests/cram/wnc-freedom/005-build-config.t b/.gitlab/tests/cram/wnc-freedom/005-build-config.t index ad421e0744..049f54dca8 100644 --- a/.gitlab/tests/cram/wnc-freedom/005-build-config.t +++ b/.gitlab/tests/cram/wnc-freedom/005-build-config.t @@ -578,6 +578,8 @@ Assure expected build configuration (PCF-1413): CONFIG_PKG_FORTIFY_SOURCE_2=y CONFIG_PRPLMESH_ENABLE_UNIT_TESTS=y CONFIG_PRPL_CONTROLLER_ROOT_PATH="X_PRPLWARE-COM_WiFiController" + CONFIG_PRPL_CPE_OPMODE="gateway" + CONFIG_PRPL_CPE_OPMODE_GATEWAY=y CONFIG_PRPL_IP_DIAGNOSTIC_UPLOAD_DOWNLOAD=y CONFIG_REMOVE_CAPS_ODLS=y CONFIG_SAH_AMXRT_RWDATAPATH="/etc/config" diff --git a/profiles/extender_full.yml b/profiles/extender_full.yml new file mode 100644 index 0000000000..488906d4cc --- /dev/null +++ b/profiles/extender_full.yml @@ -0,0 +1,16 @@ +--- +description: The prpl Extender profile with additional features (LCM, USP/CWMP) + +include: + - lcm + - mgmt + - prpl_core + +packages: + - extender-config + +diffconfig: | + CONFIG_BUSYBOX_CONFIG_GETOPT=y + CONFIG_BUSYBOX_CONFIG_FEATURE_GETOPT_LONG=y + CONFIG_SAH_AMX_TR181_BRIDGING_MSTPD=n + CONFIG_PRPL_CPE_OPMODE_EXTENDER=y diff --git a/profiles/extender_minimal.yml b/profiles/extender_minimal.yml new file mode 100644 index 0000000000..8ea7a2b042 --- /dev/null +++ b/profiles/extender_minimal.yml @@ -0,0 +1,14 @@ +--- +description: The prpl Extender profile with minimal features + +include: + - prpl_core + +packages: + - extender-config + +diffconfig: | + CONFIG_BUSYBOX_CONFIG_GETOPT=y + CONFIG_BUSYBOX_CONFIG_FEATURE_GETOPT_LONG=y + CONFIG_SAH_AMX_TR181_BRIDGING_MSTPD=n + CONFIG_PRPL_CPE_OPMODE_EXTENDER=y diff --git a/profiles/lcm.yml b/profiles/lcm.yml index 6fd62e78e8..5faebe8486 100644 --- a/profiles/lcm.yml +++ b/profiles/lcm.yml @@ -4,12 +4,13 @@ description: Packages and features for LCM feeds: - name: feed_lcm uri: https://gitlab.com/prpl-foundation/prplos/feeds/feed_lcm.git - revision: main@05412c21f9d572b9806b025d4284e9a3bcab47b1 + revision: main@629dc67a9c5a46a47512b165d3926ed9a71ad6c3 packages: - cthulhu - cthulhu-dhcpc - cthulhu-lxc + - cthulhu-capabilities - cthulhu-networking - cthulhu-plugin-usp - lxc diff --git a/profiles/prpl_core.yml b/profiles/prpl_core.yml index 5841c0694e..1ac699640e 100644 --- a/profiles/prpl_core.yml +++ b/profiles/prpl_core.yml @@ -3,15 +3,15 @@ description: A minimal set of prpl packages and configs (no WAN support, no LCM, feeds: - name: feed_amx uri: https://gitlab.com/prpl-foundation/prplos/feeds/feed_amx.git - revision: main@67f4f1750495a0a385b1171054dbf95254188e0a + revision: main@4346e6ce7d5327c12d9c5fcf5cb8fb23622927b9 - name: feed_prplmesh uri: https://gitlab.com/prpl-foundation/prplos/feeds/feed-prplmesh.git - revision: main@cc33c9e0cd2701993134b40340b1704f2d65654d + revision: main@6fb857ed801a4bc5ba56a14ed5b7990c5ebba361 - name: feed_prplos uri: https://gitlab.com/prpl-foundation/prplos/feeds/feed-prplos.git - revision: main@5b7c7d59ee02e3188cc0de63d0b503d1ca8ea22f + revision: main@150ef0f671f160b2bb3596c9f62027cd9555be45 additional_packages: - feed: packages diff --git a/profiles/qca_ipq95xx.yml b/profiles/qca_ipq95xx.yml index 5bfe15d9c6..726a319ece 100644 --- a/profiles/qca_ipq95xx.yml +++ b/profiles/qca_ipq95xx.yml @@ -8,7 +8,7 @@ description: Build image for prpl Foundation Freedom board feeds: - name: feed_qca uri: https://gitlab.com/prpl-foundation/prplOS/feed-qca.git - revision: latest-24.10@c54c5c3212aaa456479d8dfab4df80624b870067 + revision: latest-24.10@37b3f470bec157d7dfdeee0320d07cdd141a08ce packages: - ipq95xx