From cda641ce135a783d46afefada6c8a6fcfa2bc247 Mon Sep 17 00:00:00 2001 From: Beginner <70857188+Beginner-Go@users.noreply.github.com> Date: Sat, 3 Apr 2021 10:18:26 +0800 Subject: [PATCH 01/10] v2ray: update to 4.37.0 --- package/lean/v2ray/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/v2ray/Makefile b/package/lean/v2ray/Makefile index bf7a2c8d64..2350121370 100644 --- a/package/lean/v2ray/Makefile +++ b/package/lean/v2ray/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray -PKG_VERSION:=4.36.2 +PKG_VERSION:=4.37.0 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/v2ray-core-$(PKG_VERSION) PKG_SOURCE:=v2ray-core-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=e7f7ceefd4cd9d2e57d18cecf55228a5a126c6ed5ee53767660601c35e70535c +PKG_HASH:=64cd43776802493b43d33b0038b71c227cc54ace79164cf19d47c0c1c85aaaf2 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE From 6c146b7ef38aafec880af7bb230ede753f61d907 Mon Sep 17 00:00:00 2001 From: lllrrr2 <61368564+lllrrr2@users.noreply.github.com> Date: Sat, 3 Apr 2021 19:08:33 +0800 Subject: [PATCH 02/10] trojan-go: Update to 0.8.3 Signed-off-by: Tianling Shen --- package/lienol/trojan-go/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lienol/trojan-go/Makefile b/package/lienol/trojan-go/Makefile index 4e28714d19..b57b08a939 100644 --- a/package/lienol/trojan-go/Makefile +++ b/package/lienol/trojan-go/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=trojan-go -PKG_VERSION:=0.8.2 -PKG_RELEASE:=2 +PKG_VERSION:=0.8.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/p4gefau1t/trojan-go/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=a335006813067f70763596c41ddf09454b151899b356661b055eb9113ec3081b +PKG_HASH:=dbfb536328327bcbbd310b7289ece47d40dcc6aaf7996b563f0e1041e120fb89 PKG_CONFIG_DEPENDS:= \ CONFIG_TROJAN_GO_COMPRESS_GOPROXY \ From 54a9b2e5ab64ac402070ba00b61fc66fc88660ce Mon Sep 17 00:00:00 2001 From: Tony Ambardar Date: Sun, 28 Mar 2021 01:12:22 -0700 Subject: [PATCH 03/10] bpftools: drop unneeded libintl linking for NLS There is no direct linking of libintl from bpftools, only secondary linking through libelf, so remove "-lintl" from TARGET_LDFLAGS. Fixes: 5582fbd6135f ("bpftools: support NLS, fix ppc build and update to 5.8.9") Signed-off-by: Tony Ambardar --- package/network/utils/bpftools/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/network/utils/bpftools/Makefile b/package/network/utils/bpftools/Makefile index 15bed2d89e..9955d361f4 100644 --- a/package/network/utils/bpftools/Makefile +++ b/package/network/utils/bpftools/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bpftools PKG_VERSION:=5.11.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=linux-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/kernel/v5.x @@ -93,10 +93,6 @@ ifneq ($(BUILD_VARIANT),lib) TARGET_LDFLAGS += -Wl,--gc-sections endif -ifneq ($(INTL_FULL),) - TARGET_LDFLAGS += -Wl,-lintl -endif - MAKE_FLAGS += \ EXTRA_CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ From c6bce19b090fd07463d3e51fb3b27c2b75d65c5f Mon Sep 17 00:00:00 2001 From: Tony Ambardar Date: Sun, 28 Mar 2021 00:40:31 -0700 Subject: [PATCH 04/10] binutils: fix libbfd missing DSO dependency if NLS enabled The libbfd package definition uses $(ICONV_DEPENDS) and $(INTL_DEPENDS) but links against neither, leading to libbfd detection failures in other packages (e.g. bpftools) and on-target relocation problems with libintl.so: root@OpenWrt:/# ldd /usr/lib/libbfd.so ldd (0x77db6000) libc.so => ldd (0x77db6000) libgcc_s.so.1 => /lib/libgcc_s.so.1 (0x77c6d000) Error relocating /usr/lib/libbfd.so: libintl_dgettext: symbol not found Add NLS-conditional linking of "libintl" to fix this. Also remove libbfd package dependency $(ICONV_DEPENDS) which is not used during building or linking. Tested with QEMU on malta/be32, after building all packages from binutils, bpftools and iproute2, using different libc options musl and glibc. Fixes: 08e817569630 ("binutils: use nls.mk to fix libbfd link errors in other packages") Signed-off-by: Tony Ambardar --- package/devel/binutils/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/devel/binutils/Makefile b/package/devel/binutils/Makefile index 23f1ea9c25..790fb1e91a 100644 --- a/package/devel/binutils/Makefile +++ b/package/devel/binutils/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=binutils PKG_VERSION:=2.35.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=@GNU/binutils PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz @@ -34,7 +34,7 @@ define Package/libbfd SECTION:=libs CATEGORY:=Libraries TITLE:=libbfd - DEPENDS:=+zlib $(ICONV_DEPENDS) $(INTL_DEPENDS) + DEPENDS:=+zlib $(INTL_DEPENDS) endef define Package/libctf @@ -79,6 +79,8 @@ endef TARGET_CFLAGS += $(FPIC) -Wno-unused-value +TARGET_LDFLAGS += $(if $(INTL_FULL),-lintl) + CONFIGURE_ARGS += \ --host=$(REAL_GNU_TARGET_NAME) \ --target=$(REAL_GNU_TARGET_NAME) \ From c5ad183ddeee1af3838ae96f2b2b4bd3b62bcbf0 Mon Sep 17 00:00:00 2001 From: Tony Ambardar Date: Sat, 27 Mar 2021 05:43:03 -0700 Subject: [PATCH 05/10] iproute2: fix libbpf detection with NLS enabled Upstream iproute2 detects libbpf using a one-line $CC test-compile, which normally ignores LDFLAGS. With NLS enabled however, LDFLAGS includes an "rpath-link" linker option needed to resolve libintl.so. Its absence causes both the compile and libbpf detection to fail: ld: warning: libintl.so.8, needed by libbpf.so, not found (try using -rpath or -rpath-link) ld: libelf.so.1: undefined reference to `libintl_dgettext' collect2: error: ld returned 1 exit status Fix this by directly including $LDFLAGS in the test-compile command. Reported-by: Ian Cooper Signed-off-by: Tony Ambardar --- package/network/utils/iproute2/Makefile | 2 +- .../patches/190-fix-nls-rpath-link.patch | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 package/network/utils/iproute2/patches/190-fix-nls-rpath-link.patch diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index 78269abc81..fe4d3dd8f6 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 PKG_VERSION:=5.11.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2 diff --git a/package/network/utils/iproute2/patches/190-fix-nls-rpath-link.patch b/package/network/utils/iproute2/patches/190-fix-nls-rpath-link.patch new file mode 100644 index 0000000000..d0f8cec633 --- /dev/null +++ b/package/network/utils/iproute2/patches/190-fix-nls-rpath-link.patch @@ -0,0 +1,20 @@ +--- a/configure ++++ b/configure +@@ -259,7 +259,7 @@ int main(int argc, char **argv) { + } + EOF + +- $CC -o $TMPDIR/libbpf_test $TMPDIR/libbpf_test.c $LIBBPF_CFLAGS $LIBBPF_LDLIBS >/dev/null 2>&1 ++ $CC -o $TMPDIR/libbpf_test $TMPDIR/libbpf_test.c $LIBBPF_CFLAGS $LIBBPF_LDLIBS $LDFLAGS >/dev/null 2>&1 + local ret=$? + + rm -f $TMPDIR/libbpf_test.c $TMPDIR/libbpf_test +@@ -277,7 +277,7 @@ int main(int argc, char **argv) { + } + EOF + +- $CC -o $TMPDIR/libbpf_sec_test $TMPDIR/libbpf_sec_test.c $LIBBPF_CFLAGS $LIBBPF_LDLIBS >/dev/null 2>&1 ++ $CC -o $TMPDIR/libbpf_sec_test $TMPDIR/libbpf_sec_test.c $LIBBPF_CFLAGS $LIBBPF_LDLIBS $LDFLAGS >/dev/null 2>&1 + local ret=$? + + rm -f $TMPDIR/libbpf_sec_test.c $TMPDIR/libbpf_sec_test From 2c898cfb59f7e0eb0a488bc213b29f648464536c Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Sun, 28 Mar 2021 10:45:08 +0200 Subject: [PATCH 06/10] base-files: fix status display command If service() is called w/o parameter then the status display for services with multiple instances is incorrect. E.g. samba4 or wpad have 2 instances. Signed-off-by: Alexander Egorenkov --- package/base-files/files/etc/shinit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/base-files/files/etc/shinit b/package/base-files/files/etc/shinit index 8c64e81563..0a1ebcc832 100755 --- a/package/base-files/files/etc/shinit +++ b/package/base-files/files/etc/shinit @@ -22,7 +22,7 @@ service() { printf "%-30s\t%10s\t%10s\n" "$F" \ $( $($F enabled) && echo "enabled" || echo "disabled" ) \ $( [ "$(ubus call service list "{ 'verbose': true, 'name': '$(basename $F)' }" \ - | jsonfilter -q -e "@.$(basename $F).instances[*].running")" = "true" ] \ + | jsonfilter -q -e "@.$(basename $F).instances[*].running" | uniq)" = "true" ] \ && echo "running" || echo "stopped" ) done; return 1 From 2515f96050f2d5539b05ccedbe61f7af647798b9 Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Thu, 1 Apr 2021 14:36:32 +0100 Subject: [PATCH 07/10] zram-swap: clean up the makefile Break dependencies into separate lines, to improve the readability. Trim trailing whitespace. Signed-off-by: Rui Salvaterra --- package/system/zram-swap/Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/package/system/zram-swap/Makefile b/package/system/zram-swap/Makefile index 18c6afee96..80f87fcdff 100644 --- a/package/system/zram-swap/Makefile +++ b/package/system/zram-swap/Makefile @@ -17,14 +17,20 @@ include $(INCLUDE_DIR)/package.mk define Package/zram-swap SECTION:=utils CATEGORY:=Base system - DEPENDS:=+kmod-zram +@BUSYBOX_CONFIG_MKSWAP +@BUSYBOX_CONFIG_SWAPON +@BUSYBOX_CONFIG_FEATURE_SWAPON_DISCARD +@BUSYBOX_CONFIG_FEATURE_SWAPON_PRI +@BUSYBOX_CONFIG_SWAPOFF + DEPENDS:= \ + +@BUSYBOX_CONFIG_FEATURE_SWAPON_DISCARD \ + +@BUSYBOX_CONFIG_FEATURE_SWAPON_PRI \ + +@BUSYBOX_CONFIG_MKSWAP \ + +@BUSYBOX_CONFIG_SWAPOFF \ + +@BUSYBOX_CONFIG_SWAPON \ + +kmod-zram TITLE:=ZRAM swap scripts PKGARCH:=all endef define Package/zram-swap/description - A script to activate swaping on a compressed zram partition. This - could be used to increase the available memory, by using compressed + A script to activate swaping on a compressed zram partition. This + could be used to increase the available memory, by using compressed memory. endef From 8bdc2362e815e8268169b36076bf8aa70c658836 Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Thu, 1 Apr 2021 14:36:33 +0100 Subject: [PATCH 08/10] zram-swap: bail out early if the kernel doesn't support swap Since KERNEL_SWAP is only enabled by default for !SMALL_FLASH targets, we need to check if the current kernel supports swap before trying to configure zram-swap, as opkg can't check for kernel dependencies. Signed-off-by: Rui Salvaterra --- package/system/zram-swap/files/zram.init | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/system/zram-swap/files/zram.init b/package/system/zram-swap/files/zram.init index e0b87e9711..2899f53f2e 100755 --- a/package/system/zram-swap/files/zram.init +++ b/package/system/zram-swap/files/zram.init @@ -149,6 +149,11 @@ zram_compact() start() { + [ -e /proc/swaps ] || { + logger -s -t zram_start -p daemon.crit "kernel doesn't support swap" + return 1 + } + if [ $( grep -cs zram /proc/swaps ) -ne 0 ]; then logger -s -t zram_start -p daemon.notice "[OK] zram swap is already mounted" return 1 From 0c6e721a785058370a52f585f6bd32254009ae82 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 4 Apr 2021 20:08:14 +0800 Subject: [PATCH 09/10] kernel: bump to 4.9.264, 4.14.228, 4.19.184 Resolve conflicted: - generic/pending-4.19/611-netfilter_match_bypass_default_table.patch Refreshed all patches. Signed-off-by: Tianling Shen --- include/kernel-version.mk | 12 ++-- ...90-net-generalize-napi_complete_done.patch | 6 +- ...k-events-support-multiple-registrant.patch | 2 +- ...etfilter_match_bypass_default_checks.patch | 2 +- ...netfilter_match_bypass_default_table.patch | 4 +- .../302-dts-support-layerscape.patch | 56 +++++++++---------- ...-sun8i-Handle-integrated-external-MD.patch | 2 +- ...stmmac-sun8i-Restore-the-compatibles.patch | 2 +- ...-r8152-add-LED-configuration-from-OF.patch | 8 +-- 9 files changed, 47 insertions(+), 47 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index e552e3ea52..70e6eb2916 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.9 = .262 -LINUX_VERSION-4.14 = .227 -LINUX_VERSION-4.19 = .183 +LINUX_VERSION-4.9 = .264 +LINUX_VERSION-4.14 = .228 +LINUX_VERSION-4.19 = .184 -LINUX_KERNEL_HASH-4.9.262 = b22e764095362d9e63d76375db838d9372474ba5cbe6132c9a8b07f7533f07ff -LINUX_KERNEL_HASH-4.14.227 = 0722d3c4bc056ccee24d3d08792ba81b228a457ee4ed9c6f40bb1f407612e0c7 -LINUX_KERNEL_HASH-4.19.183 = bacfd95ddf51df70b2962fc685b5217fc449e644f16996e49d87eb259b84a5f5 +LINUX_KERNEL_HASH-4.9.264 = ecc62a94388b722d8bd924d9d021805f5fe180616c7d4c9bfee62766c46ec2b5 +LINUX_KERNEL_HASH-4.14.228 = 15074d44ab330bba00518df1c86d3d2c304a34514d70958c0529a9d28d93815b +LINUX_KERNEL_HASH-4.19.184 = 3dfaf6aae242cb4165d2c0df3405558264f86c3b04f7bbef71b99c83a87ab77c remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch index e978a171b3..00d414c2d7 100644 --- a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch +++ b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch @@ -137,7 +137,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/can/c_can/c_can.c +++ b/drivers/net/can/c_can/c_can.c -@@ -1105,7 +1105,7 @@ static int c_can_poll(struct napi_struct +@@ -1093,7 +1093,7 @@ static int c_can_poll(struct napi_struct end: if (work_done < quota) { @@ -181,7 +181,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/can/m_can/m_can.c +++ b/drivers/net/can/m_can/m_can.c -@@ -730,7 +730,7 @@ static int m_can_poll(struct napi_struct +@@ -727,7 +727,7 @@ static int m_can_poll(struct napi_struct work_done += m_can_do_rx_poll(dev, (quota - work_done)); if (work_done < quota) { @@ -1324,7 +1324,7 @@ Signed-off-by: David S. Miller return rxd_done; --- a/drivers/net/wan/fsl_ucc_hdlc.c +++ b/drivers/net/wan/fsl_ucc_hdlc.c -@@ -578,7 +578,7 @@ static int ucc_hdlc_poll(struct napi_str +@@ -582,7 +582,7 @@ static int ucc_hdlc_poll(struct napi_str howmany += hdlc_rx_done(priv, budget - howmany); if (howmany < budget) { diff --git a/target/linux/generic/hack-4.19/952-net-conntrack-events-support-multiple-registrant.patch b/target/linux/generic/hack-4.19/952-net-conntrack-events-support-multiple-registrant.patch index 266624bdc3..710cbe2bcf 100644 --- a/target/linux/generic/hack-4.19/952-net-conntrack-events-support-multiple-registrant.patch +++ b/target/linux/generic/hack-4.19/952-net-conntrack-events-support-multiple-registrant.patch @@ -295,7 +295,7 @@ struct nf_conn *ct = item->ct; struct sk_buff *skb; unsigned int type; -@@ -3481,9 +3494,15 @@ static int ctnetlink_stat_exp_cpu(struct +@@ -3482,9 +3495,15 @@ static int ctnetlink_stat_exp_cpu(struct } #ifdef CONFIG_NF_CONNTRACK_EVENTS diff --git a/target/linux/generic/pending-4.19/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/pending-4.19/610-netfilter_match_bypass_default_checks.patch index d7a47305cf..1691146825 100644 --- a/target/linux/generic/pending-4.19/610-netfilter_match_bypass_default_checks.patch +++ b/target/linux/generic/pending-4.19/610-netfilter_match_bypass_default_checks.patch @@ -69,7 +69,7 @@ Signed-off-by: Felix Fietkau return -ENOMEM; @@ -821,6 +849,7 @@ copy_entries_to_user(unsigned int total_ - const struct xt_table_info *private = xt_table_get_private_protected(table); + const struct xt_table_info *private = table->private; int ret = 0; const void *loc_cpu_entry; + u8 flags; diff --git a/target/linux/generic/pending-4.19/611-netfilter_match_bypass_default_table.patch b/target/linux/generic/pending-4.19/611-netfilter_match_bypass_default_table.patch index 3c586d08cc..ba976b0751 100644 --- a/target/linux/generic/pending-4.19/611-netfilter_match_bypass_default_table.patch +++ b/target/linux/generic/pending-4.19/611-netfilter_match_bypass_default_table.patch @@ -48,7 +48,7 @@ Signed-off-by: Felix Fietkau /* Initialization */ + WARN_ON(!(table->valid_hooks & (1 << hook))); + local_bh_disable(); -+ private = rcu_access_pointer(table->private); ++ private = READ_ONCE(table->private); /* Address dependency. */ + cpu = smp_processor_id(); + table_base = private->entries; + @@ -80,7 +80,7 @@ Signed-off-by: Felix Fietkau - WARN_ON(!(table->valid_hooks & (1 << hook))); - local_bh_disable(); addend = xt_write_recseq_begin(); -- private = rcu_access_pointer(table->private); +- private = READ_ONCE(table->private); /* Address dependency. */ - cpu = smp_processor_id(); - table_base = private->entries; jumpstack = (struct ipt_entry **)private->jumpstack[cpu]; diff --git a/target/linux/layerscape/patches-4.14/302-dts-support-layerscape.patch b/target/linux/layerscape/patches-4.14/302-dts-support-layerscape.patch index 6723627785..51797cc6dd 100644 --- a/target/linux/layerscape/patches-4.14/302-dts-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/302-dts-support-layerscape.patch @@ -1679,7 +1679,7 @@ Signed-off-by: Zhao Qiang }; }; -@@ -247,7 +229,7 @@ +@@ -248,7 +230,7 @@ dcfg: dcfg@1ee0000 { compatible = "fsl,ls1012a-dcfg", "syscon"; @@ -1688,7 +1688,7 @@ Signed-off-by: Zhao Qiang big-endian; }; -@@ -304,44 +286,25 @@ +@@ -305,44 +287,25 @@ #thermal-sensor-cells = <1>; }; @@ -1744,7 +1744,7 @@ Signed-off-by: Zhao Qiang status = "disabled"; }; -@@ -351,7 +314,20 @@ +@@ -352,7 +315,20 @@ #size-cells = <0>; reg = <0x0 0x2190000 0x0 0x10000>; interrupts = <0 57 IRQ_TYPE_LEVEL_HIGH>; @@ -1765,7 +1765,7 @@ Signed-off-by: Zhao Qiang status = "disabled"; }; -@@ -400,6 +376,20 @@ +@@ -401,6 +377,20 @@ big-endian; }; @@ -1786,7 +1786,7 @@ Signed-off-by: Zhao Qiang sai1: sai@2b50000 { #sound-dai-cells = <0>; compatible = "fsl,vf610-sai"; -@@ -451,6 +441,8 @@ +@@ -452,6 +442,8 @@ dr_mode = "host"; snps,quirk-frame-length-adjustment = <0x20>; snps,dis_rxdet_inp3_quirk; @@ -1795,7 +1795,7 @@ Signed-off-by: Zhao Qiang }; sata: sata@3200000 { -@@ -471,5 +463,85 @@ +@@ -472,5 +464,85 @@ dr_mode = "host"; phy_type = "ulpi"; }; @@ -3100,7 +3100,7 @@ Signed-off-by: Zhao Qiang scfg: scfg@1570000 { compatible = "fsl,ls1043a-scfg", "syscon"; reg = <0x0 0x1570000 0x0 0x10000>; -@@ -255,7 +285,7 @@ +@@ -256,7 +286,7 @@ dcfg: dcfg@1ee0000 { compatible = "fsl,ls1043a-dcfg", "syscon"; @@ -3109,7 +3109,7 @@ Signed-off-by: Zhao Qiang big-endian; }; -@@ -342,36 +372,7 @@ +@@ -343,36 +373,7 @@ #thermal-sensor-cells = <1>; }; @@ -3147,7 +3147,7 @@ Signed-off-by: Zhao Qiang qman: qman@1880000 { compatible = "fsl,qman"; -@@ -422,7 +423,7 @@ +@@ -423,7 +424,7 @@ }; i2c0: i2c@2180000 { @@ -3156,7 +3156,7 @@ Signed-off-by: Zhao Qiang #address-cells = <1>; #size-cells = <0>; reg = <0x0 0x2180000 0x0 0x10000>; -@@ -432,6 +433,7 @@ +@@ -433,6 +434,7 @@ dmas = <&edma0 1 39>, <&edma0 1 38>; dma-names = "tx", "rx"; @@ -3164,7 +3164,7 @@ Signed-off-by: Zhao Qiang status = "disabled"; }; -@@ -536,6 +538,72 @@ +@@ -537,6 +539,72 @@ #interrupt-cells = <2>; }; @@ -3237,7 +3237,7 @@ Signed-off-by: Zhao Qiang lpuart0: serial@2950000 { compatible = "fsl,ls1021a-lpuart"; reg = <0x0 0x2950000 0x0 0x1000>; -@@ -590,6 +658,16 @@ +@@ -591,6 +659,16 @@ status = "disabled"; }; @@ -3254,7 +3254,7 @@ Signed-off-by: Zhao Qiang wdog0: wdog@2ad0000 { compatible = "fsl,ls1043a-wdt", "fsl,imx21-wdt"; reg = <0x0 0x2ad0000 0x0 0x10000>; -@@ -615,41 +693,81 @@ +@@ -616,41 +694,81 @@ <&clockgen 4 0>; }; @@ -3371,7 +3371,7 @@ Signed-off-by: Zhao Qiang }; msi1: msi-controller1@1571000 { -@@ -678,13 +796,13 @@ +@@ -679,13 +797,13 @@ reg = <0x00 0x03400000 0x0 0x00100000 /* controller registers */ 0x40 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; @@ -3389,7 +3389,7 @@ Signed-off-by: Zhao Qiang num-lanes = <4>; bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000 /* downstream I/O */ -@@ -696,6 +814,7 @@ +@@ -697,6 +815,7 @@ <0000 0 0 2 &gic 0 111 0x4>, <0000 0 0 3 &gic 0 112 0x4>, <0000 0 0 4 &gic 0 113 0x4>; @@ -3397,7 +3397,7 @@ Signed-off-by: Zhao Qiang }; pcie@3500000 { -@@ -703,13 +822,13 @@ +@@ -704,13 +823,13 @@ reg = <0x00 0x03500000 0x0 0x00100000 /* controller registers */ 0x48 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; @@ -3415,7 +3415,7 @@ Signed-off-by: Zhao Qiang num-lanes = <2>; bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x48 0x00010000 0x0 0x00010000 /* downstream I/O */ -@@ -721,6 +840,7 @@ +@@ -722,6 +841,7 @@ <0000 0 0 2 &gic 0 121 0x4>, <0000 0 0 3 &gic 0 122 0x4>, <0000 0 0 4 &gic 0 123 0x4>; @@ -3423,7 +3423,7 @@ Signed-off-by: Zhao Qiang }; pcie@3600000 { -@@ -728,13 +848,13 @@ +@@ -729,13 +849,13 @@ reg = <0x00 0x03600000 0x0 0x00100000 /* controller registers */ 0x50 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; @@ -3441,7 +3441,7 @@ Signed-off-by: Zhao Qiang num-lanes = <2>; bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x50 0x00010000 0x0 0x00010000 /* downstream I/O */ -@@ -746,6 +866,14 @@ +@@ -747,6 +867,14 @@ <0000 0 0 2 &gic 0 155 0x4>, <0000 0 0 3 &gic 0 156 0x4>, <0000 0 0 4 &gic 0 157 0x4>; @@ -3456,7 +3456,7 @@ Signed-off-by: Zhao Qiang }; }; -@@ -753,3 +881,29 @@ +@@ -754,3 +882,29 @@ #include "qoriq-qman-portals.dtsi" #include "qoriq-bman-portals.dtsi" @@ -4662,7 +4662,7 @@ Signed-off-by: Zhao Qiang scfg: scfg@1570000 { compatible = "fsl,ls1046a-scfg", "syscon"; reg = <0x0 0x1570000 0x0 0x10000>; -@@ -362,36 +369,7 @@ +@@ -363,36 +370,7 @@ #thermal-sensor-cells = <1>; }; @@ -4700,7 +4700,7 @@ Signed-off-by: Zhao Qiang dspi: dspi@2100000 { compatible = "fsl,ls1021a-v1.0-dspi"; -@@ -407,7 +385,7 @@ +@@ -408,7 +386,7 @@ }; i2c0: i2c@2180000 { @@ -4709,7 +4709,7 @@ Signed-off-by: Zhao Qiang #address-cells = <1>; #size-cells = <0>; reg = <0x0 0x2180000 0x0 0x10000>; -@@ -416,6 +394,7 @@ +@@ -417,6 +395,7 @@ dmas = <&edma0 1 39>, <&edma0 1 38>; dma-names = "tx", "rx"; @@ -4717,7 +4717,7 @@ Signed-off-by: Zhao Qiang status = "disabled"; }; -@@ -440,12 +419,13 @@ +@@ -441,12 +420,13 @@ }; i2c3: i2c@21b0000 { @@ -4732,7 +4732,7 @@ Signed-off-by: Zhao Qiang status = "disabled"; }; -@@ -571,6 +551,15 @@ +@@ -572,6 +552,15 @@ status = "disabled"; }; @@ -4748,7 +4748,7 @@ Signed-off-by: Zhao Qiang wdog0: watchdog@2ad0000 { compatible = "fsl,imx21-wdt"; reg = <0x0 0x2ad0000 0x0 0x10000>; -@@ -595,40 +584,81 @@ +@@ -596,40 +585,81 @@ <&clockgen 4 1>; }; @@ -4864,7 +4864,7 @@ Signed-off-by: Zhao Qiang }; msi1: msi-controller@1580000 { -@@ -661,6 +691,125 @@ +@@ -662,6 +692,125 @@ ; }; @@ -4990,7 +4990,7 @@ Signed-off-by: Zhao Qiang }; reserved-memory { -@@ -689,7 +838,36 @@ +@@ -690,7 +839,36 @@ no-map; }; }; diff --git a/target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch b/target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch index 9f7f89c7e2..90266eeed3 100644 --- a/target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch +++ b/target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch @@ -468,7 +468,7 @@ Signed-off-by: David S. Miller /* platform data specifying hardware features and callbacks. * hardware features were copied from Allwinner drivers. -@@ -979,9 +1047,34 @@ static int sun8i_dwmac_probe(struct plat +@@ -981,9 +1049,34 @@ static int sun8i_dwmac_probe(struct plat ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); if (ret) diff --git a/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch b/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch index 0e8d808b42..c496e06f69 100644 --- a/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch +++ b/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch @@ -18,7 +18,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c -@@ -1078,6 +1078,14 @@ return ret; +@@ -1080,6 +1080,14 @@ return ret; } static const struct of_device_id sun8i_dwmac_match[] = { diff --git a/target/linux/sunxi/patches-4.19/022-net-usb-r8152-add-LED-configuration-from-OF.patch b/target/linux/sunxi/patches-4.19/022-net-usb-r8152-add-LED-configuration-from-OF.patch index c595508c97..54b70982c5 100644 --- a/target/linux/sunxi/patches-4.19/022-net-usb-r8152-add-LED-configuration-from-OF.patch +++ b/target/linux/sunxi/patches-4.19/022-net-usb-r8152-add-LED-configuration-from-OF.patch @@ -22,7 +22,7 @@ Signed-off-by: David Bauer #include #include #include -@@ -4006,6 +4007,22 @@ static void rtl_tally_reset(struct r8152 +@@ -3978,6 +3979,22 @@ static void rtl_tally_reset(struct r8152 ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data); } @@ -45,7 +45,7 @@ Signed-off-by: David Bauer static void r8152b_init(struct r8152 *tp) { u32 ocp_data; -@@ -4047,6 +4064,8 @@ static void r8152b_init(struct r8152 *tp +@@ -4019,6 +4036,8 @@ static void r8152b_init(struct r8152 *tp ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); @@ -54,7 +54,7 @@ Signed-off-by: David Bauer } static void r8153_init(struct r8152 *tp) -@@ -4168,6 +4187,8 @@ static void r8153_init(struct r8152 *tp) +@@ -4145,6 +4164,8 @@ static void r8153_init(struct r8152 *tp) tp->coalesce = COALESCE_SLOW; break; } @@ -63,7 +63,7 @@ Signed-off-by: David Bauer } static void r8153b_init(struct r8152 *tp) -@@ -4231,6 +4252,8 @@ static void r8153b_init(struct r8152 *tp +@@ -4208,6 +4229,8 @@ static void r8153b_init(struct r8152 *tp rtl_tally_reset(tp); tp->coalesce = 15000; /* 15 us */ From 282666dd837de30c195155f9d92d6f6d9054d21a Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 4 Apr 2021 20:38:52 +0800 Subject: [PATCH 10/10] uugamebooster: keep config when upgrade Signed-off-by: Tianling Shen --- package/lean/uugamebooster/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/lean/uugamebooster/Makefile b/package/lean/uugamebooster/Makefile index a6ea84be9a..925fc84676 100644 --- a/package/lean/uugamebooster/Makefile +++ b/package/lean/uugamebooster/Makefile @@ -69,6 +69,10 @@ endef define Build/Compile endef +define Package/$(PKG_NAME)/conffiles +/usr/share/$(PKG_NAME)/uu.conf +endef + define Package/$(PKG_NAME)/install # $(INSTALL_DIR) $(1)/etc/init.d # $(INSTALL_BIN) ./files/uugamebooster.init $(1)/etc/init.d/uuplugin