diff --git a/contrib/actions/install-dependencies.sh b/contrib/actions/install-dependencies.sh index 60e4a9ee..5de21c2f 100755 --- a/contrib/actions/install-dependencies.sh +++ b/contrib/actions/install-dependencies.sh @@ -2,9 +2,7 @@ set -e -cp contrib/actions/sources.list /etc/apt/sources.list -rm -rf /etc/apt/sources.list.d -apt update -apt install git subversion build-essential python gawk unzip libncurses5-dev zlib1g-dev libssl-dev wget time -apt clean +apt-get update +apt-get install git subversion build-essential python gawk unzip libncurses-dev zlib1g-dev libssl-dev wget time +apt-get clean rm -rf /var/lib/apt/lists/* diff --git a/contrib/actions/sources.list b/contrib/actions/sources.list deleted file mode 100644 index 64c6aae7..00000000 --- a/contrib/actions/sources.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://mirror.netcologne.de/ubuntu/ bionic main restricted -deb http://mirror.netcologne.de/ubuntu/ bionic-updates main restricted diff --git a/modules b/modules index 55a6136a..ace18c30 100644 --- a/modules +++ b/modules @@ -2,15 +2,15 @@ GLUON_FEEDS='packages routing gluon' OPENWRT_REPO=https://github.com/openwrt/openwrt.git OPENWRT_BRANCH=openwrt-19.07 -OPENWRT_COMMIT=6fc02f2a45e151ce16677d6131251af86ab4fc06 +OPENWRT_COMMIT=81266d900104d657275aa5df3fb7629f7892c57a PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-19.07 -PACKAGES_PACKAGES_COMMIT=2974079d3db786fe5da00c10f1d80e79b0112093 +PACKAGES_PACKAGES_COMMIT=fdd4afe6ac0c05ba2b25d28700809841aeda643d PACKAGES_ROUTING_REPO=https://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_BRANCH=openwrt-19.07 -PACKAGES_ROUTING_COMMIT=02b4dbfcb7b8f8b566940847d22d5a6f229d2e66 +PACKAGES_ROUTING_COMMIT=e26b4745209655976b7d124465b1dc53ade632f9 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=12e41d0ff07ec54bbd67a31ab50d12ca04f2238c +PACKAGES_GLUON_COMMIT=3822f44013ccf60729d66c6143f554b6db2ccb63 diff --git a/package/gluon-core/Config.in b/package/gluon-core/Config.in index 7c3ba6fc..6550ec7e 100644 --- a/package/gluon-core/Config.in +++ b/package/gluon-core/Config.in @@ -24,16 +24,12 @@ config KERNEL_TUN config KERNEL_L2TP_V3 bool -config KERNEL_L2TP_IP - bool - config KERNEL_L2TP_ETH bool config KERNEL_L2TP bool select KERNEL_L2TP_V3 - select KERNEL_L2TP_IP select KERNEL_L2TP_ETH diff --git a/patches/openwrt/0013-mt76-mt76x0-disable-GTK-offloading.patch b/patches/openwrt/0013-mt76-mt76x0-disable-GTK-offloading.patch deleted file mode 100644 index c1f404c8..00000000 --- a/patches/openwrt/0013-mt76-mt76x0-disable-GTK-offloading.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: David Bauer -Date: Sat, 13 Jun 2020 19:19:17 +0200 -Subject: mt76: mt76x0: disable GTK offloading - -When the GTK is offloaded, MT7610 won't transmit any multicast frames. -This is most likely due to a bug in the offloading datapath. MT7612 is -not affected. - -Disable GTK offloading for now. It can be re-enabled once the bug in the -offloading path is fixed. - -Signed-off-by: David Bauer - -diff --git a/package/kernel/mt76/patches/001-mt76-mt76x0-disable-gtk-offloading.patch b/package/kernel/mt76/patches/001-mt76-mt76x0-disable-gtk-offloading.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..e7e19ac957dbfaa9510016d3387abe9eed353538 ---- /dev/null -+++ b/package/kernel/mt76/patches/001-mt76-mt76x0-disable-gtk-offloading.patch -@@ -0,0 +1,30 @@ -+From ae01717951013fbc8bb0315d902d5b9f5873631a Mon Sep 17 00:00:00 2001 -+From: David Bauer -+Date: Fri, 12 Jun 2020 01:09:57 +0200 -+Subject: [PATCH] mt76: mt76x0: disable GTK offloading -+ -+When the GTK is offloaded, MT7610 won't transmit any multicast frames. -+This is most likely due to a bug in the offloading datapath. MT7612 is -+not affected. -+ -+Disable GTK offloading for now. It can be re-enabled once the bug in the -+offloading path is fixed. -+ -+Signed-off-by: David Bauer -+--- -+ drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 4 ++++ -+ 1 file changed, 4 insertions(+) -+ -+--- a/mt76x02_util.c -++++ b/mt76x02_util.c -+@@ -432,6 +432,10 @@ int mt76x02_set_key(struct ieee80211_hw -+ !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) -+ return -EOPNOTSUPP; -+ -++ /* MT76x0 GTK offloading is currently broken */ -++ if (is_mt76x0(dev) && !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) -++ return -EOPNOTSUPP; -++ -+ /* -+ * In USB AP mode, broadcast/multicast frames are setup in beacon -+ * data registers and sent via HW beacons engine, they require to diff --git a/patches/openwrt/0014-mt76-mt7603-add-additional-EEPROM-chip-ID.patch b/patches/openwrt/0014-mt76-mt7603-add-additional-EEPROM-chip-ID.patch deleted file mode 100644 index deac496d..00000000 --- a/patches/openwrt/0014-mt76-mt7603-add-additional-EEPROM-chip-ID.patch +++ /dev/null @@ -1,46 +0,0 @@ -From: David Bauer -Date: Thu, 15 Oct 2020 22:42:54 +0200 -Subject: mt76: mt7603: add additional EEPROM chip ID - -Some newer MT7628 based routers (notably the TP-Link Archer C50 v4) are -shipped with a chip-id of 0x7600 in the on-flash EEPROM. Add this as a -possible valid ID. - -Ref: https://bugs.openwrt.org/index.php?do=details&task_id=2781 - -Suggested-by: Ron Asimi -Signed-off-by: David Bauer - -diff --git a/package/kernel/mt76/patches/002-mt76-mt7603-add-additional-EEPROM-chip-ID.patch b/package/kernel/mt76/patches/002-mt76-mt7603-add-additional-EEPROM-chip-ID.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..c749aa403f5940c19e5f580f461874b708b41f66 ---- /dev/null -+++ b/package/kernel/mt76/patches/002-mt76-mt7603-add-additional-EEPROM-chip-ID.patch -@@ -0,0 +1,27 @@ -+From 6b51340cdc32b1ba75163faaa8592feaeb4bddec Mon Sep 17 00:00:00 2001 -+From: David Bauer -+Date: Sat, 10 Oct 2020 00:36:02 +0200 -+Subject: [PATCH] mt76: mt7603: add additional EEPROM chip ID -+ -+Some newer MT7628 based routers (notably the TP-Link Archer C50 v4) are -+shipped with a chip-id of 0x7600 in the on-flash EEPROM. Add this as a -+possible valid ID. -+ -+Ref: https://bugs.openwrt.org/index.php?do=details&task_id=2781 -+ -+Suggested-by: Ron Asimi -+Signed-off-by: David Bauer -+--- -+ mt7603/eeprom.c | 1 + -+ 1 file changed, 1 insertion(+) -+ -+--- a/mt7603/eeprom.c -++++ b/mt7603/eeprom.c -+@@ -136,6 +136,7 @@ static int mt7603_check_eeprom(struct mt -+ switch (val) { -+ case 0x7628: -+ case 0x7603: -++ case 0x7600: -+ return 0; -+ default: -+ return -EINVAL; diff --git a/targets/ramips-mt7620 b/targets/ramips-mt7620 index ff2e4529..ff90c0dc 100644 --- a/targets/ramips-mt7620 +++ b/targets/ramips-mt7620 @@ -42,7 +42,9 @@ device('tp-link-archer-c2-v1', 'tplink_c2-v1', { factory = false, }) -device('tp-link-archer-c20-v1', 'tplink_c20-v1') +device('tp-link-archer-c20-v1', 'tplink_c20-v1', { + factory = false, +}) device('tp-link-archer-c20i', 'ArcherC20i')