From 9295ce70069fee39f2a6b5cf961d8514406a64a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Tue, 5 May 2020 09:14:40 +0200 Subject: [PATCH 1/7] fstools: update to the latest version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 8b9e601 block: always use st_dev (device ID) of / when looking for root 37c9148 block: simplify check_extroot() a bit d70774d block: add some basic extroot documentation 32db27d Revert "block: support hierarchical mount/umount" 0b93429 Revert "block: mount_action: handle mount/umount deps" Signed-off-by: Rafał Miłecki --- package/system/fstools/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile index 74320ac486..04828cc9d8 100644 --- a/package/system/fstools/Makefile +++ b/package/system/fstools/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git -PKG_MIRROR_HASH:=724e736fdaa0fee1a8d0a120d6248dfe99933d19172575e3f30aeb7224fe5914 -PKG_SOURCE_DATE:=2020-04-09 -PKG_SOURCE_VERSION:=c80f7002114f65dc40895c9064c077d9631b8f6e +PKG_MIRROR_HASH:=238c0d39c9e908dfec85f12bc93fd908e82c45bec5441be3d68d5a38f68d5ad0 +PKG_SOURCE_DATE:=2020-05-05 +PKG_SOURCE_VERSION:=8b9e601160712f74ff46313579d0225a7f90ca3c CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From 755790808c71f7b749e2e511c4b1159ce9f1279d Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 5 May 2020 13:06:26 +0200 Subject: [PATCH 2/7] sunxi: tidy up cases in base-files This removes unnecessary quotes in cases and applies alphabetic order to members. Signed-off-by: Adrian Schmutzler --- .../linux/sunxi/base-files/etc/board.d/02_network | 14 +++++++------- .../sunxi/base-files/lib/preinit/03_b53_hack.sh | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/target/linux/sunxi/base-files/etc/board.d/02_network b/target/linux/sunxi/base-files/etc/board.d/02_network index 984d5b3be6..5cf000cccf 100755 --- a/target/linux/sunxi/base-files/etc/board.d/02_network +++ b/target/linux/sunxi/base-files/etc/board.d/02_network @@ -7,19 +7,19 @@ board_config_update -case "$(board_name)" in -"olimex,a20-olinuxino-micro") - ucidef_set_interface_lan 'wlan0' - ;; -"lamobo,lamobo-r1") +case $(board_name) in +lamobo,lamobo-r1) ucidef_add_switch "switch0" \ "4:lan:1" "0:lan:2" "1:lan:3" "2:lan:4" "3:wan" "8@eth0" ;; -"xunlong,orangepi-r1") +olimex,a20-olinuxino-micro) + ucidef_set_interface_lan "wlan0" + ;; +xunlong,orangepi-r1) ucidef_set_interfaces_lan_wan "eth0" "eth1" ;; *) - ucidef_set_interface_lan 'eth0' + ucidef_set_interface_lan "eth0" ;; esac diff --git a/target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh b/target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh index 170cfd5b29..b09e86e694 100644 --- a/target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh +++ b/target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh @@ -4,8 +4,8 @@ do_b53_hack() { . /lib/functions.sh # hack: enable switch on Lamobo R1 and reset counters - case "$(board_name)" in - "lamobo,lamobo-r1") + case $(board_name) in + lamobo,lamobo-r1) ifconfig eth0 up sleep 1 swconfig dev switch0 set reset 1 From 0fb5962e62596e14897a7ea9066ca17564f47d2f Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 5 May 2020 13:09:19 +0200 Subject: [PATCH 3/7] sunxi: remove unneeded shebang for preinit files preinit files are sourced and they have no execute bit set, so remove their shebang. Signed-off-by: Adrian Schmutzler --- target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh | 2 -- target/linux/sunxi/base-files/lib/preinit/79_move_config | 1 - 2 files changed, 3 deletions(-) diff --git a/target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh b/target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh index b09e86e694..6ad8f57620 100644 --- a/target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh +++ b/target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh @@ -1,5 +1,3 @@ -#!/bin/sh - do_b53_hack() { . /lib/functions.sh diff --git a/target/linux/sunxi/base-files/lib/preinit/79_move_config b/target/linux/sunxi/base-files/lib/preinit/79_move_config index 74caee8a8a..f5bbb47310 100644 --- a/target/linux/sunxi/base-files/lib/preinit/79_move_config +++ b/target/linux/sunxi/base-files/lib/preinit/79_move_config @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2012-2015 OpenWrt.org move_config() { From 4d86e2ce0686d32dec8051baafe81a179a18cdf4 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Sun, 16 Dec 2018 21:30:20 +0100 Subject: [PATCH 4/7] buildsystem: add CPE information to ipkg packages and manifest files Common Platform Enumeration (CPE) is a structured naming scheme for information technology systems, software, and packages. This information already exists in some makefiles. In order for the information to be processed further, it should also be added to the manifest file and the control file of ipkg packages. Signed-off-by: Florian Eckert --- include/package-ipkg.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index c4c8f4a36f..569edcbf03 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -173,6 +173,7 @@ $$(call addfield,Depends,$$(Package/$(1)/DEPENDS) )$$(call addfield,LicenseFiles,$(LICENSE_FILES) )$$(call addfield,Section,$(SECTION) )$$(call addfield,Require-User,$(USERID) +)$(if $(PKG_CPE_ID),CPE-ID: $(PKG_CPE_ID) )$(if $(filter hold,$(PKG_FLAGS)),Status: unknown hold not-installed )$(if $(filter essential,$(PKG_FLAGS)),Essential: yes )$(if $(MAINTAINER),Maintainer: $(MAINTAINER) From 47f17b066259589b4a7b4181522321abf0660e18 Mon Sep 17 00:00:00 2001 From: Chuanhong Guo Date: Tue, 5 May 2020 17:37:02 +0800 Subject: [PATCH 5/7] generic: ar8216: fix unknown packet flooding for ar8229/ar8236 ar8229 and ar8236 don't allow unknown unicast/multicast frames and broadcast frames to be flooded to cpu port. This isn't desired behavior for swconfig as we treat it as a standalone switch. Current code doesn't enable unicast frame flooding for ar8229 and uses wrong setup for ar8236. This commit fixes both of them by enabling port 0 flooding for all unknown frames. Fixes: FS#2848 Signed-off-by: Chuanhong Guo --- .../generic/files/drivers/net/phy/ar8216.c | 19 ++++++++++++++----- .../generic/files/drivers/net/phy/ar8216.h | 4 ++-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c index 031efe6181..18a455b21a 100644 --- a/target/linux/generic/files/drivers/net/phy/ar8216.c +++ b/target/linux/generic/files/drivers/net/phy/ar8216.c @@ -943,10 +943,14 @@ ar8229_init_globals(struct ar8xxx_priv *priv) ar8xxx_reg_set(priv, AR8229_REG_QM_CTRL, AR8229_QM_CTRL_ARP_EN); - /* Enable Broadcast/Multicast frames transmitted to the CPU */ + /* + * Enable Broadcast/unknown multicast and unicast frames + * transmitted to the CPU port. + */ ar8xxx_reg_set(priv, AR8216_REG_FLOOD_MASK, AR8229_FLOOD_MASK_BC_DP(0) | - AR8229_FLOOD_MASK_MC_DP(0)); + AR8229_FLOOD_MASK_MC_DP(0) | + AR8229_FLOOD_MASK_UC_DP(0)); /* setup MTU */ ar8xxx_rmw(priv, AR8216_REG_GLOBAL_CTRL, @@ -1008,7 +1012,7 @@ ar7240sw_init_globals(struct ar8xxx_priv *priv) /* Enable Broadcast frames transmitted to the CPU */ ar8xxx_reg_set(priv, AR8216_REG_FLOOD_MASK, - AR8236_FM_CPU_BROADCAST_EN); + AR8216_FM_CPU_BROADCAST_EN); /* setup MTU */ ar8xxx_rmw(priv, AR8216_REG_GLOBAL_CTRL, @@ -1074,9 +1078,14 @@ ar8236_init_globals(struct ar8xxx_priv *priv) ar8xxx_reg_set(priv, AR8216_REG_ATU_CTRL, AR8236_ATU_CTRL_RES); - /* enable cpu port to receive multicast and broadcast frames */ + /* + * Enable Broadcast/unknown multicast and unicast frames + * transmitted to the CPU port. + */ ar8xxx_reg_set(priv, AR8216_REG_FLOOD_MASK, - AR8236_FM_CPU_BROADCAST_EN | AR8236_FM_CPU_BCAST_FWD_EN); + AR8229_FLOOD_MASK_BC_DP(0) | + AR8229_FLOOD_MASK_MC_DP(0) | + AR8229_FLOOD_MASK_UC_DP(0)); /* Enable MIB counters */ ar8xxx_rmw(priv, AR8216_REG_MIB_FUNC, AR8216_MIB_FUNC | AR8236_MIB_EN, diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.h b/target/linux/generic/files/drivers/net/phy/ar8216.h index bf34fdb775..d62cf60f57 100644 --- a/target/linux/generic/files/drivers/net/phy/ar8216.h +++ b/target/linux/generic/files/drivers/net/phy/ar8216.h @@ -56,10 +56,10 @@ #define AR8216_REG_FLOOD_MASK 0x002C #define AR8216_FM_UNI_DEST_PORTS BITS(0, 6) #define AR8216_FM_MULTI_DEST_PORTS BITS(16, 6) +#define AR8216_FM_CPU_BROADCAST_EN BIT(26) +#define AR8229_FLOOD_MASK_UC_DP(_p) BIT(_p) #define AR8229_FLOOD_MASK_MC_DP(_p) BIT(16 + (_p)) #define AR8229_FLOOD_MASK_BC_DP(_p) BIT(25 + (_p)) -#define AR8236_FM_CPU_BROADCAST_EN BIT(26) -#define AR8236_FM_CPU_BCAST_FWD_EN BIT(25) #define AR8216_REG_GLOBAL_CTRL 0x0030 #define AR8216_GCTRL_MTU BITS(0, 11) From c3a43753b984657d1b65c666f776856cdf3af61d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Wed, 6 May 2020 17:49:59 +0200 Subject: [PATCH 6/7] fstools: update to the latest version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit eec16e2 blockd: add optional "device" parameter to "info" ubus method 9ab936d block(d): always call hotplug.d "mount" scripts from blockd 4963db4 blockd: use uloop_process for calling /sbin/hotplug-call mount cddd902 Truncate FAT filesystem label until 1st occurance of a blank (0x20) Signed-off-by: Rafał Miłecki --- package/system/fstools/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile index 04828cc9d8..715c256720 100644 --- a/package/system/fstools/Makefile +++ b/package/system/fstools/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git -PKG_MIRROR_HASH:=238c0d39c9e908dfec85f12bc93fd908e82c45bec5441be3d68d5a38f68d5ad0 -PKG_SOURCE_DATE:=2020-05-05 -PKG_SOURCE_VERSION:=8b9e601160712f74ff46313579d0225a7f90ca3c +PKG_MIRROR_HASH:=988daefe649815d92055bcbe04db5fc0e386e44b3958c1300d8c327b4f04cadd +PKG_SOURCE_DATE:=2020-05-06 +PKG_SOURCE_VERSION:=eec16e2f275dc3dcf71e4a27dd608d3dc8f8df1a CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From 5019a06fc1027fad35fc9847735218c1057f8483 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Wed, 6 May 2020 21:29:08 +0200 Subject: [PATCH 7/7] ppp: Fix mirror hash Fixes: ae06a650d680 ("ppp: update to version 2.4.8.git-2020-03-21") Signed-off-by: Hauke Mehrtens --- package/network/services/ppp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile index 03f88e13ac..2f6bf40eef 100644 --- a/package/network/services/ppp/Makefile +++ b/package/network/services/ppp/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/paulusmack/ppp PKG_SOURCE_DATE:=2020-03-21 PKG_SOURCE_VERSION:=41a73232c16e9a063cfe3fad461c94af3f450f6c -PKG_MIRROR_HASH:=cf284c312b0c90974d11f8aeece173bcac8475f5b810911f4feb2c5a4db263fe +PKG_MIRROR_HASH:=7b966003b7c1bec95156159119b52583778405f0229dc7590911fa93f031552b PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=BSD-4-Clause PKG_CPE_ID:=cpe:/a:samba:ppp