diff --git a/patches/backports/0001-profiles-wifi.yml-add-profile-for-OpenWrt-HEAD-wifi.patch b/patches/backports/0001-profiles-wifi.yml-add-profile-for-OpenWrt-HEAD-wifi.patch deleted file mode 100644 index 8ff31d65c..000000000 --- a/patches/backports/0001-profiles-wifi.yml-add-profile-for-OpenWrt-HEAD-wifi.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 234fe1bb4c53def8b41f55105d69caeda3b51312 Mon Sep 17 00:00:00 2001 -From: John Crispin -Date: Thu, 25 Jun 2020 16:31:59 +0200 -Subject: [PATCH 01/16] profiles/wifi.yml: add profile for OpenWrt HEAD wifi - -Selecting this profile will override the current wifi stack with the v5.7 -version from OpenWrt HEAD. - -Signed-off-by: John Crispin ---- - profiles/wifi.yml | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - create mode 100644 profiles/wifi.yml - -diff --git a/profiles/wifi.yml b/profiles/wifi.yml -new file mode 100644 -index 0000000000..e3cbd04b0f ---- /dev/null -+++ b/profiles/wifi.yml -@@ -0,0 +1,13 @@ -+--- -+description: Add the wifi support from OpenWrt HEAD -+feeds: -+ - name: wifi -+ path: ../../feeds/wifi-trunk -+packages: -+ - ath10k-firmware-qca4019-ct-htt -+ - ath10k-firmware-qca9888-ct-htt -+ - ath10k-firmware-qca9984-ct-htt -+diffconfig: | -+ # CONFIG_PACKAGE_ath10k-firmware-qca4019-ct is not set -+ # CONFIG_PACKAGE_ath10k-firmware-qca9888-ct is not set -+ # CONFIG_PACKAGE_ath10k-firmware-qca9984-ct is not set --- -2.25.1 - diff --git a/patches/ipq807x/0003-ipq807x-add-the-Qualcomm-AX-target-support.patch b/patches/ipq807x/0003-ipq807x-add-the-Qualcomm-AX-target-support.patch index b18e3cc45..a1e525e8e 100644 --- a/patches/ipq807x/0003-ipq807x-add-the-Qualcomm-AX-target-support.patch +++ b/patches/ipq807x/0003-ipq807x-add-the-Qualcomm-AX-target-support.patch @@ -118,103 +118,6 @@ index 0000000000..6c429f1852 +config_foreach ubootenv_add_app_config ubootenv + +exit 0 -diff --git a/profiles/cypress.yml b/profiles/cypress.yml -new file mode 100644 -index 0000000000..4f17991607 ---- /dev/null -+++ b/profiles/cypress.yml -@@ -0,0 +1,12 @@ -+--- -+profile: qcom_cp01_c1 -+target: ipq807x -+subtarget: ipq60xx -+description: Build image for the QualComm Cypress -+_packages: -+ - opensync-tip -+feeds: -+ - name: ipq807x -+ path: ../../feeds/ipq807x -+ -+ -diff --git a/profiles/hawkeye.yml b/profiles/hawkeye.yml -new file mode 100644 -index 0000000000..926829aaa8 ---- /dev/null -+++ b/profiles/hawkeye.yml -@@ -0,0 +1,12 @@ -+--- -+profile: qcom_hk01 -+target: ipq807x -+subtarget: ipq807x -+description: Build image for the QualCom Hawkeye -+_packages: -+ - opensync-tip -+feeds: -+ - name: ipq807x -+ path: ../../feeds/ipq807x -+ -+ -diff --git a/profiles/wallaby.yml b/profiles/wallaby.yml -new file mode 100644 -index 0000000000..3e963b91bf ---- /dev/null -+++ b/profiles/wallaby.yml -@@ -0,0 +1,12 @@ -+--- -+profile: sercomm_wallaby -+target: ipq807x -+subtarget: ipq807x -+description: Build image for the Sercomm Wallaby -+_packages: -+ - opensync-tip -+feeds: -+ - name: ipq807x -+ path: ../../feeds/ipq807x -+ -+ -diff --git a/profiles/wf188.yml b/profiles/wf188.yml -new file mode 100644 -index 0000000000..4eb433efd0 ---- /dev/null -+++ b/profiles/wf188.yml -@@ -0,0 +1,10 @@ -+--- -+profile: cig_wf188 -+target: ipq807x -+subtarget: ipq60xx -+description: Build image for the Cigtech WF188 -+feeds: -+ - name: ipq807x -+ path: ../../feeds/ipq807x -+ -+ -diff --git a/profiles/wf188n.yml b/profiles/wf188n.yml -new file mode 100644 -index 0000000000..0fe2720f86 ---- /dev/null -+++ b/profiles/wf188n.yml -@@ -0,0 +1,10 @@ -+--- -+profile: cig_wf188n -+target: ipq807x -+subtarget: ipq60xx -+description: Build image for the Cigtech WF188n -+feeds: -+ - name: ipq807x -+ path: ../../feeds/ipq807x -+ -+ -diff --git a/profiles/wifi-ax.yml b/profiles/wifi-ax.yml -new file mode 100644 -index 0000000000..c8a0f7f46d ---- /dev/null -+++ b/profiles/wifi-ax.yml -@@ -0,0 +1,5 @@ -+--- -+description: Add the wifi support AX targets -+feeds: -+ - name: wifi_ax -+ uri: git@github.com:blogic/wifi-ax-feed.git diff --git a/target/linux/ipq807x/Makefile b/target/linux/ipq807x/Makefile new file mode 100644 index 0000000000..df5592bce4 diff --git a/patches/ipq807x/0006-profiles-disable-batman-on-AX.patch b/patches/ipq807x/0006-profiles-disable-batman-on-AX.patch deleted file mode 100644 index 58dae2d58..000000000 --- a/patches/ipq807x/0006-profiles-disable-batman-on-AX.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5aa6c34be12e945a7a46ecace20a936e504d5368 Mon Sep 17 00:00:00 2001 -From: John Crispin -Date: Mon, 21 Sep 2020 13:15:36 +0200 -Subject: [PATCH] profiles: disable batman on AX - -Temporary fix until batman compiles on v4.4 - -Signed-off-by: John Crispin ---- - profiles/wifi.yml | 2 ++ - profiles/wlan-ap.yml | 2 -- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/profiles/wifi.yml b/profiles/wifi.yml -index e3cbd04b0f..2c9949769f 100644 ---- a/profiles/wifi.yml -+++ b/profiles/wifi.yml -@@ -7,6 +7,8 @@ packages: - - ath10k-firmware-qca4019-ct-htt - - ath10k-firmware-qca9888-ct-htt - - ath10k-firmware-qca9984-ct-htt -+ - kmod-batman-adv -+ - batctl-default - diffconfig: | - # CONFIG_PACKAGE_ath10k-firmware-qca4019-ct is not set - # CONFIG_PACKAGE_ath10k-firmware-qca9888-ct is not set -diff --git a/profiles/wlan-ap.yml b/profiles/wlan-ap.yml -index 54d9015709..4d2a8670d2 100644 ---- a/profiles/wlan-ap.yml -+++ b/profiles/wlan-ap.yml -@@ -72,8 +72,6 @@ packages: - - opensync - - dnsmasq-full - - ipset -- - kmod-batman-adv -- - batctl-default - - ct-bugcheck - - libradiusclient - - nf_uccdetect --- -2.25.1 - diff --git a/patches/pending/0001-.gitignore-add-the-profiles-folder.patch b/patches/pending/0001-.gitignore-add-the-profiles-folder.patch new file mode 100644 index 000000000..6498cc2f5 --- /dev/null +++ b/patches/pending/0001-.gitignore-add-the-profiles-folder.patch @@ -0,0 +1,25 @@ +From ce519d5b125a81c6ee8e5dc0f266875f25171b72 Mon Sep 17 00:00:00 2001 +From: John Crispin +Date: Tue, 22 Sep 2020 18:02:55 +0200 +Subject: [PATCH] .gitignore: add the /profiles folder + +Signed-off-by: John Crispin +--- + .gitignore | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/.gitignore b/.gitignore +index 6549af83be..945405a061 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -16,6 +16,7 @@ + /overlay + /package/feeds + /package/openwrt-packages ++/profiles + /*.patch + key-build* + *.orig +-- +2.25.1 + diff --git a/patches/pending/0003-profiles-add-the-wlan-ap-board-profiles.patch b/patches/pending/0003-profiles-add-the-wlan-ap-board-profiles.patch deleted file mode 100644 index 11296bfd3..000000000 --- a/patches/pending/0003-profiles-add-the-wlan-ap-board-profiles.patch +++ /dev/null @@ -1,186 +0,0 @@ -From 6f6b2841d368becd835ed48c2c5fc4f9d08c1249 Mon Sep 17 00:00:00 2001 -From: John Crispin -Date: Fri, 19 Jun 2020 13:26:05 +0200 -Subject: [PATCH 01/26] profiles: add the wlan-ap board profiles - -These are the profiles describing the boards and feature sets that we need -to build wlan-ap packages. - -Signed-off-by: John Crispin ---- - profiles/ap2220.yml | 5 +++ - profiles/ea8300.yml | 5 +++ - profiles/ec420.yml | 5 +++ - profiles/ecw5211.yml | 5 +++ - profiles/ecw5410.yml | 5 +++ - profiles/wlan-ap.yml | 92 ++++++++++++++++++++++++++++++++++++++++++++ - 6 files changed, 117 insertions(+) - create mode 100644 profiles/ap2220.yml - create mode 100644 profiles/ea8300.yml - create mode 100644 profiles/ec420.yml - create mode 100644 profiles/ecw5211.yml - create mode 100644 profiles/ecw5410.yml - create mode 100644 profiles/wlan-ap.yml - -diff --git a/profiles/ap2220.yml b/profiles/ap2220.yml -new file mode 100644 -index 0000000000..6084fe660d ---- /dev/null -+++ b/profiles/ap2220.yml -@@ -0,0 +1,5 @@ -+--- -+profile: tp-link_ap2220 -+target: ipq40xx -+subtarget: generic -+description: Build image for the TP-Link AP2220 -diff --git a/profiles/ea8300.yml b/profiles/ea8300.yml -new file mode 100644 -index 0000000000..cb5f4b25fe ---- /dev/null -+++ b/profiles/ea8300.yml -@@ -0,0 +1,5 @@ -+--- -+profile: linksys_ea8300 -+target: ipq40xx -+subtarget: generic -+description: Build image for the Linksys EA8300 -diff --git a/profiles/ec420.yml b/profiles/ec420.yml -new file mode 100644 -index 0000000000..7cc30b883f ---- /dev/null -+++ b/profiles/ec420.yml -@@ -0,0 +1,5 @@ -+--- -+profile: tp-link_ec420_g1 -+target: ipq40xx -+subtarget: generic -+description: Build image for the TP-Link EC420 G1 -diff --git a/profiles/ecw5211.yml b/profiles/ecw5211.yml -new file mode 100644 -index 0000000000..9150a16126 ---- /dev/null -+++ b/profiles/ecw5211.yml -@@ -0,0 +1,5 @@ -+--- -+profile: edgecore_ecw5211 -+target: ipq40xx -+subtarget: generic -+description: Build image for the Edgecore ECW5211 -diff --git a/profiles/ecw5410.yml b/profiles/ecw5410.yml -new file mode 100644 -index 0000000000..d7bfba8560 ---- /dev/null -+++ b/profiles/ecw5410.yml -@@ -0,0 +1,5 @@ -+--- -+profile: edgecore_ecw5410 -+target: ipq806x -+subtarget: generic -+description: Build image for the Edgecore ECW5410 -diff --git a/profiles/wlan-ap.yml b/profiles/wlan-ap.yml -new file mode 100644 -index 0000000000..fc6076ef75 ---- /dev/null -+++ b/profiles/wlan-ap.yml -@@ -0,0 +1,98 @@ -+--- -+description: Add the wlan-ap dependencies -+feeds: -+ - name: wlan_ap -+ path: ../../feeds/wlan-ap -+ -+packages: -+ - cgi-io -+ - coreutils -+ - coreutils-sleep -+ - jansson -+ - kmod-crypto-crc32c -+ - kmod-crypto-hash -+ - kmod-lib-crc32c -+ - kmod-mpls -+ - kmod-nf-nat6 -+ - kmod-openvswitch -+ - libatomic -+ - libcares -+ - libev -+ - libiwinfo-lua -+ - liblua -+ - liblucihttp -+ - liblucihttp-lua -+ - libmosquitto-ssl -+ - libopenssl -+ - libpcap -+ - libprotobuf-c -+ - librt -+ - libstdcpp -+ - libubus-lua -+ - libunbound-light -+ - libuuid -+ - lua -+ - lldpd -+ - luci -+ - luci-app-firewall -+ - luci-app-opkg -+ - luci-base -+ - luci-lib-ip -+ - luci-lib-jsonc -+ - luci-lib-nixio -+ - luci-mod-admin-full -+ - luci-mod-network -+ - luci-mod-status -+ - luci-mod-system -+ - luci-proto-ipv6 -+ - luci-proto-ppp -+ - luci-theme-bootstrap -+ - nft-qos -+ - openvswitch -+ - openvswitch-common -+ - openvswitch-libofproto -+ - openvswitch-libopenvswitch -+ - openvswitch-libovsdb -+ - openvswitch-ovsdb -+ - openvswitch-vswitchd -+ - protobuf -+ - protobuf-lite -+ - rpcd -+ - rpcd-mod-file -+ - rpcd-mod-iwinfo -+ - rpcd-mod-luci -+ - rpcd-mod-rrdns -+ - uhttpd -+ - uuidgen -+ - zlib -+ - wlan-ap-config -+ - wpad-openssl -+ - ip-bridge -+ - opennds -+ - opensync -+ - dnsmasq-full -+ - ipset -+ - kmod-batman-adv -+ - batctl-default -+ - ct-bugcheck -+ - libradiusclient -+ - nf_uccdetect -+ - kmod-nf_uccdetect -+ -+diffconfig: | -+ CONFIG_OPENSSL_ENGINE=y -+ CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=y -+ CONFIG_OPENSSL_WITH_ASM=y -+ CONFIG_OPENSSL_WITH_CHACHA_POLY1305=y -+ CONFIG_OPENSSL_WITH_CMS=y -+ CONFIG_OPENSSL_WITH_DEPRECATED=y -+ CONFIG_OPENSSL_WITH_ERROR_MESSAGES=y -+ CONFIG_OPENSSL_WITH_PSK=y -+ CONFIG_OPENSSL_WITH_SRP=y -+ CONFIG_OPENSSL_WITH_TLS13=y -+ # CONFIG_PACKAGE_wpad-basic is not set -+ # CONFIG_PACKAGE_dnsmasq is not set -+ CONFIG_IMAGEOPT=y -+ CONFIG_PREINITOPT=y -+ CONFIG_TARGET_PREINIT_SUPPRESS_STDERR=y -+ CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE=y --- -2.25.1 - diff --git a/profiles/ap2220.yml b/profiles/ap2220.yml new file mode 100644 index 000000000..6084fe660 --- /dev/null +++ b/profiles/ap2220.yml @@ -0,0 +1,5 @@ +--- +profile: tp-link_ap2220 +target: ipq40xx +subtarget: generic +description: Build image for the TP-Link AP2220 diff --git a/profiles/cypress.yml b/profiles/cypress.yml new file mode 100644 index 000000000..4f1799160 --- /dev/null +++ b/profiles/cypress.yml @@ -0,0 +1,12 @@ +--- +profile: qcom_cp01_c1 +target: ipq807x +subtarget: ipq60xx +description: Build image for the QualComm Cypress +_packages: + - opensync-tip +feeds: + - name: ipq807x + path: ../../feeds/ipq807x + + diff --git a/profiles/ea8300.yml b/profiles/ea8300.yml new file mode 100644 index 000000000..cb5f4b25f --- /dev/null +++ b/profiles/ea8300.yml @@ -0,0 +1,5 @@ +--- +profile: linksys_ea8300 +target: ipq40xx +subtarget: generic +description: Build image for the Linksys EA8300 diff --git a/profiles/ec420.yml b/profiles/ec420.yml new file mode 100644 index 000000000..7cc30b883 --- /dev/null +++ b/profiles/ec420.yml @@ -0,0 +1,5 @@ +--- +profile: tp-link_ec420_g1 +target: ipq40xx +subtarget: generic +description: Build image for the TP-Link EC420 G1 diff --git a/profiles/ecw5211.yml b/profiles/ecw5211.yml new file mode 100644 index 000000000..9150a1612 --- /dev/null +++ b/profiles/ecw5211.yml @@ -0,0 +1,5 @@ +--- +profile: edgecore_ecw5211 +target: ipq40xx +subtarget: generic +description: Build image for the Edgecore ECW5211 diff --git a/profiles/ecw5410.yml b/profiles/ecw5410.yml new file mode 100644 index 000000000..d7bfba856 --- /dev/null +++ b/profiles/ecw5410.yml @@ -0,0 +1,5 @@ +--- +profile: edgecore_ecw5410 +target: ipq806x +subtarget: generic +description: Build image for the Edgecore ECW5410 diff --git a/profiles/hawkeye.yml b/profiles/hawkeye.yml new file mode 100644 index 000000000..926829aaa --- /dev/null +++ b/profiles/hawkeye.yml @@ -0,0 +1,12 @@ +--- +profile: qcom_hk01 +target: ipq807x +subtarget: ipq807x +description: Build image for the QualCom Hawkeye +_packages: + - opensync-tip +feeds: + - name: ipq807x + path: ../../feeds/ipq807x + + diff --git a/profiles/wallaby.yml b/profiles/wallaby.yml new file mode 100644 index 000000000..3e963b91b --- /dev/null +++ b/profiles/wallaby.yml @@ -0,0 +1,12 @@ +--- +profile: sercomm_wallaby +target: ipq807x +subtarget: ipq807x +description: Build image for the Sercomm Wallaby +_packages: + - opensync-tip +feeds: + - name: ipq807x + path: ../../feeds/ipq807x + + diff --git a/profiles/wf188.yml b/profiles/wf188.yml new file mode 100644 index 000000000..4eb433efd --- /dev/null +++ b/profiles/wf188.yml @@ -0,0 +1,10 @@ +--- +profile: cig_wf188 +target: ipq807x +subtarget: ipq60xx +description: Build image for the Cigtech WF188 +feeds: + - name: ipq807x + path: ../../feeds/ipq807x + + diff --git a/profiles/wf188n.yml b/profiles/wf188n.yml new file mode 100644 index 000000000..0fe2720f8 --- /dev/null +++ b/profiles/wf188n.yml @@ -0,0 +1,10 @@ +--- +profile: cig_wf188n +target: ipq807x +subtarget: ipq60xx +description: Build image for the Cigtech WF188n +feeds: + - name: ipq807x + path: ../../feeds/ipq807x + + diff --git a/profiles/wifi-ax.yml b/profiles/wifi-ax.yml new file mode 100644 index 000000000..c8a0f7f46 --- /dev/null +++ b/profiles/wifi-ax.yml @@ -0,0 +1,5 @@ +--- +description: Add the wifi support AX targets +feeds: + - name: wifi_ax + uri: git@github.com:blogic/wifi-ax-feed.git diff --git a/profiles/wifi.yml b/profiles/wifi.yml new file mode 100644 index 000000000..2c9949769 --- /dev/null +++ b/profiles/wifi.yml @@ -0,0 +1,15 @@ +--- +description: Add the wifi support from OpenWrt HEAD +feeds: + - name: wifi + path: ../../feeds/wifi-trunk +packages: + - ath10k-firmware-qca4019-ct-htt + - ath10k-firmware-qca9888-ct-htt + - ath10k-firmware-qca9984-ct-htt + - kmod-batman-adv + - batctl-default +diffconfig: | + # CONFIG_PACKAGE_ath10k-firmware-qca4019-ct is not set + # CONFIG_PACKAGE_ath10k-firmware-qca9888-ct is not set + # CONFIG_PACKAGE_ath10k-firmware-qca9984-ct is not set diff --git a/profiles/wlan-ap.yml b/profiles/wlan-ap.yml new file mode 100644 index 000000000..4d2a8670d --- /dev/null +++ b/profiles/wlan-ap.yml @@ -0,0 +1,96 @@ +--- +description: Add the wlan-ap dependencies +feeds: + - name: wlan_ap + path: ../../feeds/wlan-ap + +packages: + - cgi-io + - coreutils + - coreutils-sleep + - jansson + - kmod-crypto-crc32c + - kmod-crypto-hash + - kmod-lib-crc32c + - kmod-mpls + - kmod-nf-nat6 + - kmod-openvswitch + - libatomic + - libcares + - libev + - libiwinfo-lua + - liblua + - liblucihttp + - liblucihttp-lua + - libmosquitto-ssl + - libopenssl + - libpcap + - libprotobuf-c + - librt + - libstdcpp + - libubus-lua + - libunbound-light + - libuuid + - lua + - lldpd + - luci + - luci-app-firewall + - luci-app-opkg + - luci-base + - luci-lib-ip + - luci-lib-jsonc + - luci-lib-nixio + - luci-mod-admin-full + - luci-mod-network + - luci-mod-status + - luci-mod-system + - luci-proto-ipv6 + - luci-proto-ppp + - luci-theme-bootstrap + - nft-qos + - openvswitch + - openvswitch-common + - openvswitch-libofproto + - openvswitch-libopenvswitch + - openvswitch-libovsdb + - openvswitch-ovsdb + - openvswitch-vswitchd + - protobuf + - protobuf-lite + - rpcd + - rpcd-mod-file + - rpcd-mod-iwinfo + - rpcd-mod-luci + - rpcd-mod-rrdns + - uhttpd + - uuidgen + - zlib + - wlan-ap-config + - wpad-openssl + - ip-bridge + - opennds + - opensync + - dnsmasq-full + - ipset + - ct-bugcheck + - libradiusclient + - nf_uccdetect + - kmod-nf_uccdetect + +diffconfig: | + CONFIG_OPENSSL_ENGINE=y + CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=y + CONFIG_OPENSSL_WITH_ASM=y + CONFIG_OPENSSL_WITH_CHACHA_POLY1305=y + CONFIG_OPENSSL_WITH_CMS=y + CONFIG_OPENSSL_WITH_DEPRECATED=y + CONFIG_OPENSSL_WITH_ERROR_MESSAGES=y + CONFIG_OPENSSL_WITH_PSK=y + CONFIG_OPENSSL_WITH_SRP=y + CONFIG_OPENSSL_WITH_TLS13=y + # CONFIG_PACKAGE_wpad-basic is not set + # CONFIG_PACKAGE_dnsmasq is not set + CONFIG_IMAGEOPT=y + CONFIG_PREINITOPT=y + CONFIG_TARGET_PREINIT_SUPPRESS_STDERR=y + CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE=y diff --git a/setup.py b/setup.py index 4c2f6277a..a5fe4ffdf 100644 --- a/setup.py +++ b/setup.py @@ -71,6 +71,9 @@ def reset_tree(): ["git", "reset", "--hard", config.get("revision", config["branch"])], check=True, ) + run( + ["rm", "-r", "profiles"], + ) print("### Reset done") except: print("### Resetting tree failed") @@ -101,7 +104,9 @@ def setup_tree(): for patch in patches: run(["git", git_am, "-3", str(base_dir / patch)], check=True) - + run( + ["ln", "-s", "../profiles"], check=True, + ) print("### Patches done") except: print("### Setting up the tree failed")