From b091dedde6fd74d660fa54e78d8bf541193abc7d Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Wed, 9 Mar 2022 10:35:04 +0800 Subject: [PATCH 1/3] kernel/modules: add kmod-inet-diag package Signed-off-by: Tianling Shen (cherry picked from commit 41d8f0e982079790d9bfe32743278f6c17a633f8) --- package/kernel/linux/modules/netsupport.mk | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index 454d3e4519..2b25942b7f 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -1300,3 +1300,28 @@ define KernelPackage/netlink-diag/description endef $(eval $(call KernelPackage,netlink-diag)) + + +define KernelPackage/inet-diag + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=INET diag support for ss utility + KCONFIG:= \ + CONFIG_INET_DIAG \ + CONFIG_INET_TCP_DIAG \ + CONFIG_INET_UDP_DIAG \ + CONFIG_INET_RAW_DIAG \ + CONFIG_INET_DIAG_DESTROY=n + FILES:= \ + $(LINUX_DIR)/net/ipv4/inet_diag.ko \ + $(LINUX_DIR)/net/ipv4/tcp_diag.ko \ + $(LINUX_DIR)/net/ipv4/udp_diag.ko \ + $(LINUX_DIR)/net/ipv4/raw_diag.ko + AUTOLOAD:=$(call AutoLoad,31,inet_diag tcp_diag udp_diag raw_diag) +endef + +define KernelPackage/inet-diag/description +Support for INET (TCP, DCCP, etc) socket monitoring interface used by +native Linux tools such as ss. +endef + +$(eval $(call KernelPackage,inet-diag)) From 80ee6a4538ef288a0cdc23c5804064d829f31409 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 13 Mar 2022 16:52:39 +0800 Subject: [PATCH 2/3] base-files: update default banner Signed-off-by: Tianling Shen (cherry picked from commit 29c5695d928459ac37e8f5c1936861f3c2bfabf3) --- package/base-files/files/etc/banner | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/package/base-files/files/etc/banner b/package/base-files/files/etc/banner index f3af3c014f..336f3ef443 100644 --- a/package/base-files/files/etc/banner +++ b/package/base-files/files/etc/banner @@ -1,8 +1,10 @@ - _______ ________ __ - | |.-----.-----.-----.| | | |.----.| |_ - | - || _ | -__| || | | || _|| _| - |_______|| __|_____|__|__||________||__| |____| - |__| W I R E L E S S F R E E D O M +.___ __ .__ +| | _____ _____ ____________/ |______ | | +| |/ \ / \ / _ \_ __ \ __\__ \ | | +| | Y Y \ Y Y ( <_> ) | \/| | / __ \| |__ +|___|__|_| /__|_| /\____/|__| |__| (____ /____/ + \/ \/ \/ + BE FREE AND UNAFRAID ----------------------------------------------------- %D %V, %C ----------------------------------------------------- From fd6bc38dd6b361d98899c93d67a9045e887b3c95 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 13 Mar 2022 17:59:43 +0800 Subject: [PATCH 3/3] r8125/r8168: require PCI support Signed-off-by: Tianling Shen (cherry picked from commit 644bd5b27ab9b7e2fb1c5f0e9ec3438d26ecfc87) --- package/kernel/r8125/Makefile | 1 + package/kernel/r8168/Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/package/kernel/r8125/Makefile b/package/kernel/r8125/Makefile index 49cd4326ad..3694528e7d 100644 --- a/package/kernel/r8125/Makefile +++ b/package/kernel/r8125/Makefile @@ -18,6 +18,7 @@ define KernelPackage/r8125 TITLE:=Driver for Realtek r8125 chipsets SUBMENU:=Network Devices VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) + DEPENDS:=@PCI_SUPPORT FILES:= $(PKG_BUILD_DIR)/r8125.ko AUTOLOAD:=$(call AutoProbe,r8125) endef diff --git a/package/kernel/r8168/Makefile b/package/kernel/r8168/Makefile index fd5977a5ba..15316c0b21 100644 --- a/package/kernel/r8168/Makefile +++ b/package/kernel/r8168/Makefile @@ -26,6 +26,7 @@ define KernelPackage/r8168 TITLE:=Driver for Realtek r8168 chipsets SUBMENU:=Network Devices VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) + DEPENDS:=@PCI_SUPPORT FILES:= $(PKG_BUILD_DIR)/src/r8168.ko AUTOLOAD:=$(call AutoProbe,r8168) CONFLICTS:=kmod-r8169