From 0fcadc18029970b74d6a4e4786137aba0f29ab01 Mon Sep 17 00:00:00 2001 From: Aes64X <47932152+Aes64X@users.noreply.github.com> Date: Thu, 28 Jan 2021 16:19:50 +0800 Subject: [PATCH 1/3] exFAT-oot: bump to 5.11.1 Signed-off-by: CN_SZTL --- package/kernel/exfat/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kernel/exfat/Makefile b/package/kernel/exfat/Makefile index 3f873a71ee..965db54a01 100644 --- a/package/kernel/exfat/Makefile +++ b/package/kernel/exfat/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=exfat -PKG_VERSION:=5.10.1 +PKG_VERSION:=5.11.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/namjaejeon/linux-exfat-oot/tar.gz/$(PKG_VERSION)? -PKG_HASH:=0ff77dd7d39eb231d00c3c4909b9fad31ebeeb618bd6fa18fce142becc9c1f98 +PKG_HASH:=85324f1edb1c03f65700164ba4f5750fe5cc7a8b956add321626be69149790f5 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-exfat-oot-$(PKG_VERSION) PKG_MAINTAINER:= From 61d995d4c3229850337308c00b0180bd44f696ba Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Fri, 29 Jan 2021 03:28:54 +0800 Subject: [PATCH 2/3] kernel: bump 4.19 to 4.19.171 Refreshed all patches. Signed-off-by: CN_SZTL --- include/kernel-version.mk | 4 ++-- ...d-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch | 2 +- ...06-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch | 2 +- .../generic/hack-4.19/661-use_fq_codel_by_default.patch | 2 +- target/linux/generic/hack-4.19/721-phy_packets.patch | 2 +- .../linux/generic/pending-4.19/110-ehci_hcd_ignore_oc.patch | 6 +++--- .../generic/pending-4.19/601-add-kernel-imq-support.patch | 6 +++--- .../690-net-add-support-for-threaded-NAPI-polling.patch | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index b0f6b54ca0..6e8696456c 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,11 +8,11 @@ endif LINUX_VERSION-4.9 = .253 LINUX_VERSION-4.14 = .217 -LINUX_VERSION-4.19 = .170 +LINUX_VERSION-4.19 = .171 LINUX_KERNEL_HASH-4.9.253 = 9a5b51a8350201bd38e3ff13909323a6571b4572a7b3caed76e462b07619bc18 LINUX_KERNEL_HASH-4.14.217 = 62a36a25431016d98d0f1cff98be432086c51f86fd79042bd10a867b3a924d11 -LINUX_KERNEL_HASH-4.19.170 = dd0d0264f8ef4363d0080054fd344470a73f07aca2cd673e91bf6e77fbe25b4a +LINUX_KERNEL_HASH-4.19.171 = f4e352fe0eb986e5b532b99d9b0725a67046cbb3e5f53fcd5b098cbaeb2ac60a 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/bcm27xx/patches-4.19/950-0636-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch b/target/linux/bcm27xx/patches-4.19/950-0636-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch index b686be0a67..d0416a0452 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0636-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0636-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch @@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell #define USB_VENDOR_ID_BELKIN 0x050d #define USB_DEVICE_ID_FLIP_KVM 0x3201 -@@ -1219,6 +1222,9 @@ +@@ -1220,6 +1223,9 @@ #define USB_VENDOR_ID_XAT 0x2505 #define USB_DEVICE_ID_XAT_CSR 0x0220 diff --git a/target/linux/brcm63xx/patches-4.19/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch b/target/linux/brcm63xx/patches-4.19/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch index 9159b14d3c..2fa5a00212 100644 --- a/target/linux/brcm63xx/patches-4.19/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch +++ b/target/linux/brcm63xx/patches-4.19/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch @@ -21,7 +21,7 @@ Signed-off-by: Jonas Gorski --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -666,6 +666,10 @@ int ehci_setup(struct usb_hcd *hcd) +@@ -678,6 +678,10 @@ int ehci_setup(struct usb_hcd *hcd) /* cache this readonly data; minimize chip reads */ ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); diff --git a/target/linux/generic/hack-4.19/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-4.19/661-use_fq_codel_by_default.patch index 398c143108..a5d78a3dd3 100644 --- a/target/linux/generic/hack-4.19/661-use_fq_codel_by_default.patch +++ b/target/linux/generic/hack-4.19/661-use_fq_codel_by_default.patch @@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau device, it has to decide which ones to send first, which ones to --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c -@@ -2162,7 +2162,7 @@ static int __init pktsched_init(void) +@@ -2163,7 +2163,7 @@ static int __init pktsched_init(void) return err; } diff --git a/target/linux/generic/hack-4.19/721-phy_packets.patch b/target/linux/generic/hack-4.19/721-phy_packets.patch index 2b4e652c4b..1b1e3645b4 100644 --- a/target/linux/generic/hack-4.19/721-phy_packets.patch +++ b/target/linux/generic/hack-4.19/721-phy_packets.patch @@ -136,7 +136,7 @@ Signed-off-by: Felix Fietkau #include #include -@@ -560,6 +561,22 @@ skb_fail: +@@ -564,6 +565,22 @@ skb_fail: } EXPORT_SYMBOL(__napi_alloc_skb); diff --git a/target/linux/generic/pending-4.19/110-ehci_hcd_ignore_oc.patch b/target/linux/generic/pending-4.19/110-ehci_hcd_ignore_oc.patch index b58d2b7383..ea236d3138 100644 --- a/target/linux/generic/pending-4.19/110-ehci_hcd_ignore_oc.patch +++ b/target/linux/generic/pending-4.19/110-ehci_hcd_ignore_oc.patch @@ -17,7 +17,7 @@ Signed-off-by: Florian Fainelli --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -639,7 +639,7 @@ static int ehci_run (struct usb_hcd *hcd +@@ -651,7 +651,7 @@ static int ehci_run (struct usb_hcd *hcd "USB %x.%x started, EHCI %x.%02x%s\n", ((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f), temp >> 8, temp & 0xff, @@ -28,7 +28,7 @@ Signed-off-by: Florian Fainelli &ehci->regs->intr_enable); /* Turn On Interrupts */ --- a/drivers/usb/host/ehci-hub.c +++ b/drivers/usb/host/ehci-hub.c -@@ -640,7 +640,7 @@ ehci_hub_status_data (struct usb_hcd *hc +@@ -643,7 +643,7 @@ ehci_hub_status_data (struct usb_hcd *hc * always set, seem to clear PORT_OCC and PORT_CSC when writing to * PORT_POWER; that's surprising, but maybe within-spec. */ @@ -37,7 +37,7 @@ Signed-off-by: Florian Fainelli mask = PORT_CSC | PORT_PEC | PORT_OCC; else mask = PORT_CSC | PORT_PEC; -@@ -1010,7 +1010,7 @@ int ehci_hub_control( +@@ -1013,7 +1013,7 @@ int ehci_hub_control( if (temp & PORT_PEC) status |= USB_PORT_STAT_C_ENABLE << 16; diff --git a/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch b/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch index 921a4871d6..4da67810d5 100644 --- a/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch +++ b/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch @@ -1427,7 +1427,7 @@ /** * skb_panic - private function for out-of-line support -@@ -620,6 +672,28 @@ void skb_release_head_state(struct sk_bu +@@ -624,6 +676,28 @@ void skb_release_head_state(struct sk_bu WARN_ON(in_irq()); skb->destructor(skb); } @@ -1456,7 +1456,7 @@ #if IS_ENABLED(CONFIG_NF_CONNTRACK) nf_conntrack_put(skb_nfct(skb)); #endif -@@ -809,6 +883,9 @@ static void __copy_skb_header(struct sk_ +@@ -813,6 +887,9 @@ static void __copy_skb_header(struct sk_ new->sp = secpath_get(old->sp); #endif __nf_copy(new, old, false); @@ -1466,7 +1466,7 @@ /* Note : this field could be in headers_start/headers_end section * It is not yet because we do not want to have a 16 bit hole -@@ -3980,6 +4057,13 @@ void __init skb_init(void) +@@ -3984,6 +4061,13 @@ void __init skb_init(void) 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); diff --git a/target/linux/generic/pending-4.19/690-net-add-support-for-threaded-NAPI-polling.patch b/target/linux/generic/pending-4.19/690-net-add-support-for-threaded-NAPI-polling.patch index 08708a3ad7..439230cd96 100644 --- a/target/linux/generic/pending-4.19/690-net-add-support-for-threaded-NAPI-polling.patch +++ b/target/linux/generic/pending-4.19/690-net-add-support-for-threaded-NAPI-polling.patch @@ -264,7 +264,7 @@ Signed-off-by: Felix Fietkau /* Some drivers may have called napi_schedule * prior to exhausting their budget. */ -@@ -9906,6 +9965,10 @@ static int __init net_dev_init(void) +@@ -9911,6 +9970,10 @@ static int __init net_dev_init(void) sd->backlog.weight = weight_p; } From 7c67cf7e48e993eabc1bc3ba75117ba6ffdb4ff3 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Fri, 29 Jan 2021 04:21:54 +0800 Subject: [PATCH 3/3] ipt2socks-alt: fix build dir Fixes: dca292d0f1ee3b488b63e4884bb1a92ef38831da ("ipt2socks-alt: add package") Signed-off-by: CN_SZTL --- package/ctcgfw/ipt2socks-alt/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ctcgfw/ipt2socks-alt/Makefile b/package/ctcgfw/ipt2socks-alt/Makefile index 5b4098554a..e892f50959 100644 --- a/package/ctcgfw/ipt2socks-alt/Makefile +++ b/package/ctcgfw/ipt2socks-alt/Makefile @@ -16,6 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/zfl9/ipt2socks/tar.gz/v$(PKG_VERSION)? PKG_HASH:=f247d72b61b1f40ce347904c43523bff257fc9f00ff269ecccf06f1d0f4b9d5e +PKG_BUILD_DIR:=$(BUILD_DIR)/$(firstword $(subst -, ,$(PKG_NAME)))-$(PKG_VERSION) PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1