patches: refresh upon Gluon v2022.1.4

modify refresh_changes.sh as well in order to use the tag instead of master (cherry picked from commit 265cee4)
freifunkh · May 10, 2023 · 0669244 · 0669244
1 parent 150f503
commit 0669244
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 18 deletions.
diff --git a/.github/workflows/gluon-check-patches.yml b/.github/workflows/gluon-check-patches.yml
@@ -24,6 +24,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: freifunk-gluon/gluon
+          ref: v2022.1.4
 
       - name: Clone site repo
         uses: actions/checkout@v3

diff --git a/patches/0001-batman-adv-fix-when-vlan-crc-0x00000000.patch b/patches/0001-batman-adv-fix-when-vlan-crc-0x00000000.patch
@@ -2,11 +2,11 @@ From: lemoer <git@irrelefant.net>
 Date: Mon, 23 Apr 2018 02:55:52 +0200
 Subject: batman-adv: fix when vlan crc == 0x00000000
 
-diff --git a/patches/packages/routing/0005-batman-adv-add-patch.patch b/patches/packages/routing/0005-batman-adv-add-patch.patch
+diff --git a/patches/packages/routing/0004-batman-adv-add-patch.patch b/patches/packages/routing/0004-batman-adv-add-patch.patch
 new file mode 100644
 index 0000000000000000000000000000000000000000..7d92a1c2ca4a3fb0daed6b42482c1860b7de1733
 --- /dev/null
-+++ b/patches/packages/routing/0005-batman-adv-add-patch.patch
++++ b/patches/packages/routing/0004-batman-adv-add-patch.patch
 @@ -0,0 +1,41 @@
 +From: lemoer <git@irrelefant.net>
 +Date: Mon, 23 Apr 2018 02:53:20 +0200

diff --git a/patches/0003-patches-openwrt-add-TL-WR841ND-N-8M-and-16M-variants-to-ath79.patch b/patches/0003-patches-openwrt-add-TL-WR841ND-N-8M-and-16M-variants-to-ath79.patch
@@ -2,11 +2,11 @@ From: Dark4MD <github.web@manu.li>
 Date: Thu, 5 May 2022 18:04:46 +0200
 Subject: patches/openwrt: add TL-WR841ND/N 8M and 16M variants to ath79
 
-diff --git a/patches/openwrt/0013-add-TL-WR841ND-N-8M-and-16M-variants-to-ath79.patch b/patches/openwrt/0013-add-TL-WR841ND-N-8M-and-16M-variants-to-ath79.patch
+diff --git a/patches/openwrt/0009-add-TL-WR841ND-N-8M-and-16M-variants-to-ath79.patch b/patches/openwrt/0009-add-TL-WR841ND-N-8M-and-16M-variants-to-ath79.patch
 new file mode 100644
 index 0000000000000000000000000000000000000000..826663d8204cad17ef8a266f3bf6e2851c3b48bb
 --- /dev/null
-+++ b/patches/openwrt/0013-add-TL-WR841ND-N-8M-and-16M-variants-to-ath79.patch
++++ b/patches/openwrt/0009-add-TL-WR841ND-N-8M-and-16M-variants-to-ath79.patch
 @@ -0,0 +1,809 @@
 +From: Dark4MD <github.web@manu.li>
 +Date: Thu, 5 May 2022 17:45:14 +0200
@@ -818,10 +818,10 @@ index 0000000000000000000000000000000000000000..826663d8204cad17ef8a266f3bf6e285
 +   $(Device/tplink-8m)
 +   SOC := ar7241
 diff --git a/targets/ath79-generic b/targets/ath79-generic
-index dc8849469004b1c66974f48c35c218ed17f1027a..da1742d02be64d5b33c7a408dd780e676a973588 100644
+index 2162caee33f4ecaddb163b2698a07dc12c6f0a43..24a831813dd09f3fe8f7a1b2fb0c60811685a59f 100644
 --- a/targets/ath79-generic
 +++ b/targets/ath79-generic
-@@ -497,6 +497,70 @@ device('tp-link-tl-wdr4300-v1', 'tplink_tl-wdr4300-v1')
+@@ -468,6 +468,70 @@ device('tp-link-tl-wdr4300-v1', 'tplink_tl-wdr4300-v1')
 
  device('tp-link-tl-wr810n-v1', 'tplink_tl-wr810n-v1')
 

diff --git a/patches/0005-ath79-generic-add-support-for-TP-Link-EAP-225-Outdoor-v3.patch b/patches/0005-ath79-generic-add-support-for-TP-Link-EAP-225-Outdoor-v3.patch
@@ -6,20 +6,22 @@ Subject: ath79-generic: add support for TP-Link EAP-225 Outdoor v3
   (needs newer version of tplink-safeloader)
 - fix 5g wifi caldata (don't use nvmem-cells)
 
+(cherry picked from commit 77e4e11993de20311f29797464123c74f1c3e05b)
+
 diff --git a/docs/user/supported_devices.rst b/docs/user/supported_devices.rst
-index 6838cd360e7be33b1af4038755609c0593563438..b6c931ea6a16cf99f4123dd3ad8e4466bb34ed61 100644
+index dbcc2d55b9aba8f0024f35beab929f6ab30daa61..bb0936376e116dd06fb4be45caeb3dedb465d1ae 100644
 --- a/docs/user/supported_devices.rst
 +++ b/docs/user/supported_devices.rst
-@@ -115,6 +115,7 @@ ath79-generic
-   - CPE510 (v1.0, v1.1, v2.0, v3.0)
+@@ -113,6 +113,7 @@ ath79-generic
+   - CPE510 (v3.0)
    - CPE710 (v1.0)
    - EAP225-Outdoor (v1)
 +  - EAP225-Outdoor (v3)
    - RE450 (v1)
    - TL-WDR3500 (v1)
    - TL-WDR3600 (v1)
 diff --git a/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua b/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua
-index 6debe8c5dd3e6ea7c4da7f76fe163f8a2cc0400f..6f5c217448f224a14ba065b97a0148a70aad6888 100644
+index b9b90789ed1e256c1fabcdc133d12064aa03377c..430dbcfe9a78bcd1a81a91f5d42d76d6d0950d49 100644
 --- a/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua
 +++ b/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua
 @@ -37,6 +37,7 @@ function M.is_outdoor_device()
@@ -30,11 +32,11 @@ index 6debe8c5dd3e6ea7c4da7f76fe163f8a2cc0400f..6f5c217448f224a14ba065b97a0148a7
  		'tplink,wbs210-v1',
  		'tplink,wbs210-v2',
  		'tplink,wbs510-v1',
-diff --git a/patches/openwrt/0014-ath79-support-for-TP-Link-EAP225-Outdoor-v3.patch b/patches/openwrt/0014-ath79-support-for-TP-Link-EAP225-Outdoor-v3.patch
+diff --git a/patches/openwrt/0010-ath79-support-for-TP-Link-EAP225-Outdoor-v3.patch b/patches/openwrt/0010-ath79-support-for-TP-Link-EAP225-Outdoor-v3.patch
 new file mode 100644
 index 0000000000000000000000000000000000000000..20b8377f985fc03217a073ab6e0d2e86181b2ade
 --- /dev/null
-+++ b/patches/openwrt/0014-ath79-support-for-TP-Link-EAP225-Outdoor-v3.patch
++++ b/patches/openwrt/0010-ath79-support-for-TP-Link-EAP225-Outdoor-v3.patch
 @@ -0,0 +1,150 @@
 +From: Paul Maruhn <paulmaruhn@posteo.de>
 +Date: Tue, 22 Mar 2022 21:06:42 +0100
@@ -186,11 +188,11 @@ index 0000000000000000000000000000000000000000..20b8377f985fc03217a073ab6e0d2e86
 + define Device/tplink_eap225-v1
 +   $(Device/tplink-eap2x5)
 +   SOC := qca9563
-diff --git a/patches/openwrt/0015-ath79-fix-5g-wifi-for-eap225-outdoor-v3-backport.patch b/patches/openwrt/0015-ath79-fix-5g-wifi-for-eap225-outdoor-v3-backport.patch
+diff --git a/patches/openwrt/0011-ath79-fix-5g-wifi-for-eap225-outdoor-v3-backport.patch b/patches/openwrt/0011-ath79-fix-5g-wifi-for-eap225-outdoor-v3-backport.patch
 new file mode 100644
 index 0000000000000000000000000000000000000000..f6493919ff60263a559456b03f97191b47f92420
 --- /dev/null
-+++ b/patches/openwrt/0015-ath79-fix-5g-wifi-for-eap225-outdoor-v3-backport.patch
++++ b/patches/openwrt/0011-ath79-fix-5g-wifi-for-eap225-outdoor-v3-backport.patch
 @@ -0,0 +1,16 @@
 +From: Sebastian Schaper <openwrt@sebastianschaper.net>
 +Date: Thu, 9 Mar 2023 23:24:33 +0100
@@ -209,10 +211,10 @@ index 0000000000000000000000000000000000000000..f6493919ff60263a559456b03f97191b
 + 	tplink,eap225-wall-v2)
 + 		caldata_extract "art" 0x5000 0x2f20
 diff --git a/targets/ath79-generic b/targets/ath79-generic
-index da1742d02be64d5b33c7a408dd780e676a973588..76f36a46f774d33c6161fa66f86a4f698692b598 100644
+index 24a831813dd09f3fe8f7a1b2fb0c60811685a59f..5f92b6ca990d20aad44da89ff3847f5b672e8db1 100644
 --- a/targets/ath79-generic
 +++ b/targets/ath79-generic
-@@ -474,6 +474,11 @@ device('tp-link-eap225-outdoor-v1', 'tplink_eap225-outdoor-v1', {
+@@ -445,6 +445,11 @@ device('tp-link-eap225-outdoor-v1', 'tplink_eap225-outdoor-v1', {
  	packages = ATH10K_PACKAGES_QCA9888,
  })
 

diff --git a/refresh_ffh_patches.sh b/refresh_ffh_patches.sh
@@ -9,10 +9,12 @@ mkdir -p "$PATCHDIR"
 trap 'rm -rf "$PATCHDIR"' EXIT
 
 # clone gluon
-git clone --depth 1 --single-branch https://github.com/freifunk-gluon/gluon.git $PATCHDIR
+git clone https://github.com/freifunk-gluon/gluon.git $PATCHDIR
 
 cd $PATCHDIR
 
+git checkout v2022.1.4
+
 # apply all site patches
 for patch in "../patches"/*.patch; do
 	git -c user.name='Freifunkh Patch Manager' -c user.email='freifunkh@void.example.com' -c commit.gpgsign=false am --whitespace=nowarn --committer-date-is-author-date "$patch"
@@ -22,7 +24,7 @@ git checkout -B patched >/dev/null
 
 # recreate site patches from just created commits
 n=0
-for commit in $(git rev-list --reverse --no-merges origin/HEAD..patched); do
+for commit in $(git rev-list --reverse --no-merges v2022.1.4..patched); do
 	(( ++n ))
 	echo "Updating: $(git log --format=%s -n 1 "$commit")"
 	git -c core.abbrev=40 show --pretty=format:'From: %an <%ae>%nDate: %aD%nSubject: %B' --no-renames --binary "$commit" > "../patches/$(printf '%04u' "$n")-$(git show -s --pretty=format:%f "$commit").patch"