diff --git a/config.yml b/config.yml index 805c56420..bb12c59d8 100644 --- a/config.yml +++ b/config.yml @@ -4,7 +4,4 @@ revision: 8c191712558ce945993982b03abc5ce80e0fe230 output_dir: ./output patch_folders: - - patches/backports - - patches/pending - - patches/wlan-ap - - patches/ipq807x + - patches/ diff --git a/patches/backports/0001-netifd-several-backports-required-by-ipq807x.patch b/patches/0001-netifd-several-backports-required-by-ipq807x.patch similarity index 99% rename from patches/backports/0001-netifd-several-backports-required-by-ipq807x.patch rename to patches/0001-netifd-several-backports-required-by-ipq807x.patch index dfee88838..766fd0ece 100644 --- a/patches/backports/0001-netifd-several-backports-required-by-ipq807x.patch +++ b/patches/0001-netifd-several-backports-required-by-ipq807x.patch @@ -1,7 +1,7 @@ -From 8131109d7db0aefdaa4c5c6c248ad474f24c3223 Mon Sep 17 00:00:00 2001 +From 83340aa0935db7d0f6930b9fbf41318899877ef2 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 20 Jun 2020 16:27:12 +0200 -Subject: [PATCH] netifd: several backports required by ipq807x +Subject: [PATCH 01/30] netifd: several backports required by ipq807x IPQ807x uses the mac80211.sh/hostapd.sh from owrt HEAD, which require these patches. diff --git a/patches/backports/0002-netifd-add-bridge-vlan-support.patch b/patches/0002-netifd-add-bridge-vlan-support.patch similarity index 99% rename from patches/backports/0002-netifd-add-bridge-vlan-support.patch rename to patches/0002-netifd-add-bridge-vlan-support.patch index ac5f88eb1..9ebef0b0f 100644 --- a/patches/backports/0002-netifd-add-bridge-vlan-support.patch +++ b/patches/0002-netifd-add-bridge-vlan-support.patch @@ -1,7 +1,7 @@ -From e75c6670ba0e2bd160beb8df31724970f5768a14 Mon Sep 17 00:00:00 2001 +From ff27a07e9e0337f6a639dceef6c9a2de3719e564 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sun, 12 Jul 2020 18:41:24 +0200 -Subject: [PATCH 01/13] netifd: add bridge/vlan support +Subject: [PATCH 02/30] netifd: add bridge/vlan support Backport the vlan patches for the netifd bridge layer. diff --git a/patches/backports/0003-ubox-add-log-priority-filtering.patch b/patches/0003-ubox-add-log-priority-filtering.patch similarity index 96% rename from patches/backports/0003-ubox-add-log-priority-filtering.patch rename to patches/0003-ubox-add-log-priority-filtering.patch index 90f812a66..47128990c 100644 --- a/patches/backports/0003-ubox-add-log-priority-filtering.patch +++ b/patches/0003-ubox-add-log-priority-filtering.patch @@ -1,7 +1,7 @@ -From 66096d1f1f3d55bb003a5bfe1b01c2c83db1d705 Mon Sep 17 00:00:00 2001 +From 9b69e7551dd2cc4bb93f825bcfe10cf2c89493b5 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 23 Jul 2020 16:09:28 +0200 -Subject: [PATCH] ubox: add log priority filtering +Subject: [PATCH 03/30] ubox: add log priority filtering Allow logread to filer based on priority. diff --git a/patches/backports/0004-netifd-send-status-on-subscribe.patch b/patches/0004-netifd-add-interface-to-status-messages.patch similarity index 93% rename from patches/backports/0004-netifd-send-status-on-subscribe.patch rename to patches/0004-netifd-add-interface-to-status-messages.patch index 45a0b51be..6c4438a38 100644 --- a/patches/backports/0004-netifd-send-status-on-subscribe.patch +++ b/patches/0004-netifd-add-interface-to-status-messages.patch @@ -1,7 +1,7 @@ -From a504e3759a3198a1fb499cef8acb01ebd839ee22 Mon Sep 17 00:00:00 2001 +From 20c424c6db8637020f979befdc79cac077e48fd5 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 29 Jul 2020 12:30:42 +0200 -Subject: [PATCH 01/27] netifd: add interface to status messages +Subject: [PATCH 04/30] netifd: add interface to status messages Add the interface name to the status messages. Otherwise we cannot identify the content. diff --git a/patches/pending/0001-.gitignore-add-the-profiles-folder.patch b/patches/0005-.gitignore-add-the-profiles-folder.patch similarity index 77% rename from patches/pending/0001-.gitignore-add-the-profiles-folder.patch rename to patches/0005-.gitignore-add-the-profiles-folder.patch index 6498cc2f5..01e7e07c3 100644 --- a/patches/pending/0001-.gitignore-add-the-profiles-folder.patch +++ b/patches/0005-.gitignore-add-the-profiles-folder.patch @@ -1,7 +1,7 @@ -From ce519d5b125a81c6ee8e5dc0f266875f25171b72 Mon Sep 17 00:00:00 2001 +From e18d8cbdb4985fad10b413714e411dd5584073e1 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 +Subject: [PATCH 05/30] .gitignore: add the /profiles folder Signed-off-by: John Crispin --- diff --git a/patches/pending/0001-pending-scripts-add-gen_config.py.patch b/patches/0006-pending-scripts-add-gen_config.py.patch similarity index 95% rename from patches/pending/0001-pending-scripts-add-gen_config.py.patch rename to patches/0006-pending-scripts-add-gen_config.py.patch index 54c29042f..8f738810a 100644 --- a/patches/pending/0001-pending-scripts-add-gen_config.py.patch +++ b/patches/0006-pending-scripts-add-gen_config.py.patch @@ -1,19 +1,19 @@ -From 4c6e17ce63c1da986237cc368a3085e19c7947c6 Mon Sep 17 00:00:00 2001 +From cc1b7ac4d020f0ac0cfbc242184c93f8ff53a0a9 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 19 Jun 2020 10:45:22 +0200 -Subject: [PATCH 1/3] pending: scripts: add gen_config.py +Subject: [PATCH 06/30] pending: scripts: add gen_config.py This script is used to setup the tree based on the profiles/. Signed-off-by: John Crispin --- - scripts/gen_config.py | 185 ++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 185 insertions(+) + scripts/gen_config.py | 184 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 184 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..f55787ee1a +index 0000000000..32cc7353ce --- /dev/null +++ b/scripts/gen_config.py @@ -0,0 +1,184 @@ diff --git a/patches/pending/0002-scripts-update-feed-script.patch b/patches/0007-scripts-update-feed-script.patch similarity index 96% rename from patches/pending/0002-scripts-update-feed-script.patch rename to patches/0007-scripts-update-feed-script.patch index 936c6a351..bbd5ccbfb 100644 --- a/patches/pending/0002-scripts-update-feed-script.patch +++ b/patches/0007-scripts-update-feed-script.patch @@ -1,7 +1,7 @@ -From 732f0992ad36a6d9f6aa459ce0899891422b65f0 Mon Sep 17 00:00:00 2001 +From 2f915b4b478c18b0f7583ab5b57893a7c2f5300b Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 19 Jun 2020 13:25:27 +0200 -Subject: [PATCH 2/3] scripts: update feed script +Subject: [PATCH 07/30] scripts: update feed script gen_config.py requires the latest version of the feeds script. diff --git a/patches/pending/0004-kernel-fix-crashlog-for-ARM.patch b/patches/0008-kernel-fix-crashlog-for-ARM.patch similarity index 97% rename from patches/pending/0004-kernel-fix-crashlog-for-ARM.patch rename to patches/0008-kernel-fix-crashlog-for-ARM.patch index b8340fec4..d20bade73 100644 --- a/patches/pending/0004-kernel-fix-crashlog-for-ARM.patch +++ b/patches/0008-kernel-fix-crashlog-for-ARM.patch @@ -1,7 +1,7 @@ -From 3fe28d6dbd80231937cb5569cc8ed28fb51b9d28 Mon Sep 17 00:00:00 2001 +From 83d3cbbf165d8a2044e56866101a4f8eac2948a5 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 24 Jul 2020 11:55:31 +0200 -Subject: [PATCH] kernel: fix crashlog for ARM +Subject: [PATCH 08/30] kernel: fix crashlog for ARM The current driver was MIPS specific, make it work on ARM. diff --git a/patches/wlan-ap/0001-firmware-ipq-wifi-enable-use-on-IPQ806x.patch b/patches/0009-firmware-ipq-wifi-enable-use-on-IPQ806x.patch similarity index 87% rename from patches/wlan-ap/0001-firmware-ipq-wifi-enable-use-on-IPQ806x.patch rename to patches/0009-firmware-ipq-wifi-enable-use-on-IPQ806x.patch index 155f78844..ab281cdae 100644 --- a/patches/wlan-ap/0001-firmware-ipq-wifi-enable-use-on-IPQ806x.patch +++ b/patches/0009-firmware-ipq-wifi-enable-use-on-IPQ806x.patch @@ -1,7 +1,7 @@ -From f46ac3c1bc7e84ba3f09d79c4ba1ddd49122d306 Mon Sep 17 00:00:00 2001 +From b313236c60633f7254ea2dbfa15c61b29be65e6e Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Mon, 18 May 2020 12:34:06 +0200 -Subject: [PATCH 1/7] firmware: ipq-wifi: enable use on IPQ806x +Subject: [PATCH 09/30] firmware: ipq-wifi: enable use on IPQ806x This enables the ipq-wifi package to be used on IPQ806x target. Its needed for boards using a different BDF than one shipped in the upstream board-2.bin. diff --git a/patches/wlan-ap/0002-ipq806x-4.14-enable-AT803X-driver.patch b/patches/0010-ipq806x-4.14-enable-AT803X-driver.patch similarity index 86% rename from patches/wlan-ap/0002-ipq806x-4.14-enable-AT803X-driver.patch rename to patches/0010-ipq806x-4.14-enable-AT803X-driver.patch index e6d3151bf..a27e69340 100644 --- a/patches/wlan-ap/0002-ipq806x-4.14-enable-AT803X-driver.patch +++ b/patches/0010-ipq806x-4.14-enable-AT803X-driver.patch @@ -1,7 +1,7 @@ -From cb0b442df7dd7b03bbda6344ecfe8799595e81db Mon Sep 17 00:00:00 2001 +From e06d369e38178c0b7a79fa18b732ea3a3942a795 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Mon, 18 May 2020 12:25:20 +0200 -Subject: [PATCH 2/7] ipq806x: 4.14: enable AT803X driver +Subject: [PATCH 10/30] ipq806x: 4.14: enable AT803X driver Its needed for Edgecore ECW5410 which does not use QCA8337 switch, but rather 2x AR8033 PHY-s directly connected to GMAC-s. diff --git a/patches/wlan-ap/0003-ipq806x-add-GSBI1-node-to-DTSI.patch b/patches/0011-ipq806x-add-GSBI1-node-to-DTSI.patch similarity index 94% rename from patches/wlan-ap/0003-ipq806x-add-GSBI1-node-to-DTSI.patch rename to patches/0011-ipq806x-add-GSBI1-node-to-DTSI.patch index ba8bff862..9c5cb91a0 100644 --- a/patches/wlan-ap/0003-ipq806x-add-GSBI1-node-to-DTSI.patch +++ b/patches/0011-ipq806x-add-GSBI1-node-to-DTSI.patch @@ -1,7 +1,7 @@ -From 18b22a37bf37e661824ff8fe9bf4d3ab9df2d940 Mon Sep 17 00:00:00 2001 +From 49d0de44770e393eac063083a8c925e8bbc91d6b Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Mon, 18 May 2020 12:28:37 +0200 -Subject: [PATCH 3/7] ipq806x: add GSBI1 node to DTSI +Subject: [PATCH 11/30] ipq806x: add GSBI1 node to DTSI IPQ806x series also has a GSBI1 with UART and I2C peripherals, so lets add the node for it. diff --git a/patches/wlan-ap/0004-ipq806x-import-bootargs-append-from-IPQ40xx.patch b/patches/0012-ipq806x-import-bootargs-append-from-IPQ40xx.patch similarity index 91% rename from patches/wlan-ap/0004-ipq806x-import-bootargs-append-from-IPQ40xx.patch rename to patches/0012-ipq806x-import-bootargs-append-from-IPQ40xx.patch index bcd378649..987c9b2a9 100644 --- a/patches/wlan-ap/0004-ipq806x-import-bootargs-append-from-IPQ40xx.patch +++ b/patches/0012-ipq806x-import-bootargs-append-from-IPQ40xx.patch @@ -1,7 +1,7 @@ -From a7dd83202c73e8dec2963d97d1a0580dcd4add7a Mon Sep 17 00:00:00 2001 +From c938f2d93c3140899e1b234a37a2219d680d86d3 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Mon, 18 May 2020 12:35:15 +0200 -Subject: [PATCH 4/7] ipq806x: import bootargs-append from IPQ40xx +Subject: [PATCH 12/30] ipq806x: import bootargs-append from IPQ40xx This imports the patch that adds bootargs-append support from IPQ40xx. diff --git a/patches/wlan-ap/0005-ipq806x-add-Edgecore-ECW5410-support.patch b/patches/0013-ipq806x-add-Edgecore-ECW5410-support.patch similarity index 99% rename from patches/wlan-ap/0005-ipq806x-add-Edgecore-ECW5410-support.patch rename to patches/0013-ipq806x-add-Edgecore-ECW5410-support.patch index 427070cf0..032309e4c 100644 --- a/patches/wlan-ap/0005-ipq806x-add-Edgecore-ECW5410-support.patch +++ b/patches/0013-ipq806x-add-Edgecore-ECW5410-support.patch @@ -1,7 +1,7 @@ -From 85b302d3f5423d54378a178602a8097dac50d9d0 Mon Sep 17 00:00:00 2001 +From 31942f1bbfa2b59a3bdf97882399b0cc49ec9794 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Mon, 18 May 2020 12:45:47 +0200 -Subject: [PATCH 5/7] ipq806x: add Edgecore ECW5410 support +Subject: [PATCH 13/30] ipq806x: add Edgecore ECW5410 support This patch adds support for the Edgecore ECW5410 indoor AP. diff --git a/patches/wlan-ap/0006-ipq40xx-add-Edgecore-ECW5211-support.patch b/patches/0014-ipq40xx-add-Edgecore-ECW5211-support.patch similarity index 99% rename from patches/wlan-ap/0006-ipq40xx-add-Edgecore-ECW5211-support.patch rename to patches/0014-ipq40xx-add-Edgecore-ECW5211-support.patch index 09d64f661..883a1da0f 100644 --- a/patches/wlan-ap/0006-ipq40xx-add-Edgecore-ECW5211-support.patch +++ b/patches/0014-ipq40xx-add-Edgecore-ECW5211-support.patch @@ -1,7 +1,7 @@ -From 7474a118ce2625df5ef8c3e3e1289a212f73fcd1 Mon Sep 17 00:00:00 2001 +From 55055b2b91fcde3da0c313d320254f30360e8d13 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Fri, 19 Jun 2020 14:01:58 +0200 -Subject: [PATCH 01/15] ipq40xx: add Edgecore ECW5211 support +Subject: [PATCH 14/30] ipq40xx: add Edgecore ECW5211 support This patch adds support for the Edgecore ECW5211 indoor AP. diff --git a/patches/wlan-ap/0007-ipq40xx-TP-Link-AP2220-support.patch b/patches/0015-ipq40xx-TP-Link-AP2220-support.patch similarity index 99% rename from patches/wlan-ap/0007-ipq40xx-TP-Link-AP2220-support.patch rename to patches/0015-ipq40xx-TP-Link-AP2220-support.patch index 808b0ced0..e99452269 100644 --- a/patches/wlan-ap/0007-ipq40xx-TP-Link-AP2220-support.patch +++ b/patches/0015-ipq40xx-TP-Link-AP2220-support.patch @@ -1,7 +1,7 @@ -From 7352a63c754c84a294eda639f391609deefaf87d Mon Sep 17 00:00:00 2001 +From 20f3f7e0ffd292cf91bfc5a41b58316ba9486063 Mon Sep 17 00:00:00 2001 From: Arif Alam Date: Fri, 19 Jun 2020 14:02:32 +0200 -Subject: [PATCH 7/7] ipq40xx: TP-Link AP2220 support +Subject: [PATCH 15/30] ipq40xx: TP-Link AP2220 support Signed-off-by: Arif Alam --- @@ -454,7 +454,7 @@ index 0000000000..fc35bcacbd +}; + diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile -index 921d412382..b54a287377 100644 +index 553ac66fa3..10ba4dcbab 100644 --- a/target/linux/ipq40xx/image/Makefile +++ b/target/linux/ipq40xx/image/Makefile @@ -399,6 +399,19 @@ define Device/qxwlan_e2600ac-c2 diff --git a/patches/wlan-ap/0008-include-prereq-build.mk-add-ovsdb-tool-dependency.patch b/patches/0016-include-prereq-build.mk-add-ovsdb-tool-dependency.patch similarity index 88% rename from patches/wlan-ap/0008-include-prereq-build.mk-add-ovsdb-tool-dependency.patch rename to patches/0016-include-prereq-build.mk-add-ovsdb-tool-dependency.patch index 14a2d3674..4562cbf4b 100644 --- a/patches/wlan-ap/0008-include-prereq-build.mk-add-ovsdb-tool-dependency.patch +++ b/patches/0016-include-prereq-build.mk-add-ovsdb-tool-dependency.patch @@ -1,7 +1,7 @@ -From 678ee2539ee25894b7f44cb971e121ab07e5e9d9 Mon Sep 17 00:00:00 2001 +From 2ed4f05265c404ea67a0b7719e9a0c8245558072 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 25 Jun 2020 09:03:16 +0200 -Subject: [PATCH] include/prereq-build.mk: add ovsdb-tool dependency +Subject: [PATCH 16/30] include/prereq-build.mk: add ovsdb-tool dependency OpenSync requires a host installation of ovsdb-tool. Add this to the required commands. diff --git a/patches/wlan-ap/0010-ipq40xx-TP-Link-EC420-support.patch b/patches/0017-ipq40xx-TP-Link-EC420-support.patch similarity index 98% rename from patches/wlan-ap/0010-ipq40xx-TP-Link-EC420-support.patch rename to patches/0017-ipq40xx-TP-Link-EC420-support.patch index e9933055a..b3df0ffa4 100644 --- a/patches/wlan-ap/0010-ipq40xx-TP-Link-EC420-support.patch +++ b/patches/0017-ipq40xx-TP-Link-EC420-support.patch @@ -1,7 +1,7 @@ -From 8628ab40838711ba4d2421b851a4d14ac36b7882 Mon Sep 17 00:00:00 2001 +From f161ec6c232d7abb5379712440bee715a39b57fa Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 22 Jul 2020 14:29:55 +0200 -Subject: [PATCH] ipq40xx: TP-Link EC420 support +Subject: [PATCH 17/30] ipq40xx: TP-Link EC420 support Signed-off-by: John Crispin --- @@ -372,7 +372,7 @@ index 0000000000..e2062e7cd0 +}; + diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile -index b54a287377..bf682f7b88 100644 +index 10ba4dcbab..5426acad5a 100644 --- a/target/linux/ipq40xx/image/Makefile +++ b/target/linux/ipq40xx/image/Makefile @@ -412,6 +412,20 @@ define Device/tp-link_ap2220 diff --git a/patches/wlan-ap/0011-firewall-tune-lan-wan-into-named-sections.patch b/patches/0018-firewall-tune-lan-wan-into-named-sections.patch similarity index 89% rename from patches/wlan-ap/0011-firewall-tune-lan-wan-into-named-sections.patch rename to patches/0018-firewall-tune-lan-wan-into-named-sections.patch index 00484e551..0366b42e3 100644 --- a/patches/wlan-ap/0011-firewall-tune-lan-wan-into-named-sections.patch +++ b/patches/0018-firewall-tune-lan-wan-into-named-sections.patch @@ -1,7 +1,7 @@ -From b2a8579835620729aeec8affe1f763d55a05c27f Mon Sep 17 00:00:00 2001 +From 7167a7364150eeffb7c125f6df82d4e5d4328bb8 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sun, 26 Jul 2020 19:16:21 +0200 -Subject: [PATCH] firewall: tune lan/wan into named sections +Subject: [PATCH 18/30] firewall: tune lan/wan into named sections We want to reference these from within OpenSync. They need to be named for this to work. diff --git a/patches/wlan-ap/0012-uhttp-adds-the-deployed-option.patch b/patches/0019-uhttp-adds-the-deployed-option.patch similarity index 87% rename from patches/wlan-ap/0012-uhttp-adds-the-deployed-option.patch rename to patches/0019-uhttp-adds-the-deployed-option.patch index 1ed966ee9..7ea967aa3 100644 --- a/patches/wlan-ap/0012-uhttp-adds-the-deployed-option.patch +++ b/patches/0019-uhttp-adds-the-deployed-option.patch @@ -1,7 +1,7 @@ -From c59c6aa6209dc52d2b3fbf39cd21b2c57b42820a Mon Sep 17 00:00:00 2001 +From a5852761c39b2a00337984ad49bfdb7beeb15f75 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 29 Jul 2020 14:11:39 +0200 -Subject: [PATCH] uhttp: adds the deployed option +Subject: [PATCH 19/30] uhttp: adds the deployed option This allows us to make sure the webui is not automatically started if the unit is already deployed. diff --git a/patches/wlan-ap/0013-base-files-set-default-password-to-openwifi.patch b/patches/0020-base-files-set-default-password-to-openwifi.patch similarity index 93% rename from patches/wlan-ap/0013-base-files-set-default-password-to-openwifi.patch rename to patches/0020-base-files-set-default-password-to-openwifi.patch index f24badfe4..2d8fdfa1f 100644 --- a/patches/wlan-ap/0013-base-files-set-default-password-to-openwifi.patch +++ b/patches/0020-base-files-set-default-password-to-openwifi.patch @@ -1,7 +1,7 @@ -From 120e48887d584e43a68ac88af253fdf51bf6b389 Mon Sep 17 00:00:00 2001 +From 5afdd3055134c6eacf73747238939a916021d670 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 30 Jul 2020 16:51:04 +0200 -Subject: [PATCH 17/27] base-files: set default password to "openwifi" +Subject: [PATCH 20/30] base-files: set default password to "openwifi" Signed-off-by: John Crispin --- diff --git a/patches/wlan-ap/0014-base-files-update-banner.patch b/patches/0021-base-files-update-banner.patch similarity index 91% rename from patches/wlan-ap/0014-base-files-update-banner.patch rename to patches/0021-base-files-update-banner.patch index 5d1576595..b56e790e9 100644 --- a/patches/wlan-ap/0014-base-files-update-banner.patch +++ b/patches/0021-base-files-update-banner.patch @@ -1,7 +1,7 @@ -From 94ac86cf69c3ad3476f8fd6c3bf44c689b3434a6 Mon Sep 17 00:00:00 2001 +From 86e40767ba7b74a789d3f52f5d44ecf01f3d2ee5 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 31 Jul 2020 17:15:13 +0200 -Subject: [PATCH] base-files: update banner +Subject: [PATCH 21/30] base-files: update banner Use OpenWiFi for the banner. diff --git a/patches/wlan-ap/0015-ipq40xx-add-Edgecore-OAP-100-support.patch b/patches/0022-ipq40xx-add-Edgecore-OAP-100-support.patch similarity index 99% rename from patches/wlan-ap/0015-ipq40xx-add-Edgecore-OAP-100-support.patch rename to patches/0022-ipq40xx-add-Edgecore-OAP-100-support.patch index e5598b4d0..672cd3c38 100644 --- a/patches/wlan-ap/0015-ipq40xx-add-Edgecore-OAP-100-support.patch +++ b/patches/0022-ipq40xx-add-Edgecore-OAP-100-support.patch @@ -1,7 +1,7 @@ -From 465f910db94eab787682b175a0503eccfc549eef Mon Sep 17 00:00:00 2001 +From 084ac550e9a44ebea2b19b4f9fb98617ffcdfde7 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 8 Aug 2020 09:58:02 +0200 -Subject: [PATCH 01/12] ipq40xx: add Edgecore OAP-100 support +Subject: [PATCH 22/30] ipq40xx: add Edgecore OAP-100 support flashing the unit * first update to latest edcore FW as per the PDF instructions diff --git a/patches/wlan-ap/0016-base-files-add-the-wlan-ap-repo-hash.patch b/patches/0023-base-files-add-the-wlan-ap-repo-hash.patch similarity index 95% rename from patches/wlan-ap/0016-base-files-add-the-wlan-ap-repo-hash.patch rename to patches/0023-base-files-add-the-wlan-ap-repo-hash.patch index 304a5d341..bf9f127fb 100644 --- a/patches/wlan-ap/0016-base-files-add-the-wlan-ap-repo-hash.patch +++ b/patches/0023-base-files-add-the-wlan-ap-repo-hash.patch @@ -1,7 +1,7 @@ -From 5f64754dbf9fdb80ea3833bc7cbcfc7184087f30 Mon Sep 17 00:00:00 2001 +From 548f1e06f05fcd4e469de9e0e6a79870a25b9551 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 29 Aug 2020 08:25:41 +0200 -Subject: [PATCH] base-files: add the wlan-ap repo hash +Subject: [PATCH 23/30] base-files: add the wlan-ap repo hash currently the banner will show the revision of the build tree. This patch adds the hash of the wlan-ap tree. diff --git a/patches/wlan-ap/0017-ec420-fix-generation-of-br-lan.patch b/patches/0024-ec420-fix-generation-of-br-lan.patch similarity index 91% rename from patches/wlan-ap/0017-ec420-fix-generation-of-br-lan.patch rename to patches/0024-ec420-fix-generation-of-br-lan.patch index 92f5842bc..08b4cbc82 100644 --- a/patches/wlan-ap/0017-ec420-fix-generation-of-br-lan.patch +++ b/patches/0024-ec420-fix-generation-of-br-lan.patch @@ -1,7 +1,7 @@ -From b8752df31deb81f0b127a70ada8e4708f36ee776 Mon Sep 17 00:00:00 2001 +From 083b8e7b16469b52e125f7d0c3ef2ae1cf20291a Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 17 Sep 2020 08:12:23 +0200 -Subject: [PATCH] ec420: fix generation of br-lan +Subject: [PATCH 24/30] ec420: fix generation of br-lan OpenWrt does not allow bridges with no default interfaces. diff --git a/patches/ipq807x/0001-ipq807x-buildsystem-patches-required-by-the-target.patch b/patches/0025-ipq807x-buildsystem-patches-required-by-the-target.patch similarity index 99% rename from patches/ipq807x/0001-ipq807x-buildsystem-patches-required-by-the-target.patch rename to patches/0025-ipq807x-buildsystem-patches-required-by-the-target.patch index c8ef85f69..f281e4b98 100644 --- a/patches/ipq807x/0001-ipq807x-buildsystem-patches-required-by-the-target.patch +++ b/patches/0025-ipq807x-buildsystem-patches-required-by-the-target.patch @@ -1,7 +1,7 @@ -From 03dadc1c68d71695c205abeb5b08eeeb469e0cea Mon Sep 17 00:00:00 2001 +From 0e9c938a22ec353883223dcca730f054c1317172 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 20 Jun 2020 16:28:50 +0200 -Subject: [PATCH 1/5] ipq807x: buildsystem patches required by the target +Subject: [PATCH 25/30] ipq807x: buildsystem patches required by the target The target uses the v4.4 kernel and requires these patches to build properly. diff --git a/patches/ipq807x/0002-base-files-make-sysupgrade-work-on-qcom-AX.patch b/patches/0026-base-files-make-sysupgrade-work-on-qcom-AX.patch similarity index 98% rename from patches/ipq807x/0002-base-files-make-sysupgrade-work-on-qcom-AX.patch rename to patches/0026-base-files-make-sysupgrade-work-on-qcom-AX.patch index c4316bb36..31cb9790a 100644 --- a/patches/ipq807x/0002-base-files-make-sysupgrade-work-on-qcom-AX.patch +++ b/patches/0026-base-files-make-sysupgrade-work-on-qcom-AX.patch @@ -1,7 +1,7 @@ -From 5f41657d01a87330e2cec313bec0373255c7357c Mon Sep 17 00:00:00 2001 +From ff121a96dd79eb4a6a9139d9ae012803f50321ae Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 22 Jun 2020 14:32:45 +0200 -Subject: [PATCH 2/5] base-files: make sysupgrade work on qcom AX +Subject: [PATCH 26/30] base-files: make sysupgrade work on qcom AX The qsdk v4.4 ubi layer does not detach the rootfs properly during sysupgrade. Pull in the ubu force detach patch from owrt-15.05. diff --git a/patches/ipq807x/0003-ipq807x-add-the-Qualcomm-AX-target-support.patch b/patches/0027-ipq807x-add-the-Qualcomm-AX-target-support.patch similarity index 99% rename from patches/ipq807x/0003-ipq807x-add-the-Qualcomm-AX-target-support.patch rename to patches/0027-ipq807x-add-the-Qualcomm-AX-target-support.patch index a1e525e8e..ca0315409 100644 --- a/patches/ipq807x/0003-ipq807x-add-the-Qualcomm-AX-target-support.patch +++ b/patches/0027-ipq807x-add-the-Qualcomm-AX-target-support.patch @@ -1,18 +1,12 @@ -From b64f56533cab6da0d7dfb04402742ec79708362c Mon Sep 17 00:00:00 2001 +From 1312c6a2fe06916dd41b6f0a7a3e2163df0d6002 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 18 Jul 2020 08:53:44 +0200 -Subject: [PATCH 1/5] ipq807x: add the Qualcomm AX target support +Subject: [PATCH 27/30] ipq807x: add the Qualcomm AX target support Signed-off-by: John Crispin --- include/kernel-version.mk | 2 +- package/boot/uboot-envtools/files/ipq807x | 37 + - profiles/cypress.yml | 12 + - profiles/hawkeye.yml | 12 + - profiles/wallaby.yml | 12 + - profiles/wf188.yml | 10 + - profiles/wf188n.yml | 10 + - profiles/wifi-ax.yml | 5 + target/linux/ipq807x/Makefile | 21 + .../ipq807x/base-files/etc/board.d/02_network | 47 + .../etc/hotplug.d/firmware/10-ath11k-caldata | 64 ++ @@ -33,14 +27,8 @@ Signed-off-by: John Crispin .../linux/ipq807x/patches/101-squashfs.patch | 16 + .../linux/ipq807x/patches/102-cig-wf188.patch | 866 ++++++++++++++++ .../ipq807x/patches/103-sercomm-wallaby.patch | 816 +++++++++++++++ - 28 files changed, 4359 insertions(+), 1 deletion(-) + 22 files changed, 4298 insertions(+), 1 deletion(-) create mode 100644 package/boot/uboot-envtools/files/ipq807x - create mode 100644 profiles/cypress.yml - create mode 100644 profiles/hawkeye.yml - create mode 100644 profiles/wallaby.yml - create mode 100644 profiles/wf188.yml - create mode 100644 profiles/wf188n.yml - create mode 100644 profiles/wifi-ax.yml create mode 100644 target/linux/ipq807x/Makefile create mode 100755 target/linux/ipq807x/base-files/etc/board.d/02_network create mode 100755 target/linux/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata diff --git a/patches/ipq807x/0004-scripts-ubinize-image.sh-allow-setting-the-rootfs-na.patch b/patches/0028-scripts-ubinize-image.sh-allow-setting-the-rootfs-na.patch similarity index 91% rename from patches/ipq807x/0004-scripts-ubinize-image.sh-allow-setting-the-rootfs-na.patch rename to patches/0028-scripts-ubinize-image.sh-allow-setting-the-rootfs-na.patch index 2074842bb..9c31e1ccb 100644 --- a/patches/ipq807x/0004-scripts-ubinize-image.sh-allow-setting-the-rootfs-na.patch +++ b/patches/0028-scripts-ubinize-image.sh-allow-setting-the-rootfs-na.patch @@ -1,7 +1,7 @@ -From e465150dd238758e3934f4ba161a9c8ef22351d7 Mon Sep 17 00:00:00 2001 +From 4f0a934de0ba78e5c35afb0f34a1dbbc65b45098 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sun, 9 Aug 2020 20:58:52 +0200 -Subject: [PATCH 4/5] scripts/ubinize-image.sh: allow setting the rootfs name +Subject: [PATCH 28/30] scripts/ubinize-image.sh: allow setting the rootfs name This patch allows us to use a different rootfs name. Some QCA boards will require the in ubi rfs to be called ubi_rootfs. diff --git a/patches/ipq807x/0005-busybox-enable-the-watchdog-tool.patch b/patches/0029-busybox-enable-the-watchdog-tool.patch similarity index 86% rename from patches/ipq807x/0005-busybox-enable-the-watchdog-tool.patch rename to patches/0029-busybox-enable-the-watchdog-tool.patch index 855c04bbf..3e41b429c 100644 --- a/patches/ipq807x/0005-busybox-enable-the-watchdog-tool.patch +++ b/patches/0029-busybox-enable-the-watchdog-tool.patch @@ -1,7 +1,7 @@ -From d2ed8c11dbb8921638de0c8d707513cf07533ae3 Mon Sep 17 00:00:00 2001 +From 70bfec02a965a55c9f508d1bb1e228dedc2a91ae Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 28 Jul 2020 09:21:04 +0200 -Subject: [PATCH 5/5] busybox: enable the watchdog tool +Subject: [PATCH 29/30] busybox: enable the watchdog tool procd can currently only handle the main wdt. Enable the busybox applet until procd can handle multiple devices. diff --git a/patches/ipq807x/0007-linux-modules-fix-some-v4.4-dependencies.patch b/patches/0030-linux-modules-fix-some-v4.4-dependencies.patch similarity index 91% rename from patches/ipq807x/0007-linux-modules-fix-some-v4.4-dependencies.patch rename to patches/0030-linux-modules-fix-some-v4.4-dependencies.patch index 07251c048..dd873af8c 100644 --- a/patches/ipq807x/0007-linux-modules-fix-some-v4.4-dependencies.patch +++ b/patches/0030-linux-modules-fix-some-v4.4-dependencies.patch @@ -1,7 +1,7 @@ -From 9413505791a16540d204aa63569b84674120e49f Mon Sep 17 00:00:00 2001 +From 8fa6b7b34d29d1e846e7da08e99d38dc1c4ba080 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sun, 30 Aug 2020 09:20:03 +0200 -Subject: [PATCH 7/7] linux/modules: fix some v4.4 dependencies +Subject: [PATCH 30/30] linux/modules: fix some v4.4 dependencies NFT has different deps on v4.4. diff --git a/setup.py b/setup.py index a5fe4ffdf..f05f61b47 100644 --- a/setup.py +++ b/setup.py @@ -114,9 +114,28 @@ def setup_tree(): finally: os.chdir(base_dir) +def update_patches(): + try: + print("### Updating patches") + run( + ["rm", "-r", "patches"], check=True, + ) + os.chdir(openwrt) + run( + ["git", "format-patch", config.get("revision", config["branch"]), "-o", "../patches"], + check=True, + ) + print("### Updating done") + except: + print("### updating failed failed") + sys.exit(1) + finally: + os.chdir(base_dir) + base_dir = Path.cwd().absolute() setup = False +update = False genkey = True rebase = False config = "config.yml" @@ -124,7 +143,7 @@ openwrt = "openwrt" git_ref = "" try: - opts, args = getopt.getopt(sys.argv[1:], "srdc:f:", ["setup", "rebase", "docker", "config=", "folder=", "reference="]) + opts, args = getopt.getopt(sys.argv[1:], "srdc:f:u", ["setup", "rebase", "docker", "config=", "folder=", "reference=", "update"]) except getopt.GetoptError as err: print(err) sys.exit(2) @@ -135,6 +154,8 @@ for o, a in opts: setup = True elif o in ("-r", "--rebase"): rebase = True + elif o in ("-u", "--update"): + update = True elif o in ("-c", "--config"): config = a elif o in ("--reference"): @@ -160,3 +181,5 @@ elif rebase: fetch_tree() reset_tree() setup_tree() +elif update: + update_patches()