diff --git a/build_patches/openwrt/0002-set-root-password.patch b/build_patches/openwrt/0002-set-root-password.patch index ce5e4a3f..9655010d 100644 --- a/build_patches/openwrt/0002-set-root-password.patch +++ b/build_patches/openwrt/0002-set-root-password.patch @@ -7,7 +7,7 @@ index 4b4154f21f478cc025a350363b3e34319c6afacc..b8d180a95691ab09f9c4d759ffd97da3 --- a/package/base-files/files/etc/shadow +++ b/package/base-files/files/etc/shadow @@ -1,4 +1,4 @@ --root::0:0:99999:7::: +-root:::0:99999:7::: +root:$1$OmvoKpjK$e.lPVnBxsrAbNV4EoH3xb1:0:0:99999:7::: daemon:*:0:0:99999:7::: ftp:*:0:0:99999:7::: diff --git a/build_patches/openwrt/0010-ramips-add-missing-label-mac-device-mi-router-4a.patch b/build_patches/openwrt/0010-ramips-add-missing-label-mac-device-mi-router-4a.patch deleted file mode 100644 index 00e8086e..00000000 --- a/build_patches/openwrt/0010-ramips-add-missing-label-mac-device-mi-router-4a.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= -Date: Mon, 19 Jul 2021 21:54:29 +0200 -Subject: [PATCH] ramips: add missing label-mac-device for Xiaomi Mi Router 4A - (100M) - -As both the Mi Router 4A (100M) and the Mi Router 4C use the same -label-mac-device, the alias can be moved to the shared dtsi. - -Signed-off-by: Fabian Bläse ---- - target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi -index 0f5897f5c593..d3f5e33be732 100644 ---- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi -+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi -@@ -11,6 +11,7 @@ - led-failsafe = &led_power_yellow; - led-running = &led_power_blue; - led-upgrade = &led_power_yellow; -+ label-mac-device = ðernet; - }; - - chosen { diff --git a/build_patches/openwrt/0011-generic-add-support-for-EON-EN25QX128A-spi-nor-flash.patch b/build_patches/openwrt/0011-generic-add-support-for-EON-EN25QX128A-spi-nor-flash.patch deleted file mode 100644 index 530d40db..00000000 --- a/build_patches/openwrt/0011-generic-add-support-for-EON-EN25QX128A-spi-nor-flash.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 3b63209f03007e755c4a076d0a81a60fdf15dcd0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= -Date: Wed, 16 Nov 2022 11:41:32 +0100 -Subject: [PATCH] generic: add support for EON EN25QX128A spi nor flash -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add support for EON EN25QX128A spi nor flash with no flags as it does -support SFDP parsing. - -Fixes: #9442 -Signed-off-by: Christian Marangi -Tested-by: Szabolcs Hubai [ramips/mt7621: xiaomi_mi-router-4a-gigabit] -[fabian@blaese.de: Backport to Kernel 5.4] -Signed-off-by: Fabian Bläse ---- - .../477-mtd-spi-nor-add-eon-en25qx128a.patch | 21 +++++++++++++++++++ - .../477-mtd-spi-nor-add-eon-en25qx128a.patch | 21 +++++++++++++++++++ - .../477-mtd-spi-nor-add-eon-en25qx128a.patch | 21 +++++++++++++++++++ - 3 files changed, 63 insertions(+) - create mode 100644 target/linux/generic/pending-5.10/477-mtd-spi-nor-add-eon-en25qx128a.patch - create mode 100644 target/linux/generic/pending-5.15/477-mtd-spi-nor-add-eon-en25qx128a.patch - create mode 100644 target/linux/generic/pending-5.4/477-mtd-spi-nor-add-eon-en25qx128a.patch - -diff --git a/target/linux/generic/pending-5.10/477-mtd-spi-nor-add-eon-en25qx128a.patch b/target/linux/generic/pending-5.10/477-mtd-spi-nor-add-eon-en25qx128a.patch -new file mode 100644 -index 0000000000..0a681d6753 ---- /dev/null -+++ b/target/linux/generic/pending-5.10/477-mtd-spi-nor-add-eon-en25qx128a.patch -@@ -0,0 +1,21 @@ -+From: Christian Marangi -+Subject: kernel/mtd: add support for EON EN25QX128A -+ -+Add support for EON EN25QX128A with no flags as it does -+support SFDP parsing. -+ -+Signed-off-by: Christian Marangi -+--- -+ drivers/mtd/spi-nor/spi-nor.c | 1 + -+ 1 file changed, 1 insertion(+) -+ -+--- a/drivers/mtd/spi-nor/eon.c -++++ b/drivers/mtd/spi-nor/eon.c -+@@ -15,6 +15,7 @@ static const struct flash_info eon_parts -+ { "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) }, -+ { "en25q128", INFO(0x1c3018, 0, 64 * 1024, 256, -+ SECT_4K | SPI_NOR_DUAL_READ) }, -++ { "en25qx128a", INFO(0x1c7118, 0, 64 * 1024, 256, 0) }, -+ { "en25q80a", INFO(0x1c3014, 0, 64 * 1024, 16, -+ SECT_4K | SPI_NOR_DUAL_READ) }, -+ { "en25qh16", INFO(0x1c7015, 0, 64 * 1024, 32, -diff --git a/target/linux/generic/pending-5.15/477-mtd-spi-nor-add-eon-en25qx128a.patch b/target/linux/generic/pending-5.15/477-mtd-spi-nor-add-eon-en25qx128a.patch -new file mode 100644 -index 0000000000..0a681d6753 ---- /dev/null -+++ b/target/linux/generic/pending-5.15/477-mtd-spi-nor-add-eon-en25qx128a.patch -@@ -0,0 +1,21 @@ -+From: Christian Marangi -+Subject: kernel/mtd: add support for EON EN25QX128A -+ -+Add support for EON EN25QX128A with no flags as it does -+support SFDP parsing. -+ -+Signed-off-by: Christian Marangi -+--- -+ drivers/mtd/spi-nor/spi-nor.c | 1 + -+ 1 file changed, 1 insertion(+) -+ -+--- a/drivers/mtd/spi-nor/eon.c -++++ b/drivers/mtd/spi-nor/eon.c -+@@ -15,6 +15,7 @@ static const struct flash_info eon_parts -+ { "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) }, -+ { "en25q128", INFO(0x1c3018, 0, 64 * 1024, 256, -+ SECT_4K | SPI_NOR_DUAL_READ) }, -++ { "en25qx128a", INFO(0x1c7118, 0, 64 * 1024, 256, 0) }, -+ { "en25q80a", INFO(0x1c3014, 0, 64 * 1024, 16, -+ SECT_4K | SPI_NOR_DUAL_READ) }, -+ { "en25qh16", INFO(0x1c7015, 0, 64 * 1024, 32, -diff --git a/target/linux/generic/pending-5.4/477-mtd-spi-nor-add-eon-en25qx128a.patch b/target/linux/generic/pending-5.4/477-mtd-spi-nor-add-eon-en25qx128a.patch -new file mode 100644 -index 0000000000..0a681d6753 ---- /dev/null -+++ b/target/linux/generic/pending-5.4/477-mtd-spi-nor-add-eon-en25qx128a.patch -@@ -0,0 +1,18 @@ -+From: Fabian Bläse -+Subject: kernel/mtd: add support for EON EN25QX128A -+ -+Signed-off-by: Fabian Bläse -+--- -+ drivers/mtd/spi-nor/spi-nor.c | 1 + -+ 1 file changed, 1 insertion(+) -+ -+--- a/drivers/mtd/spi-nor/spi-nor.c -++++ b/drivers/mtd/spi-nor/spi-nor.c -+@@ -2240,8 +2240,9 @@ static const struct flash_info spi_nor_i -+ { "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) }, -+ { "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) }, -+ { "en25q128", INFO(0x1c3018, 0, 64 * 1024, 256, SECT_4K) }, -++ { "en25qx128a", INFO(0x1c7118, 0, 64 * 1024, 256, 0) }, -+ { "en25q80a", INFO(0x1c3014, 0, 64 * 1024, 16, -+ SECT_4K | SPI_NOR_DUAL_READ) }, -+ { "en25qh32", INFO(0x1c7016, 0, 64 * 1024, 64, 0) }, --- -2.38.1 - diff --git a/build_patches/openwrt/0050-Disable-ipq40xx-lan-wan-separation.patch b/build_patches/openwrt/0050-Disable-ipq40xx-lan-wan-separation.patch index 6e062523..f318485c 100644 --- a/build_patches/openwrt/0050-Disable-ipq40xx-lan-wan-separation.patch +++ b/build_patches/openwrt/0050-Disable-ipq40xx-lan-wan-separation.patch @@ -19,16 +19,16 @@ These changes are currently only done with the FritzBox 4040 in mind. --- .../linux/ipq40xx/base-files/etc/board.d/01_leds | 2 +- .../ipq40xx/base-files/etc/board.d/02_network | 3 +-- + .../ipq40xx/files-5.10/drivers/net/mdio/ar40xx.c | 2 ++ .../drivers/net/ethernet/qualcomm/essedma/edma.h | 16 ++++++++-------- - .../linux/ipq40xx/files/drivers/net/phy/ar40xx.c | 2 ++ ...1-dts-ipq4019-add-ethernet-essedma-node.patch | 6 +++--- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds -index ac11655904..147e159ea1 100755 +index 884b265dcb..77b0754635 100644 --- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds +++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds -@@ -19,7 +19,7 @@ asus,rt-ac58u) +@@ -24,7 +24,7 @@ asus,rt-ac58u) ;; avm,fritzbox-4040) ucidef_set_led_wlan "wlan" "WLAN" "green:wlan" "phy0tpt" "phy1tpt" @@ -38,10 +38,10 @@ index ac11655904..147e159ea1 100755 ;; avm,fritzbox-7530 |\ diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network -index 87c79db5e1..666be0d145 100755 +index 2aa4886e6a..7390769661 100644 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network -@@ -58,9 +58,8 @@ ipq40xx_setup_interfaces() +@@ -68,9 +68,8 @@ ipq40xx_setup_interfaces() avm,fritzbox-4040|\ linksys,ea6350v3|\ linksys,ea8300) @@ -52,6 +52,26 @@ index 87c79db5e1..666be0d145 100755 ;; linksys,mr8300) ucidef_set_interfaces_lan_wan "eth0" "eth1" +diff --git a/target/linux/ipq40xx/files-5.10/drivers/net/mdio/ar40xx.c b/target/linux/ipq40xx/files-5.10/drivers/net/mdio/ar40xx.c +index f7ce42b9ff..a8da7ac653 100644 +--- a/target/linux/ipq40xx/files-5.10/drivers/net/mdio/ar40xx.c ++++ b/target/linux/ipq40xx/files-5.10/drivers/net/mdio/ar40xx.c +@@ -1481,6 +1481,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv) + unsigned long bmp; + + /* By default Enable VLAN */ ++ /* + priv->vlan = 1; + priv->vlan_table[AR40XX_LAN_VLAN] = priv->cpu_bmp | priv->lan_bmp; + priv->vlan_table[AR40XX_WAN_VLAN] = priv->cpu_bmp | priv->wan_bmp; +@@ -1492,6 +1493,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv) + bmp = priv->wan_bmp; + for_each_set_bit(port, &bmp, AR40XX_NUM_PORTS) + priv->pvid[port] = AR40XX_WAN_VLAN; ++ */ + + return 0; + } diff --git a/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma.h b/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma.h index 015e5f5026..daa60639d1 100644 --- a/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma.h @@ -79,30 +99,10 @@ index 015e5f5026..daa60639d1 100644 /* Queues exposed to linux kernel */ #define EDMA_NETDEV_TX_QUEUE 4 -diff --git a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c b/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c -index 545e3985ae..28453c2363 100644 ---- a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c -+++ b/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c -@@ -1483,6 +1483,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv) - unsigned long bmp; - - /* By default Enable VLAN */ -+ /* - priv->vlan = 1; - priv->vlan_table[AR40XX_LAN_VLAN] = priv->cpu_bmp | priv->lan_bmp; - priv->vlan_table[AR40XX_WAN_VLAN] = priv->cpu_bmp | priv->wan_bmp; -@@ -1494,6 +1495,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv) - bmp = priv->wan_bmp; - for_each_set_bit(port, &bmp, AR40XX_NUM_PORTS) - priv->pvid[port] = AR40XX_WAN_VLAN; -+ */ - - return 0; - } -diff --git a/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch b/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch +diff --git a/target/linux/ipq40xx/patches-5.10/711-dts-ipq4019-add-ethernet-essedma-node.patch b/target/linux/ipq40xx/patches-5.10/711-dts-ipq4019-add-ethernet-essedma-node.patch index 3567eb7810..b13b312a91 100644 ---- a/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch -+++ b/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch +--- a/target/linux/ipq40xx/patches-5.10/711-dts-ipq4019-add-ethernet-essedma-node.patch ++++ b/target/linux/ipq40xx/patches-5.10/711-dts-ipq4019-add-ethernet-essedma-node.patch @@ -36,7 +36,7 @@ Signed-off-by: Christian Lamparter + qcom,rx_head_buf_size = <1540>; + qcom,mdio_supported; diff --git a/build_patches/openwrt/0100-Add-hack-which-fixes-forwarding-on-a-stacked-bridge-.patch b/build_patches/openwrt/0100-Add-hack-which-fixes-forwarding-on-a-stacked-bridge-.patch index c3926aea..1be06519 100644 --- a/build_patches/openwrt/0100-Add-hack-which-fixes-forwarding-on-a-stacked-bridge-.patch +++ b/build_patches/openwrt/0100-Add-hack-which-fixes-forwarding-on-a-stacked-bridge-.patch @@ -1,19 +1,18 @@ -From f53b71d2907eeb0d80e79d99fa7b756b5e5bf32b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Thu, 24 Feb 2022 00:04:47 +0100 Subject: [PATCH] Add hack which fixes forwarding on a stacked bridge configuration using DSA --- - .../hack-5.4/999-fix-stacked-bridge-forwarding.patch | 12 ++++++++++++ + .../999-fix-stacked-bridge-forwarding.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) - create mode 100644 target/linux/generic/hack-5.4/999-fix-stacked-bridge-forwarding.patch + create mode 100644 target/linux/generic/hack-5.10/999-fix-stacked-bridge-forwarding.patch -diff --git a/target/linux/generic/hack-5.4/999-fix-stacked-bridge-forwarding.patch b/target/linux/generic/hack-5.4/999-fix-stacked-bridge-forwarding.patch +diff --git a/target/linux/generic/hack-5.10/999-fix-stacked-bridge-forwarding.patch b/target/linux/generic/hack-5.10/999-fix-stacked-bridge-forwarding.patch new file mode 100644 index 0000000000..e1d4cb9cd5 --- /dev/null -+++ b/target/linux/generic/hack-5.4/999-fix-stacked-bridge-forwarding.patch ++++ b/target/linux/generic/hack-5.10/999-fix-stacked-bridge-forwarding.patch @@ -0,0 +1,12 @@ +--- a/net/bridge/br_input.c ++++ b/net/bridge/br_input.c @@ -27,6 +26,4 @@ index 0000000000..e1d4cb9cd5 + indev = skb->dev; + skb->dev = brdev; + skb = br_handle_vlan(br, NULL, vg, skb); --- -2.35.1 diff --git a/build_patches/openwrt/0200-mpc85xx-Drop-pci-aliases-to-avoid-domain-changes.patch b/build_patches/openwrt/0200-mpc85xx-Drop-pci-aliases-to-avoid-domain-changes.patch deleted file mode 100644 index 1e34b077..00000000 --- a/build_patches/openwrt/0200-mpc85xx-Drop-pci-aliases-to-avoid-domain-changes.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 7f4b4c29f3489697dca7495216460d0ed5023e02 Mon Sep 17 00:00:00 2001 -From: Martin Kennedy -Date: Mon, 29 Aug 2022 20:47:24 -0400 -Subject: [PATCH] mpc85xx: Drop pci aliases to avoid domain changes - -As of upstream Linux commit 0fe1e96fef0a ("powerpc/pci: Prefer PCI -domain assignment via DT 'linux,pci-domain' and alias"), the PCIe -domain address is no longer numbered by the lowest 16 bits of the PCI -register address after a fallthrough. Instead of the fallthrough, the -enumeration process accepts the alias ID (as determined by -`of_alias_scan()`). This causes e.g.: - -9000:00:00.0 PCI bridge: Freescale Semiconductor Inc P1020E (rev 11) -9000:01:00.0 Network controller: Qualcomm Atheros AR958x 802.11abgn ... - -to become - -0000:00:00.0 PCI bridge: Freescale Semiconductor Inc P1020E (rev 11) -0000:01:00.0 Network controller: Qualcomm Atheros AR958x 802.11abgn ... - -... which then causes the sysfs path of the netdev to change, -invalidating the `wifi_device.path`s enumerated in -`/etc/config/wireless`. - -One other solution might be to migrate the uci configuration, as was -done for mvebu in commit 0bd5aa89fcf2 ("mvebu: Migrate uci config to -new PCIe path"). However, there are concerns that the sysfs path will -change once again once some upstream patches[^2][^3] are merged and -backported (and `CONFIG_PPC_PCI_BUS_NUM_DOMAIN_DEPENDENT` is enabled). - -Instead, remove the aliases and allow the fallthrough to continue for -now. We will provide a migration in a later release. - -This was first reported as a Github issue[^1]. - -[^1]: https://github.com/openwrt/openwrt/issues/10530 -[^2]: https://lore.kernel.org/linuxppc-dev/20220706104308.5390-1-pali@kernel.org/t/#u -[^3]: https://lore.kernel.org/linuxppc-dev/20220706101043.4867-1-pali@kernel.org/ - -Fixes: #10530 -Tested-by: Martin Kennedy -[Tested on the Aerohive HiveAP 330 and Extreme Networks WS-AP3825i] -Signed-off-by: Martin Kennedy ---- - .../files/arch/powerpc/boot/dts/hiveap-330.dts | 13 +++++++++++++ - .../mpc85xx/files/arch/powerpc/boot/dts/panda.dts | 14 ++++++++++++++ - .../files/arch/powerpc/boot/dts/red-15w-rev1.dts | 14 ++++++++++++++ - .../files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts | 13 +++++++++++++ - .../files/arch/powerpc/boot/dts/ws-ap3710i.dts | 13 +++++++++++++ - 6 files changed, 80 insertions(+) - -diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts -index ccf60eaeed0e1..d6a8da84ef66d 100644 ---- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts -+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts -@@ -300,3 +300,16 @@ - }; - }; - /include/ "fsl/p1020si-post.dtsi" -+ -+/* -+ * For the OpenWrt 22.03 release, since Linux 5.10.138 now uses -+ * aliases to determine PCI domain numbers, drop aliases so as not to -+ * change the sysfs path of our wireless netdevs. -+ */ -+ -+/ { -+ aliases { -+ /delete-property/ pci0; -+ /delete-property/ pci1; -+ }; -+}; -diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/panda.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/panda.dts -index baaa4a43fd559..9be822f7bb8ac 100644 ---- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/panda.dts -+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/panda.dts -@@ -265,3 +265,17 @@ - }; - }; - /include/ "fsl/p1020si-post.dtsi" -+ -+/* -+ * For the OpenWrt 22.03 release, since Linux 5.10.138 now uses -+ * aliases to determine PCI domain numbers, drop aliases so as not to -+ * change the sysfs path of our wireless netdevs. -+ */ -+ -+/ { -+ aliases { -+ /delete-property/ pci0; -+ /delete-property/ pci1; -+ }; -+}; -+ -diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/red-15w-rev1.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/red-15w-rev1.dts -index 1fd6a4aa49713..db35602b94b5b 100644 ---- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/red-15w-rev1.dts -+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/red-15w-rev1.dts -@@ -214,3 +214,17 @@ - }; - - /include/ "fsl/p1010si-post.dtsi" -+ -+/* -+ * For the OpenWrt 22.03 release, since Linux 5.10.138 now uses -+ * aliases to determine PCI domain numbers, drop aliases so as not to -+ * change the sysfs path of our wireless netdevs. -+ */ -+ -+/ { -+ aliases { -+ /delete-property/ pci0; -+ /delete-property/ pci1; -+ }; -+}; -+ -diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts -index fbe1c0ee705d2..12281808aa5b6 100644 ---- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts -+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts -@@ -302,3 +302,16 @@ - /delete-node/ crypto@30000; /* Pulled in by p1010si-post */ - }; - }; -+ -+/* -+ * For the OpenWrt 22.03 release, since Linux 5.10.138 now uses -+ * aliases to determine PCI domain numbers, drop aliases so as not to -+ * change the sysfs path of our wireless netdevs. -+ */ -+ -+/ { -+ aliases { -+ /delete-property/ pci0; -+ /delete-property/ pci1; -+ }; -+}; -diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3710i.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3710i.dts -index c5588d80275e2..5d81da4686413 100644 ---- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3710i.dts -+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3710i.dts -@@ -173,3 +173,16 @@ - - }; - /include/ "fsl/p1020si-post.dtsi" -+ -+/* -+ * For the OpenWrt 22.03 release, since Linux 5.10.138 now uses -+ * aliases to determine PCI domain numbers, drop aliases so as not to -+ * change the sysfs path of our wireless netdevs. -+ */ -+ -+/ { -+ aliases { -+ /delete-property/ pci0; -+ /delete-property/ pci1; -+ }; -+}; diff --git a/buildscript b/buildscript index 0eefdebb..ce95bd1e 100755 --- a/buildscript +++ b/buildscript @@ -7,9 +7,9 @@ set -o pipefail builddir=./build # OpenWrt: package hashes correspond to core repo version -OPENWRTREV="v21.02.5" -PACKAGEREV="0b16e3f359fe9d015861596d63c5bde4c56daa2e" -ROUTINGREV="25e76489c83cfcee61e36a491896e1e9bfc3ec13" +OPENWRTREV="v22.03.3" +PACKAGEREV="2048c5bbf6c482e45b080eef4c1c531936f7f41b" +ROUTINGREV="1a87333f268bcf0a11e3a665a357cb0d4ec2d680" # Gluon packages: master from 2020-02-04 GLUONREV="12e41d0ff07ec54bbd67a31ab50d12ca04f2238c" diff --git a/src/packages/fff/fff-base/Makefile b/src/packages/fff/fff-base/Makefile index 027b8663..ff7e810e 100644 --- a/src/packages/fff/fff-base/Makefile +++ b/src/packages/fff/fff-base/Makefile @@ -12,8 +12,8 @@ define Package/fff-base URL:=https://www.freifunk-franken.de DEFAULT:=y DEPENDS:= \ - +iptables \ - +ip6tables \ + +iptables-legacy \ + +ip6tables-legacy \ +micrond \ +odhcp6c \ +fff-config \ diff --git a/src/packages/fff/fff-firewall/Makefile b/src/packages/fff/fff-firewall/Makefile index dec7d741..1bb42d57 100644 --- a/src/packages/fff/fff-firewall/Makefile +++ b/src/packages/fff/fff-firewall/Makefile @@ -10,8 +10,8 @@ define Package/$(PKG_NAME) CATEGORY:=Freifunk TITLE:=Freifunk-Franken firewall URL:=https://www.freifunk-franken.de - DEPENDS:=+arptables \ - +ebtables +ebtables-utils \ + DEPENDS:=+arptables-legacy \ + +ebtables-legacy +ebtables-legacy-utils \ +kmod-ebtables-ipv4 +kmod-ebtables-ipv6 \ +iptables-mod-filter +iptables-mod-ipopt +iptables-mod-conntrack-extra \ +kmod-nf-conntrack6 diff --git a/src/packages/fff/fff-layer3/Makefile b/src/packages/fff/fff-layer3/Makefile index 16abaf41..e01ed84f 100644 --- a/src/packages/fff/fff-layer3/Makefile +++ b/src/packages/fff/fff-layer3/Makefile @@ -23,10 +23,10 @@ define Package/fff-layer3 +fff-ra \ +fff-web-mqtt \ +fff-wireguard \ - +arptables \ + +arptables-legacy \ +bmon \ - +ebtables \ - +ebtables-utils \ + +ebtables-legacy \ + +ebtables-legacy-utils \ +kmod-ebtables-ipv4 \ +kmod-ebtables-ipv6 \ +kmod-sched-cake \ @@ -39,6 +39,7 @@ define Package/fff-layer3 +iptables-mod-ipopt \ +iptables-mod-conntrack-extra \ +mtr \ + +nftables \ +snmp-utils \ +tc \ +tcpdump \ diff --git a/src/packages/fff/fff-macnock/Makefile b/src/packages/fff/fff-macnock/Makefile index 1727abb2..a7c15d09 100644 --- a/src/packages/fff/fff-macnock/Makefile +++ b/src/packages/fff/fff-macnock/Makefile @@ -11,7 +11,7 @@ PKG_SOURCE_VERSION:=d0bdfdba569934442e9d8bfc01bcc6c3712b6011 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk -CMAKE_OPTIONS:=-DMACNOCK_DEBUG=ON +CMAKE_OPTIONS+=-DMACNOCK_DEBUG=ON define Package/$(PKG_NAME) SECTION:=base