profiles: update profiles to allow v4.4 and v5.4 to co-exist in CI

Signed-off-by: John Crispin <john@phrozen.org>
2025-10-29 17:42:41 +00:00 · 2023-04-11 08:58:46 +02:00
parent 91e3140f5a
commit e35aacca4b
39 changed files with 70 additions and 13 deletions
--- a/patches/base/0003-pending-scripts-add-gen_config.py.patch
+++ b/patches/base/0003-pending-scripts-add-gen_config.py.patch
@@ -1,22 +1,22 @@
-From 9279389d2759af6bfa21bfe7a80dd5c96c67df9e Mon Sep 17 00:00:00 2001
+From c4ce94a22a0e084bbbf9a787f078ec6f313f48da Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 19 Jun 2020 10:45:22 +0200
-Subject: [PATCH 01/61] pending: scripts: add gen_config.py
+Subject: [PATCH 001/114] pending: scripts: add gen_config.py

 This script is used to setup the tree based on the profiles/.

 Signed-off-by: John Crispin <john@phrozen.org>
 ---
- scripts/gen_config.py | 237 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 237 insertions(+)
+ scripts/gen_config.py | 233 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 233 insertions(+)
 create mode 100755 scripts/gen_config.py

 diff --git a/scripts/gen_config.py b/scripts/gen_config.py
 new file mode 100755
-index 0000000000..01c3f4050d
+index 0000000000..610d5b517a
 --- /dev/null
 +++ b/scripts/gen_config.py
-@@ -0,0 +1,237 @@
+@@ -0,0 +1,233 @@
 +#!/usr/bin/env python3
 +
 +from os import getenv
@@ -178,10 +178,6 @@ index 0000000000..01c3f4050d
 +            ["./scripts/feeds", "install", "-a", "-f", "-p", f.get("name")]
 +        ).returncode:
 +            die(f"Error installing {feed}")
-+        if run(
-+            ["./scripts/feeds", "install", "-f", "-p", f.get("name"), f.get("name")]
-+        ).returncode:
-+            die(f"Error installing {feed}")
 +
 +    packages = ["./scripts/feeds", "install" ]
 +    for package in profile.get("packages", []):
@@ -255,5 +251,5 @@ index 0000000000..01c3f4050d
 +    print("\n".join(warnings))
 +    print("#########################\n" * 3)
 -- 
-2.25.1
+2.34.1

--- a/profiles/cig_wf186w.yml
+++ b/profiles/cig_wf186w.yml
@@ -11,6 +11,7 @@ include:
  - wifi-ax
  - ucentral-ap
 packages:
+  - ipq807x
  - ath11k-fwtest
  - ftm

--- a/profiles/cig_wf188n.yml
+++ b/profiles/cig_wf188n.yml
@@ -7,6 +7,8 @@ image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-cig_wf188n-squashfs-sysupgrad
 feeds:
  - name: ipq807x
    path: ../../feeds/ipq807x
+packages:
+  - ipq807x
 include:
  - wifi-ax
  - ucentral-ap
--- a/profiles/cig_wf194c.yml
+++ b/profiles/cig_wf194c.yml
@@ -7,6 +7,8 @@ image: bin/targets/ipq807x/ipq807x/openwrt-ipq807x-cig_wf194-squashfs-sysupgrade
 feeds:
  - name: ipq807x
    path: ../../feeds/ipq807x
+packages:
+  - ipq807x
 include:
  - wifi-ax
  - ucentral-ap
--- a/profiles/cig_wf194c4.yml
+++ b/profiles/cig_wf194c4.yml
@@ -7,6 +7,8 @@ image: bin/targets/ipq807x/ipq807x/openwrt-ipq807x-cig_wf194c4-squashfs-sysupgra
 feeds:
  - name: ipq807x
    path: ../../feeds/ipq807x
+packages:
+  - ipq807x
 include:
  - wifi-ax
  - ucentral-ap
--- a/profiles/cig_wf196-ca-ath12.yml
+++ b/profiles/cig_wf196-ca-ath12.yml
@@ -3,7 +3,7 @@ profile: cig_wf196_ca
 target: ipq807x
 subtarget: generic
 description: Build image for the CIG WF196 (CA)
-image: bin/targets/ipq807x/ipq807x/openwrt-ipq807x-cig_wf196_ca-squashfs-sysupgrade.tar
+image: bin/targets/ipq807x/generic/openwrt-ipq807x-cig_wf196_ca-squashfs-sysupgrade.tar
 feeds:
  - name: ipq807x
    path: ../../feeds/ipq807x_v5.4
--- a/profiles/cig_wf196-ca.yml
+++ b/profiles/cig_wf196-ca.yml
@@ -11,6 +11,7 @@ include:
  - wifi-ax
  - ucentral-ap
 packages:
+  - ipq807x
  - ath11k-fwtest
  - ftm
 diffconfig: |
--- a/profiles/cig_wf196-us.yml
+++ b/profiles/cig_wf196-us.yml
@@ -11,6 +11,7 @@ include:
  - wifi-ax
  - ucentral-ap
 packages:
+  - ipq807x
  - ath11k-fwtest
  - ftm
 diffconfig: |
--- a/profiles/cig_wf196-zephyr.yml
+++ b/profiles/cig_wf196-zephyr.yml
@@ -12,6 +12,7 @@ include:
  - ucentral-ap
  - mcu
 packages:
+  - ipq807x
  - ath11k-fwtest
  - ftm
 diffconfig: |
--- a/profiles/cig_wf660a.yml
+++ b/profiles/cig_wf660a.yml
@@ -8,6 +8,7 @@ feeds:
  - name: ipq807x
    path: ../../feeds/ipq807x
 packages:
+  - ipq807x
  - e2fsprogs
  - ath11k-fwtest
  - ftm    
--- a/profiles/cybertan_eww622-a1.yml
+++ b/profiles/cybertan_eww622-a1.yml
@@ -10,6 +10,8 @@ feeds:
 include:
  - wifi-ax
  - ucentral-ap
+packages:
+  - ipq807x
 diffconfig: |
  CONFIG_BUSYBOX_CUSTOM=y
  CONFIG_BUSYBOX_CONFIG_LSUSB=y
--- a/profiles/edgecore_eap101.yml
+++ b/profiles/edgecore_eap101.yml
@@ -13,6 +13,7 @@ include:
  - wifi-ax
  - ucentral-ap
 packages:
+  - ipq807x
  - cc2652
 diffconfig: |
  CONFIG_BUSYBOX_CUSTOM=y
--- a/profiles/edgecore_eap102-zephyr.yml
+++ b/profiles/edgecore_eap102-zephyr.yml
@@ -11,5 +11,7 @@ include:
  - wifi-ax
  - ucentral-ap
  - mcu
+packages:
+  - ipq807x
 diffconfig: |
  CONFIG_KERNEL_IPQ_MEM_PROFILE=0
--- a/profiles/edgecore_eap102.yml
+++ b/profiles/edgecore_eap102.yml
@@ -10,5 +10,7 @@ feeds:
 include:
  - wifi-ax
  - ucentral-ap
+packages:
+  - ipq807x
 diffconfig: |
  CONFIG_KERNEL_IPQ_MEM_PROFILE=0
--- a/profiles/edgecore_eap104-ath12.yml
+++ b/profiles/edgecore_eap104-ath12.yml
@@ -3,7 +3,7 @@ profile: edgecore_eap104
 target: ipq50xx
 subtarget: generic
 description: Build image for the EdgeCore EAP104
-image: bin/targets/ipq807x/ipq50xx/openwrt-ipq807x-edgecore_eap104-squashfs-sysupgrade.tar
+image: bin/targets/ipq50xx/generic/openwrt-ipq50xx-edgecore_eap104-squashfs-sysupgrade.tar
 feeds:
  - name: ipq807x
    path: ../../feeds/ipq807x_v5.4
--- a/profiles/edgecore_eap104.yml
+++ b/profiles/edgecore_eap104.yml
@@ -13,6 +13,7 @@ include:
  - wifi-ax
  - ucentral-ap
 packages:
+  - ipq807x
  - cc2652
 diffconfig: |
  CONFIG_KERNEL_IPQ_MEM_PROFILE=512
--- a/profiles/edgecore_eap106.yml
+++ b/profiles/edgecore_eap106.yml
@@ -13,6 +13,7 @@ include:
  - wifi-ax
  - ucentral-ap
 packages:
+  - ipq807x
  - csr8811
  - kmod-bluetooth
  - bluez-libs
--- a/profiles/glinet_ax1800.yml
+++ b/profiles/glinet_ax1800.yml
@@ -9,5 +9,7 @@ feeds:
 include:
  - wifi-ax
  - ucentral-ap
+packages:
+  - ipq807x
 diffconfig: |
  CONFIG_KERNEL_IPQ_MEM_PROFILE=0
--- a/profiles/glinet_axt1800.yml
+++ b/profiles/glinet_axt1800.yml
@@ -9,5 +9,7 @@ feeds:
 include:
  - wifi-ax
  - ucentral-ap
+packages:
+  - ipq807x
 diffconfig: |
  CONFIG_KERNEL_IPQ_MEM_PROFILE=0
--- a/profiles/hfcl_ion4x.yml
+++ b/profiles/hfcl_ion4x.yml
@@ -7,6 +7,8 @@ image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-hfcl_ion4x-squashfs-sysupgrad
 feeds:
  - name: ipq807x
    path: ../../feeds/ipq807x
+packages:
+  - ipq807x
 include:
  - wifi-ax
  - ucentral-ap
--- a/profiles/hfcl_ion4x_2.yml
+++ b/profiles/hfcl_ion4x_2.yml
@@ -7,6 +7,8 @@ image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-hfcl_ion4x_2-squashfs-sysupgr
 feeds:
  - name: ipq807x
    path: ../../feeds/ipq807x
+packages:
+  - ipq807x
 include:
  - wifi-ax
  - ucentral-ap
--- a/profiles/hfcl_ion4xe.yml
+++ b/profiles/hfcl_ion4xe.yml
@@ -7,6 +7,8 @@ image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-hfcl_ion4xe-squashfs-sysupgra
 feeds:
  - name: ipq807x
    path: ../../feeds/ipq807x
+packages:
+  - ipq807x
 include:
  - wifi-ax
  - ucentral-ap
--- a/profiles/hfcl_ion4xi.yml
+++ b/profiles/hfcl_ion4xi.yml
@@ -7,6 +7,8 @@ image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-hfcl_ion4xi-squashfs-sysupgra
 feeds:
  - name: ipq807x
    path: ../../feeds/ipq807x
+packages:
+  - ipq807x
 include:
  - wifi-ax
  - ucentral-ap
--- a/profiles/indio_um-310ax-v1.yml
+++ b/profiles/indio_um-310ax-v1.yml
@@ -7,6 +7,8 @@ image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-indio_um-310ax-v1-squashfs-sy
 feeds:
  - name: ipq807x
    path: ../../feeds/ipq807x
+packages:
+  - ipq807x
 include:
  - wifi-ax
  - ucentral-ap
--- a/profiles/indio_um-510axm-v1.yml
+++ b/profiles/indio_um-510axm-v1.yml
@@ -7,6 +7,8 @@ image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-indio_um-510axm-v1-squashfs-s
 feeds:
  - name: ipq807x
    path: ../../feeds/ipq807x
+packages:
+  - ipq807x
 include:
  - wifi-ax
  - ucentral-ap
--- a/profiles/indio_um-510axp-v1.yml
+++ b/profiles/indio_um-510axp-v1.yml
@@ -7,6 +7,8 @@ image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-indio_um-510axp-v1-squashfs-s
 feeds:
  - name: ipq807x
    path: ../../feeds/ipq807x
+packages:
+  - ipq807x
 include:
  - wifi-ax
  - ucentral-ap
--- a/profiles/liteon_wpx8324.yml
+++ b/profiles/liteon_wpx8324.yml
@@ -7,6 +7,8 @@ image: bin/targets/ipq807x/ipq50xx/openwrt-ipq807x-liteon_wpx8324-squashfs-sysup
 feeds:
  - name: ipq807x
    path: ../../feeds/ipq807x
+packages:
+  - ipq807x
 include:
  - wifi-ax
  - ucentral-ap
--- a/profiles/meshpp_s618_cp01.yml
+++ b/profiles/meshpp_s618_cp01.yml
@@ -11,6 +11,7 @@ include:
  - ucentral-ap
  - wwan
 packages:
+  - ipq807x
  - i2c-tools
  - kmod-i2c-algo-bit
  - kmod-i2c-core
--- a/profiles/meshpp_s618_cp03.yml
+++ b/profiles/meshpp_s618_cp03.yml
@@ -11,6 +11,7 @@ include:
  - ucentral-ap
  - wwan
 packages:
+  - ipq807x
  - i2c-tools
  - kmod-i2c-algo-bit
  - kmod-i2c-core
--- a/profiles/motorola_q14.yml
+++ b/profiles/motorola_q14.yml
@@ -11,6 +11,7 @@ include:
  - wifi-ax
  - ucentral-ap
 packages:
+  - ipq807x
  - e2fsprogs
 diffconfig: |
  CONFIG_KERNEL_IPQ_MEM_PROFILE=512
--- a/profiles/plasmacloud_pax1800-v2.yml
+++ b/profiles/plasmacloud_pax1800-v2.yml
@@ -9,5 +9,7 @@ feeds:
 include:
  - wifi-ax
  - ucentral-ap-light
+packages:
+  - ipq807x
 diffconfig: |
  CONFIG_KERNEL_IPQ_MEM_PROFILE=512
--- a/profiles/qcom_hk14.yml
+++ b/profiles/qcom_hk14.yml
@@ -10,5 +10,7 @@ feeds:
 include:
  - wifi-ax
  - ucentral-ap
+packages:
+  - ipq807x
 diffconfig: |
  CONFIG_KERNEL_IPQ_MEM_PROFILE=0
--- a/profiles/qcom_mp03.3.yml
+++ b/profiles/qcom_mp03.3.yml
@@ -10,5 +10,7 @@ feeds:
 include:
  - wifi-ax
  - ucentral-ap
+packages:
+  - ipq807x
 diffconfig: |
  CONFIG_KERNEL_IPQ_MEM_PROFILE=0
--- a/profiles/tplink_ex227.yml
+++ b/profiles/tplink_ex227.yml
@@ -10,5 +10,7 @@ feeds:
 include:
  - wifi-ax
  - ucentral-ap
+packages:
+  - ipq807x
 diffconfig: |
  CONFIG_KERNEL_IPQ_MEM_PROFILE=0
--- a/profiles/tplink_ex447.yml
+++ b/profiles/tplink_ex447.yml
@@ -10,5 +10,7 @@ feeds:
 include:
  - wifi-ax
  - ucentral-ap
+packages:
+  - ipq807x
 diffconfig: |
  CONFIG_KERNEL_IPQ_MEM_PROFILE=0
--- a/profiles/wallys_dr6018.yml
+++ b/profiles/wallys_dr6018.yml
@@ -10,5 +10,7 @@ feeds:
 include:
  - wifi-ax
  - ucentral-ap
+packages:
+  - ipq807x
 diffconfig: |
  CONFIG_KERNEL_IPQ_MEM_PROFILE=0
--- a/profiles/wallys_dr6018_v4.yml
+++ b/profiles/wallys_dr6018_v4.yml
@@ -10,5 +10,7 @@ feeds:
 include:
  - wifi-ax
  - ucentral-ap
+packages:
+  - ipq807x
 diffconfig: |
  CONFIG_KERNEL_IPQ_MEM_PROFILE=0
--- a/profiles/yuncore_ax840.yml
+++ b/profiles/yuncore_ax840.yml
@@ -7,6 +7,8 @@ image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-yuncore_ax840-squashfs-sysupg
 feeds:
  - name: ipq807x
    path: ../../feeds/ipq807x
+packages:
+  - ipq807x
 include:
  - wifi-ax
  - ucentral-ap
--- a/profiles/yuncore_fap650.yml
+++ b/profiles/yuncore_fap650.yml
@@ -7,6 +7,8 @@ image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-yuncore_fap650-squashfs-sysup
 feeds:
  - name: ipq807x
    path: ../../feeds/ipq807x
+packages:
+  - ipq807x
 include:
  - wifi-ax
  - ucentral-ap