From b5b0557f13050d89e67baab1d13785982b43f5f3 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 7 Dec 2020 15:04:58 +0100 Subject: [PATCH] OpenWrt: bump to 19.07.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump main repo, packages and routing repos. Refresh patches, drop upstreamed ones. Relevant highlights (v19.07.4 -> v19.07.5): - fix WAN disconnect issues on ath79 - fix 2.4 GHz MAC address for Unifi AC devices - use correct firmware for Unifi AP Relevant highlights (v19.07.3 -> v19.07.4): - add wpad-basic-wolfssl package - add support for CPE210 v3.2 - vxlan UDP checksum fix - squashfs: Fix compile with GCC 10 Signed-off-by: Adrian Schmutzler Reviewed-by: Fabian Bläse --- ...004-squashfs-Fix-compile-with-GCC-10.patch | 47 ------------------- ...r-expand-support-list-for-TP-Link-CP.patch | 37 --------------- .../0011-vxlan-fix-udp-checksum-control.patch | 27 ----------- ...vxlan-bump-and-change-to-PKG_RELEASE.patch | 29 ------------ ...0013-vxlan-remove-mandatory-peeraddr.patch | 1 + ...-capability-for-multiple-fdb-entries.patch | 1 + buildscript | 6 +-- 7 files changed, 5 insertions(+), 143 deletions(-) delete mode 100644 build_patches/openwrt/0004-squashfs-Fix-compile-with-GCC-10.patch delete mode 100644 build_patches/openwrt/0005-tplink-safeloader-expand-support-list-for-TP-Link-CP.patch delete mode 100644 build_patches/openwrt/0011-vxlan-fix-udp-checksum-control.patch delete mode 100644 build_patches/openwrt/0012-vxlan-bump-and-change-to-PKG_RELEASE.patch diff --git a/build_patches/openwrt/0004-squashfs-Fix-compile-with-GCC-10.patch b/build_patches/openwrt/0004-squashfs-Fix-compile-with-GCC-10.patch deleted file mode 100644 index f3d5966..0000000 --- a/build_patches/openwrt/0004-squashfs-Fix-compile-with-GCC-10.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 1bbc1aa884902fd05cc579b53d68b2ba0b18683f Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens -Date: Sun, 24 May 2020 12:23:31 +0200 -Subject: [PATCH] squashfs: Fix compile with GCC 10 - -Fixes the following build error with GCC 10: - /usr/bin/ld: read_fs.o:(.bss+0x0): multiple definition of `swap'; mksquashfs.o:(.bss+0x1b2a88): first defined here -And a compile warning. - -Fixes: FS#3104, FS#3119 -Signed-off-by: Hauke Mehrtens ---- - tools/squashfs/patches/140-gcc-10-fix.patch | 25 +++++++++++++++++++++ - 1 file changed, 25 insertions(+) - create mode 100644 tools/squashfs/patches/140-gcc-10-fix.patch - -diff --git a/tools/squashfs/patches/140-gcc-10-fix.patch b/tools/squashfs/patches/140-gcc-10-fix.patch -new file mode 100644 -index 00000000000..a02641f3072 ---- /dev/null -+++ b/tools/squashfs/patches/140-gcc-10-fix.patch -@@ -0,0 +1,25 @@ -+Fixes the following build error with GCC 10: -+ /usr/bin/ld: read_fs.o:(.bss+0x0): multiple definition of `swap'; mksquashfs.o:(.bss+0x1b2a88): first defined here -+And a compile warning. -+ -+--- a/squashfs-tools/read_fs.c -++++ b/squashfs-tools/read_fs.c -+@@ -61,7 +61,7 @@ extern int add_file(long long, long long -+ fprintf(stderr, s, ## args); \ -+ } while(0) -+ -+-int swap; -++static int swap; -+ -+ int read_block(int fd, long long start, long long *next, unsigned char *block, squashfs_super_block *sBlk) -+ { -+--- a/squashfs-tools/mksquashfs.c -++++ b/squashfs-tools/mksquashfs.c -+@@ -258,6 +258,7 @@ int read_sort_file(char *filename, int s -+ void sort_files_and_write(struct dir_info *dir); -+ struct file_info *duplicate(char *(get_next_file_block)(struct duplicate_buffer_handle *, unsigned int), struct duplicate_buffer_handle *file_start, long long bytes, unsigned int **block_list, long long *start, int blocks, struct fragment **fragment, char *frag_data, int frag_bytes); -+ struct dir_info *dir_scan1(char *, int (_readdir)(char *, char *, struct dir_info *)); -++int dir_scan2(squashfs_inode *inode, struct dir_info *dir_info); -+ -+ #define MKINODE(A) ((squashfs_inode)(((squashfs_inode) inode_bytes << 16) + (((char *)A) - data_cache))) -+ diff --git a/build_patches/openwrt/0005-tplink-safeloader-expand-support-list-for-TP-Link-CP.patch b/build_patches/openwrt/0005-tplink-safeloader-expand-support-list-for-TP-Link-CP.patch deleted file mode 100644 index b6c14b1..0000000 --- a/build_patches/openwrt/0005-tplink-safeloader-expand-support-list-for-TP-Link-CP.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Adrian Schmutzler -Date: Wed, 8 Jul 2020 11:08:17 +0200 -Subject: tplink-safeloader: expand support list for TP-Link CPE210 v3 - -This adds new strings to the support list for the TP-Link CPE210 v3 -that are supposed to work with the existing setup. - -Without it, the factory image won't be accepted by the vendor UI on -these newer revisions. - -Tested on a CPE210 v3.20 (EU). - -Ref: https://forum.openwrt.org/t/build-for-cpe210-v3-20/68000 - -Signed-off-by: Adrian Schmutzler - -diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c -index b6ad5c0869d3ce0f15e456b0a20e9c8f939de3ab..08e21e74e370631d38902d5fb77d52640c68ae2a 100644 ---- a/tools/firmware-utils/src/tplink-safeloader.c -+++ b/tools/firmware-utils/src/tplink-safeloader.c -@@ -204,8 +204,15 @@ static struct device_info boards[] = { - "SupportList:\r\n" - "CPE210(TP-LINK|EU|N300-2|45550000):3.0\r\n" - "CPE210(TP-LINK|UN|N300-2|00000000):3.0\r\n" -+ "CPE210(TP-LINK|US|N300-2|55530000):3.0\r\n" - "CPE210(TP-LINK|UN|N300-2):3.0\r\n" -- "CPE210(TP-LINK|EU|N300-2):3.0\r\n", -+ "CPE210(TP-LINK|EU|N300-2):3.0\r\n" -+ "CPE210(TP-LINK|EU|N300-2|45550000):3.1\r\n" -+ "CPE210(TP-LINK|UN|N300-2|00000000):3.1\r\n" -+ "CPE210(TP-LINK|US|N300-2|55530000):3.1\r\n" -+ "CPE210(TP-LINK|EU|N300-2|45550000):3.20\r\n" -+ "CPE210(TP-LINK|UN|N300-2|00000000):3.20\r\n" -+ "CPE210(TP-LINK|US|N300-2|55530000):3.20\r\n", - .support_trail = '\xff', - .soft_ver = NULL, - diff --git a/build_patches/openwrt/0011-vxlan-fix-udp-checksum-control.patch b/build_patches/openwrt/0011-vxlan-fix-udp-checksum-control.patch deleted file mode 100644 index 5539d55..0000000 --- a/build_patches/openwrt/0011-vxlan-fix-udp-checksum-control.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Johannes Kimmel -Date: Mon, 8 Jun 2020 16:14:43 +0200 -Subject: vxlan: fix udp checksum control - -So far, passing "rxcsum" and "txcsum" had no effect. - -Fixes: 95ab18e0124e ("vxlan: add options to enable and disable UDP -checksums") - -Signed-off-by: Johannes Kimmel -[add Fixes:] -Signed-off-by: Adrian Schmutzler -(cherry picked from commit 0453c3866feb701160bbab4ecf9762c5a3038503) - -diff --git a/package/network/config/vxlan/files/vxlan.sh b/package/network/config/vxlan/files/vxlan.sh -index d055d41edc59f50c0c132849bbcd0235edeef5b9..7b1c7039551b7781f5f7a8e73b964db698f3697b 100755 ---- a/package/network/config/vxlan/files/vxlan.sh -+++ b/package/network/config/vxlan/files/vxlan.sh -@@ -129,6 +129,8 @@ vxlan_generic_init_config() { - proto_config_add_int "ttl" - proto_config_add_int "tos" - proto_config_add_int "mtu" -+ proto_config_add_boolean "rxcsum" -+ proto_config_add_boolean "txcsum" - proto_config_add_string "macaddr" - } - diff --git a/build_patches/openwrt/0012-vxlan-bump-and-change-to-PKG_RELEASE.patch b/build_patches/openwrt/0012-vxlan-bump-and-change-to-PKG_RELEASE.patch deleted file mode 100644 index a9c603f..0000000 --- a/build_patches/openwrt/0012-vxlan-bump-and-change-to-PKG_RELEASE.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Adrian Schmutzler -Date: Wed, 15 Jul 2020 16:49:36 +0200 -Subject: vxlan: bump and change to PKG_RELEASE - -Bumping package version has been overlooked in a previous commit. - -While at it, use PKG_RELEASE instead of PKG_VERSION, as the latter -is meant for upstream version number only. -(The effective version string for the package would be "3" in both -cases, so there is no harm done for version comparison.) - -Fixes: 0453c3866feb ("vxlan: fix udp checksum control") - -Signed-off-by: Adrian Schmutzler -(cherry picked from commit b29d620ed2521fe6fda40ddafe6cb0f1d70e4503) - -diff --git a/package/network/config/vxlan/Makefile b/package/network/config/vxlan/Makefile -index 5850c443e73131f19fbeb1f986f85259d5747ac4..13fcf0c55d07d97f5dcc3cbfcf2478020e7107cc 100644 ---- a/package/network/config/vxlan/Makefile -+++ b/package/network/config/vxlan/Makefile -@@ -1,7 +1,7 @@ - include $(TOPDIR)/rules.mk - - PKG_NAME:=vxlan --PKG_VERSION:=2 -+PKG_RELEASE:=3 - PKG_LICENSE:=GPL-2.0 - - include $(INCLUDE_DIR)/package.mk diff --git a/build_patches/openwrt/0013-vxlan-remove-mandatory-peeraddr.patch b/build_patches/openwrt/0013-vxlan-remove-mandatory-peeraddr.patch index 90ce449..0ae6e3b 100644 --- a/build_patches/openwrt/0013-vxlan-remove-mandatory-peeraddr.patch +++ b/build_patches/openwrt/0013-vxlan-remove-mandatory-peeraddr.patch @@ -9,6 +9,7 @@ Fixes: FS#2743 Signed-off-by: Johannes Kimmel Acked-by: Matthias Schiffer +(cherry picked from commit 5222aadbf353b7cc030c39aa816f33951b104552) diff --git a/package/network/config/vxlan/files/vxlan.sh b/package/network/config/vxlan/files/vxlan.sh index 7b1c7039551b7781f5f7a8e73b964db698f3697b..bdcaa628c4416cc83258dd38a6fc0978ea55a3bb 100755 diff --git a/build_patches/openwrt/0014-vxlan-add-capability-for-multiple-fdb-entries.patch b/build_patches/openwrt/0014-vxlan-add-capability-for-multiple-fdb-entries.patch index 243917d..3e4567a 100644 --- a/build_patches/openwrt/0014-vxlan-add-capability-for-multiple-fdb-entries.patch +++ b/build_patches/openwrt/0014-vxlan-add-capability-for-multiple-fdb-entries.patch @@ -69,6 +69,7 @@ All available peer options for completeness: option src_vni '123' # see man 3 bridge Signed-off-by: Johannes Kimmel +(cherry picked from commit 65e9de3c333bae1ccef1dfb0cc008ad6f13958e4) diff --git a/package/network/config/vxlan/Makefile b/package/network/config/vxlan/Makefile index 13fcf0c55d07d97f5dcc3cbfcf2478020e7107cc..7232f71b45e6f72f2c62a245ad44cb9ade144f52 100644 diff --git a/buildscript b/buildscript index 3656761..81ae501 100755 --- a/buildscript +++ b/buildscript @@ -13,9 +13,9 @@ builddir=./build -OPENWRTREV="v19.07.3" +OPENWRTREV="v19.07.5" OPENWRTURL="https://git.openwrt.org/openwrt/openwrt.git" -PACKAGEREV="2e6bd4cb86682b224803325127d3f777d40b3231" # openwrt-19.07.3 +PACKAGEREV="2974079d3db786fe5da00c10f1d80e79b0112093" # openwrt-19.07.5 PACKAGEURL="https://git.openwrt.org/feed/packages.git" ## Feed definition [0]: name aka directory, [1]: url, [2]: revision, [3..n]: patches @@ -36,7 +36,7 @@ GLUON_PKGS="simple-tc uradvd" #official openwrt routing packages ROUTING=(routing https://git.openwrt.org/feed/routing.git - 3f8571194c2765ed31aa73459e86c2ebf943d27d) # openwrt-19.07.3 + 02b4dbfcb7b8f8b566940847d22d5a6f229d2e66) # openwrt-19.07.5 ROUTING_PKGS="kmod-batman-adv batctl alfred babeld" FFF=(fff)