ucentral-schema: update to latest HEAD

f56f754 allow multiple fixe country codes on an AP

Fixes: WIFI-12744
Signed-off-by: John Crispin <john@phrozen.org>

.github/workflows/build-dev.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: ['actiontec_web7200', 'cig_wf186w', 'cig_wf188n', 'cig_wf194c4', 'cig_wf196-us', 'cig_wf196-ca', 'cig_wf196-ca-ath12', 'cig_wf610d', 'cig_wf660a', 'cig_wf660a', 'cig_wf808', 'cybertan_eww622-a1', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'edgecore_eap101', 'edgecore_eap101-ath12', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap104-ath12', 'liteon_wpx8324', 'edgecore_ecs4100-12ph', 'edgecore_ecw5211', 'edgecore_ecw5410', 'edgecore_oap100', 'edgecore_oap101_6e', 'edgecore_oap101e', 'edgecore_ssw2ac2600', 'edgecore_spw2ac1200', 'edgecore_spw2ac1200-lan-poe', '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-305ac', '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', 'linksys_ea6350-v4', 'linksys_e8450-ubi', 'linksys_ea8300', 'meshpp_s618_cp03', 'meshpp_s618_cp01', 'udaya_a5-id2', 'wallys_dr40x9', 'wallys_dr6018', 'wallys_dr6018_v4', 'x64_vm', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655' ]
+        target: ['actiontec_web7200', 'cig_wf186w', 'cig_wf188n-ca', 'cig_wf188n-us', 'cig_wf194c4', 'cig_wf196-us', 'cig_wf196-ca', 'cig_wf196-ca-ath12', 'cig_wf610d', 'cig_wf660a', 'cig_wf660a', 'cig_wf808', 'cybertan_eww622-a1', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'edgecore_eap101', 'edgecore_eap101-ath12', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap104-ath12', 'liteon_wpx8324', 'edgecore_ecs4100-12ph', 'edgecore_ecw5211', 'edgecore_ecw5410', 'edgecore_oap100', 'edgecore_oap101_6e', 'edgecore_oap101e', 'edgecore_ssw2ac2600', 'edgecore_spw2ac1200', 'edgecore_spw2ac1200-lan-poe', '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-305ac', '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', 'linksys_ea6350-v4', 'linksys_e8450-ubi', 'linksys_ea8300', 'meshpp_s618_cp03', 'meshpp_s618_cp01', 'udaya_a5-id2', 'wallys_dr40x9', 'wallys_dr6018', 'wallys_dr6018_v4', 'x64_vm', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655' ]
 
     steps:
     - uses: actions/checkout@v3

feeds/ipq807x/ipq807x/image/ipq60xx.mk

@@ -13,14 +13,23 @@ define Device/cig_wf660a
 endef
 TARGET_DEVICES += cig_wf660a
 
-define Device/cig_wf188n
+define Device/cig_wf188n-ca
   DEVICE_TITLE := Cigtech WF-188n
   DEVICE_DTS := qcom-ipq6018-cig-wf188n
   DEVICE_DTS_CONFIG := config@cp03-c1
   SUPPORTED_DEVICES := cig,wf188n
-  DEVICE_PACKAGES := ath11k-wifi-cig-wf188n uboot-env
+  DEVICE_PACKAGES := ath11k-wifi-cig-wf188n-ca uboot-env
 endef
-TARGET_DEVICES += cig_wf188n
+TARGET_DEVICES += cig_wf188n-ca
+
+define Device/cig_wf188n-us
+  DEVICE_TITLE := Cigtech WF-188n
+  DEVICE_DTS := qcom-ipq6018-cig-wf188n
+  DEVICE_DTS_CONFIG := config@cp03-c1
+  SUPPORTED_DEVICES := cig,wf188n
+  DEVICE_PACKAGES := ath11k-wifi-cig-wf188n-us uboot-env
+endef
+TARGET_DEVICES += cig_wf188n-us
 
 define Device/hfcl_ion4xe
   DEVICE_TITLE := HFCL ION4Xe

feeds/ucentral/ucentral-schema/Makefile

@@ -4,10 +4,10 @@ PKG_NAME:=ucentral-schema
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-schema.git
-PKG_MIRROR_HASH:=854a7a23ae9694ef8116fdff149ec527bb1bb19557a3b8d361753636021720c0
+PKG_MIRROR_HASH:=648cf460dbf98a8d4e820ec85c38331653b52d7281516bdede4282ea1a2d6655
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2022-05-29
-PKG_SOURCE_VERSION:=77031d10cd132a25a3631e66cc9a674a92c4bf2d
+PKG_SOURCE_VERSION:=f56f754c5f3bd59c9101a80241a468ba3798e79c
 
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause

feeds/ucentral/ucentral-schema/files/etc/board.d/04-regdm

@@ -8,7 +8,6 @@ board=$(board_name)
 
 case "$board" in
 cig,wf186w|\
-cig,wf188n|\
 cig,wf194c4|\
 cig,wf194c|\
 cig,wf610d|\
@@ -16,6 +15,7 @@ cig,wf808|\
 cig,wf660a)
         ucidef_set_wifi_country 'US'
         ;;
+cig,wf188n|\
 cig,wf196)
         ucidef_set_wifi_country "$(cat /lib/firmware/country)"
         ;;

patches/base/0056-base-files-add-ucidef_set_wifi_country.patch

@@ -18,7 +18,7 @@ index ff3433a0a2..3bc8e6bb1c 100644
  
 +ucidef_set_wifi_country() {
 +	json_select_object wifi
-+		json_add_string country $1 
++		json_add_string country "$1"
 +	json_select ..
 +}
 +

profiles/cig_wf188n-ca.yml

@@ -1,9 +1,9 @@
 ---
-profile: cig_wf188n
+profile: cig_wf188n-ca
 target: ipq807x
 subtarget: ipq60xx
 description: Build image for the Cigtech WF188n
-image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-cig_wf188n-squashfs-sysupgrade.tar
+image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-cig_wf188n-ca-squashfs-sysupgrade.tar
 feeds:
   - name: ipq807x
     path: ../../feeds/ipq807x

profiles/cig_wf188n-us.yml

@@ -0,0 +1,14 @@
+---
+profile: cig_wf188n-us
+target: ipq807x
+subtarget: ipq60xx
+description: Build image for the Cigtech WF188n
+image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-cig_wf188n-us-squashfs-sysupgrade.tar
+feeds:
+  - name: ipq807x
+    path: ../../feeds/ipq807x
+packages:
+  - ipq807x
+include:
+  - wifi-ax
+  - ucentral-ap