diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 02297bc91..1603d53b0 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - target: [ 'cig_wf186w', 'cig_wf188n-ca', 'cig_wf188n-ca-ath12', 'cig_wf188n-us', 'cig_wf196-us', 'cig_wf196-ca', 'cig_wf196-ca-ath12', 'cig_wf660a', 'cybertan_eww622-a1', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'edgecore_eap101', 'edgecore_eap101-ath12', 'edgecore_eap102', 'edgecore_eap102-ath12', 'edgecore_eap104', 'edgecore_eap104-ath12', 'edgecore_eap111', 'edgecore_ecw5211', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'edgecore_oap102', 'hfcl_ion4','hfcl_ion4xi_wp', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4xi_w', 'hfcl_ion4xi_HMR', 'hfcl_ion4x_w', 'indio_um-305ax', 'indio_um-325ac', 'indio_um-510ac-v3', 'indio_um-550ac', 'indio_um-310ax-v1', 'indio_um-510axp-v1', 'indio_um-510axm-v1', 'udaya_a5-id2', 'wallys_dr40x9', 'wallys_dr6018', 'wallys_dr6018_v4', 'x64_vm', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655' ] + target: [ 'cig_wf186w', 'cig_wf188n-ca', 'cig_wf188n-ca-ath12', 'cig_wf188n-us', 'cig_wf196-us', 'cig_wf196-ca', 'cig_wf196-ca-ath12', 'cig_wf660a', 'cybertan_eww622-a1', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap111', 'edgecore_ecw5211', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'edgecore_oap102', 'hfcl_ion4','hfcl_ion4xi_wp', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4xi_w', 'hfcl_ion4xi_HMR', 'hfcl_ion4x_w', 'indio_um-305ax', 'indio_um-325ac', 'indio_um-510ac-v3', 'indio_um-550ac', 'indio_um-310ax-v1', 'indio_um-510axp-v1', 'indio_um-510axm-v1', 'udaya_a5-id2', 'wallys_dr40x9', 'wallys_dr6018', 'wallys_dr6018_v4', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655' ] steps: - uses: actions/checkout@v3 diff --git a/profiles/cig_wf186h-ath12.yml b/profiles/cig_wf186h-legacy.yml similarity index 67% rename from profiles/cig_wf186h-ath12.yml rename to profiles/cig_wf186h-legacy.yml index 249ad5cca..37a272a9b 100644 --- a/profiles/cig_wf186h-ath12.yml +++ b/profiles/cig_wf186h-legacy.yml @@ -1,18 +1,21 @@ --- profile: cig_wf186h -target: ipq50xx -subtarget: generic +target: ipq807x +subtarget: ipq50xx description: Build image for the Cigtech Wall Plate WF186h -image: bin/targets/ipq50xx/generic.openwrt-ipq50xx-cig_wf186h-squashfs-sysupgrade.tar +image: bin/targets/ipq807x/ipq50xx/openwrt-ipq807x-cig_wf186h-squashfs-sysupgrade.tar feeds: - name: ipq807x - path: ../../feeds/ipq807x_v5.4 + path: ../../feeds/ipq807x include: + - wifi-ax - ucentral-ap packages: - - ipq50xx + - ipq807x + - ath11k-fwtest + - ftm + diffconfig: | - CONFIG_KERNEL_IPQ_MEM_PROFILE=512 CONFIG_PACKAGE_i2c-tools=y CONFIG_PACKAGE_libi2c=y CONFIG_PACKAGE_coreutils=y diff --git a/profiles/cig_wf186h.yml b/profiles/cig_wf186h.yml index 37a272a9b..249ad5cca 100644 --- a/profiles/cig_wf186h.yml +++ b/profiles/cig_wf186h.yml @@ -1,21 +1,18 @@ --- profile: cig_wf186h -target: ipq807x -subtarget: ipq50xx +target: ipq50xx +subtarget: generic description: Build image for the Cigtech Wall Plate WF186h -image: bin/targets/ipq807x/ipq50xx/openwrt-ipq807x-cig_wf186h-squashfs-sysupgrade.tar +image: bin/targets/ipq50xx/generic.openwrt-ipq50xx-cig_wf186h-squashfs-sysupgrade.tar feeds: - name: ipq807x - path: ../../feeds/ipq807x + path: ../../feeds/ipq807x_v5.4 include: - - wifi-ax - ucentral-ap packages: - - ipq807x - - ath11k-fwtest - - ftm - + - ipq50xx diffconfig: | + CONFIG_KERNEL_IPQ_MEM_PROFILE=512 CONFIG_PACKAGE_i2c-tools=y CONFIG_PACKAGE_libi2c=y CONFIG_PACKAGE_coreutils=y diff --git a/profiles/cig_wf186w-ath12.yml b/profiles/cig_wf186w-legacy.yml similarity index 67% rename from profiles/cig_wf186w-ath12.yml rename to profiles/cig_wf186w-legacy.yml index 4ca41da92..5a03c6584 100644 --- a/profiles/cig_wf186w-ath12.yml +++ b/profiles/cig_wf186w-legacy.yml @@ -1,18 +1,21 @@ --- profile: cig_wf186w -target: ipq50xx -subtarget: generic +target: ipq807x +subtarget: ipq50xx description: Build image for the Cigtech Wall Plate WF186w -image: bin/targets/ipq50xx/generic.openwrt-ipq50xx-cig_wf186w-squashfs-sysupgrade.tar +image: bin/targets/ipq807x/ipq50xx/openwrt-ipq807x-cig_wf186w-squashfs-sysupgrade.tar feeds: - name: ipq807x - path: ../../feeds/ipq807x_v5.4 + path: ../../feeds/ipq807x include: + - wifi-ax - ucentral-ap packages: - - ipq50xx + - ipq807x + - ath11k-fwtest + - ftm + diffconfig: | - CONFIG_KERNEL_IPQ_MEM_PROFILE=512 CONFIG_PACKAGE_i2c-tools=y CONFIG_PACKAGE_libi2c=y CONFIG_PACKAGE_coreutils=y diff --git a/profiles/cig_wf186w.yml b/profiles/cig_wf186w.yml index 5a03c6584..4ca41da92 100644 --- a/profiles/cig_wf186w.yml +++ b/profiles/cig_wf186w.yml @@ -1,21 +1,18 @@ --- profile: cig_wf186w -target: ipq807x -subtarget: ipq50xx +target: ipq50xx +subtarget: generic description: Build image for the Cigtech Wall Plate WF186w -image: bin/targets/ipq807x/ipq50xx/openwrt-ipq807x-cig_wf186w-squashfs-sysupgrade.tar +image: bin/targets/ipq50xx/generic.openwrt-ipq50xx-cig_wf186w-squashfs-sysupgrade.tar feeds: - name: ipq807x - path: ../../feeds/ipq807x + path: ../../feeds/ipq807x_v5.4 include: - - wifi-ax - ucentral-ap packages: - - ipq807x - - ath11k-fwtest - - ftm - + - ipq50xx diffconfig: | + CONFIG_KERNEL_IPQ_MEM_PROFILE=512 CONFIG_PACKAGE_i2c-tools=y CONFIG_PACKAGE_libi2c=y CONFIG_PACKAGE_coreutils=y diff --git a/profiles/edgecore_eap101-ath12.yml b/profiles/edgecore_eap101-legacy.yml similarity index 56% rename from profiles/edgecore_eap101-ath12.yml rename to profiles/edgecore_eap101-legacy.yml index e998654e5..0ba1c249b 100644 --- a/profiles/edgecore_eap101-ath12.yml +++ b/profiles/edgecore_eap101-legacy.yml @@ -1,17 +1,17 @@ --- profile: edgecore_eap101 -target: ipq60xx -subtarget: generic +target: ipq807x +subtarget: ipq60xx description: Build image for the EdgeCore EAP101 -image: bin/targets/ipq60xx/generic/openwrt-ipq60xx-edgecore_eap101-squashfs-sysupgrade.tar +image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-edgecore_eap101-squashfs-sysupgrade.tar feeds: - name: ipq807x - path: ../../feeds/ipq807x_v5.4 + path: ../../feeds/ipq807x include: + - wifi-ax - ucentral-ap packages: - - ipq60xx + - ipq807x diffconfig: | - CONFIG_KERNEL_IPQ_MEM_PROFILE=0 CONFIG_BUSYBOX_CUSTOM=y CONFIG_BUSYBOX_CONFIG_STTY=y diff --git a/profiles/edgecore_eap101.yml b/profiles/edgecore_eap101.yml index 0ba1c249b..e998654e5 100644 --- a/profiles/edgecore_eap101.yml +++ b/profiles/edgecore_eap101.yml @@ -1,17 +1,17 @@ --- profile: edgecore_eap101 -target: ipq807x -subtarget: ipq60xx +target: ipq60xx +subtarget: generic description: Build image for the EdgeCore EAP101 -image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-edgecore_eap101-squashfs-sysupgrade.tar +image: bin/targets/ipq60xx/generic/openwrt-ipq60xx-edgecore_eap101-squashfs-sysupgrade.tar feeds: - name: ipq807x - path: ../../feeds/ipq807x + path: ../../feeds/ipq807x_v5.4 include: - - wifi-ax - ucentral-ap packages: - - ipq807x + - ipq60xx diffconfig: | + CONFIG_KERNEL_IPQ_MEM_PROFILE=0 CONFIG_BUSYBOX_CUSTOM=y CONFIG_BUSYBOX_CONFIG_STTY=y diff --git a/profiles/edgecore_eap102-ath12.yml b/profiles/edgecore_eap102-legacy.yml similarity index 52% rename from profiles/edgecore_eap102-ath12.yml rename to profiles/edgecore_eap102-legacy.yml index 01dd7250d..a0bcd45f0 100644 --- a/profiles/edgecore_eap102-ath12.yml +++ b/profiles/edgecore_eap102-legacy.yml @@ -1,13 +1,14 @@ --- profile: edgecore_eap102 target: ipq807x -subtarget: generic -description: Build image for the EdgeCore EAP102 -image: bin/targets/ipq807x/generic/openwrt-ipq807x-edgecore_eap102-squashfs-sysupgrade.tar +subtarget: ipq807x +description: Build image for the Edgecore EAP102 +image: bin/targets/ipq807x/ipq807x/openwrt-ipq807x-edgecore_eap102-squashfs-sysupgrade.tar feeds: - name: ipq807x - path: ../../feeds/ipq807x_v5.4 + path: ../../feeds/ipq807x include: + - wifi-ax - ucentral-ap packages: - ipq807x diff --git a/profiles/edgecore_eap102.yml b/profiles/edgecore_eap102.yml index a0bcd45f0..01dd7250d 100644 --- a/profiles/edgecore_eap102.yml +++ b/profiles/edgecore_eap102.yml @@ -1,14 +1,13 @@ --- profile: edgecore_eap102 target: ipq807x -subtarget: ipq807x -description: Build image for the Edgecore EAP102 -image: bin/targets/ipq807x/ipq807x/openwrt-ipq807x-edgecore_eap102-squashfs-sysupgrade.tar +subtarget: generic +description: Build image for the EdgeCore EAP102 +image: bin/targets/ipq807x/generic/openwrt-ipq807x-edgecore_eap102-squashfs-sysupgrade.tar feeds: - name: ipq807x - path: ../../feeds/ipq807x + path: ../../feeds/ipq807x_v5.4 include: - - wifi-ax - ucentral-ap packages: - ipq807x diff --git a/profiles/edgecore_eap104-ath12.yml b/profiles/edgecore_eap104-legacy.yml similarity index 64% rename from profiles/edgecore_eap104-ath12.yml rename to profiles/edgecore_eap104-legacy.yml index 1eeed8ffa..9fc318f38 100644 --- a/profiles/edgecore_eap104-ath12.yml +++ b/profiles/edgecore_eap104-legacy.yml @@ -1,16 +1,17 @@ --- profile: edgecore_eap104 -target: ipq50xx -subtarget: generic +target: ipq807x +subtarget: ipq50xx description: Build image for the EdgeCore EAP104 -image: bin/targets/ipq50xx/generic/openwrt-ipq50xx-edgecore_eap104-squashfs-sysupgrade.tar +image: bin/targets/ipq807x/ipq50xx/openwrt-ipq807x-edgecore_eap104-squashfs-sysupgrade.tar feeds: - name: ipq807x - path: ../../feeds/ipq807x_v5.4 + path: ../../feeds/ipq807x include: + - wifi-ax - ucentral-ap packages: - - ipq50xx + - ipq807x diffconfig: | CONFIG_KERNEL_IPQ_MEM_PROFILE=512 CONFIG_BUSYBOX_CUSTOM=y diff --git a/profiles/edgecore_eap104.yml b/profiles/edgecore_eap104.yml index 9fc318f38..1eeed8ffa 100644 --- a/profiles/edgecore_eap104.yml +++ b/profiles/edgecore_eap104.yml @@ -1,17 +1,16 @@ --- profile: edgecore_eap104 -target: ipq807x -subtarget: ipq50xx +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 + path: ../../feeds/ipq807x_v5.4 include: - - wifi-ax - ucentral-ap packages: - - ipq807x + - ipq50xx diffconfig: | CONFIG_KERNEL_IPQ_MEM_PROFILE=512 CONFIG_BUSYBOX_CUSTOM=y diff --git a/profiles/wallys_dr6018-ath12.yml b/profiles/wallys_dr6018-legacy.yml similarity index 57% rename from profiles/wallys_dr6018-ath12.yml rename to profiles/wallys_dr6018-legacy.yml index 3dd373fff..1c5b7442a 100644 --- a/profiles/wallys_dr6018-ath12.yml +++ b/profiles/wallys_dr6018-legacy.yml @@ -1,15 +1,16 @@ --- profile: wallys_dr6018 -target: ipq60xx -subtarget: generic +target: ipq807x +subtarget: ipq60xx description: Build image for the Wallys DR6018 -image: bin/targets/ipq60xx/generic/openwrt-ipq807x-wallys_dr6018-squashfs-sysupgrade.tar +image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-wallys_dr6018-squashfs-sysupgrade.tar feeds: - name: ipq807x - path: ../../feeds/ipq807x_v5.4 + path: ../../feeds/ipq807x include: + - wifi-ax - ucentral-ap packages: - - ipq60xx + - ipq807x diffconfig: | CONFIG_KERNEL_IPQ_MEM_PROFILE=0 diff --git a/profiles/wallys_dr6018.yml b/profiles/wallys_dr6018.yml index 1c5b7442a..3dd373fff 100644 --- a/profiles/wallys_dr6018.yml +++ b/profiles/wallys_dr6018.yml @@ -1,16 +1,15 @@ --- profile: wallys_dr6018 -target: ipq807x -subtarget: ipq60xx +target: ipq60xx +subtarget: generic description: Build image for the Wallys DR6018 -image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-wallys_dr6018-squashfs-sysupgrade.tar +image: bin/targets/ipq60xx/generic/openwrt-ipq807x-wallys_dr6018-squashfs-sysupgrade.tar feeds: - name: ipq807x - path: ../../feeds/ipq807x + path: ../../feeds/ipq807x_v5.4 include: - - wifi-ax - ucentral-ap packages: - - ipq807x + - ipq60xx diffconfig: | CONFIG_KERNEL_IPQ_MEM_PROFILE=0 diff --git a/profiles/yuncore_ax840-ath12.yml b/profiles/yuncore_ax840-legacy.yml similarity index 50% rename from profiles/yuncore_ax840-ath12.yml rename to profiles/yuncore_ax840-legacy.yml index 807ab991b..1e497ac14 100644 --- a/profiles/yuncore_ax840-ath12.yml +++ b/profiles/yuncore_ax840-legacy.yml @@ -1,13 +1,14 @@ --- profile: yuncore_ax840 -target: ipq60xx -subtarget: generic +target: ipq807x +subtarget: ipq60xx description: Build image for the YunCore AX840 -image: bin/targets/ipq60xx/generic/openwrt-ipq60xx-yuncore_ax840-squashfs-sysupgrade.tar +image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-yuncore_ax840-squashfs-sysupgrade.tar feeds: - name: ipq807x - path: ../../feeds/ipq807x_v5.4 -include: - - ucentral-ap + path: ../../feeds/ipq807x packages: - - ipq60xx + - ipq807x +include: + - wifi-ax + - ucentral-ap diff --git a/profiles/yuncore_ax840.yml b/profiles/yuncore_ax840.yml index 1e497ac14..807ab991b 100644 --- a/profiles/yuncore_ax840.yml +++ b/profiles/yuncore_ax840.yml @@ -1,14 +1,13 @@ --- profile: yuncore_ax840 -target: ipq807x -subtarget: ipq60xx +target: ipq60xx +subtarget: generic description: Build image for the YunCore AX840 -image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-yuncore_ax840-squashfs-sysupgrade.tar +image: bin/targets/ipq60xx/generic/openwrt-ipq60xx-yuncore_ax840-squashfs-sysupgrade.tar feeds: - name: ipq807x - path: ../../feeds/ipq807x -packages: - - ipq807x + path: ../../feeds/ipq807x_v5.4 include: - - wifi-ax - ucentral-ap +packages: + - ipq60xx diff --git a/profiles/yuncore_fap650-ath12.yml b/profiles/yuncore_fap650-legacy.yml similarity index 51% rename from profiles/yuncore_fap650-ath12.yml rename to profiles/yuncore_fap650-legacy.yml index 4b4751d92..57a5c1db2 100644 --- a/profiles/yuncore_fap650-ath12.yml +++ b/profiles/yuncore_fap650-legacy.yml @@ -1,13 +1,14 @@ --- profile: yuncore_fap650 -target: ipq60xx -subtarget: generic +target: ipq807x +subtarget: ipq60xx description: Build image for the YunCore FAP650 -image: bin/targets/ipq60xx/generic/openwrt-ipq807x-yuncore_fap650-squashfs-sysupgrade.tar +image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-yuncore_fap650-squashfs-sysupgrade.tar feeds: - name: ipq807x - path: ../../feeds/ipq807x_v5.4 + path: ../../feeds/ipq807x packages: - - ipq60xx + - ipq807x include: + - wifi-ax - ucentral-ap diff --git a/profiles/yuncore_fap650.yml b/profiles/yuncore_fap650.yml index 57a5c1db2..4b4751d92 100644 --- a/profiles/yuncore_fap650.yml +++ b/profiles/yuncore_fap650.yml @@ -1,14 +1,13 @@ --- profile: yuncore_fap650 -target: ipq807x -subtarget: ipq60xx +target: ipq60xx +subtarget: generic description: Build image for the YunCore FAP650 -image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-yuncore_fap650-squashfs-sysupgrade.tar +image: bin/targets/ipq60xx/generic/openwrt-ipq807x-yuncore_fap650-squashfs-sysupgrade.tar feeds: - name: ipq807x - path: ../../feeds/ipq807x + path: ../../feeds/ipq807x_v5.4 packages: - - ipq807x + - ipq60xx include: - - wifi-ax - ucentral-ap diff --git a/profiles/yuncore_fap655-ath12.yml b/profiles/yuncore_fap655-ath12.yml deleted file mode 100644 index 8c7220dc1..000000000 --- a/profiles/yuncore_fap655-ath12.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -profile: yuncore_fap655 -target: ipq50xx -subtarget: generic -description: Build image for Yuncore FAP655 -image: bin/targets/ipq50xx/generic/openwrt-ipq50xx-yuncore_fap655-squashfs-sysupgrade.tar -feeds: - - name: ipq807x - path: ../../feeds/ipq807x_v5.4 -include: - - ucentral-ap -packages: - - ipq50xx -diffconfig: | - CONFIG_KERNEL_IPQ_MEM_PROFILE=512 diff --git a/profiles/yuncore_fap655-legacy.yml b/profiles/yuncore_fap655-legacy.yml new file mode 100644 index 000000000..730673d79 --- /dev/null +++ b/profiles/yuncore_fap655-legacy.yml @@ -0,0 +1,14 @@ +--- +profile: yuncore_fap655 +target: ipq807x +subtarget: ipq50xx +description: Build image for Yuncore FAP655 +image: bin/targets/ipq807x/ipq50xx/openwrt-ipq807x-yuncore_fap655-squashfs-sysupgrade.tar +feeds: + - name: ipq807x + path: ../../feeds/ipq807x +include: + - wifi-ax + - ucentral-ap +packages: + - ipq807x diff --git a/profiles/yuncore_fap655.yml b/profiles/yuncore_fap655.yml index 730673d79..8c7220dc1 100644 --- a/profiles/yuncore_fap655.yml +++ b/profiles/yuncore_fap655.yml @@ -1,14 +1,15 @@ --- profile: yuncore_fap655 -target: ipq807x -subtarget: ipq50xx +target: ipq50xx +subtarget: generic description: Build image for Yuncore FAP655 -image: bin/targets/ipq807x/ipq50xx/openwrt-ipq807x-yuncore_fap655-squashfs-sysupgrade.tar +image: bin/targets/ipq50xx/generic/openwrt-ipq50xx-yuncore_fap655-squashfs-sysupgrade.tar feeds: - name: ipq807x - path: ../../feeds/ipq807x + path: ../../feeds/ipq807x_v5.4 include: - - wifi-ax - ucentral-ap packages: - - ipq807x + - ipq50xx +diffconfig: | + CONFIG_KERNEL_IPQ_MEM_PROFILE=512