From fc6a935c0c2eb6df7ee10ae6d8ad86a1e30a5b46 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 24 Apr 2023 08:30:04 +0200 Subject: [PATCH 1/2] Fix v2ray --- v2ray-core/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/v2ray-core/Makefile b/v2ray-core/Makefile index 8fbc65d69..08d21ae81 100644 --- a/v2ray-core/Makefile +++ b/v2ray-core/Makefile @@ -89,6 +89,7 @@ define Package/v2ray-core/install $(INSTALL_DIR) $(1)/etc/v2ray/ $(INSTALL_DATA) $(PKG_BUILD_DIR)/release/config/config.json $(1)/etc/v2ray/ + $(CP) ./files/* $(1)/ # $(INSTALL_DIR) $(1)/etc/config/ # $(INSTALL_CONF) $(CURDIR)/files/v2ray.conf $(1)/etc/config/v2ray # $(INSTALL_DIR) $(1)/etc/init.d/ From ccead6d6560e9fc068bea5f9b9ee09e63284ee2e Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 24 Apr 2023 08:46:26 +0200 Subject: [PATCH 2/2] Disable aquantia on 5.15 and 6.1 kernel --- aquantia/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aquantia/Makefile b/aquantia/Makefile index dc8c8f46a..98b3f970c 100644 --- a/aquantia/Makefile +++ b/aquantia/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/phy-aquantia SUBMENU:=Network Devices TITLE:=aQuantia device support - DEPENDS:=@PCI_SUPPORT @TARGET_x86_64 +kmod-i2c-core +kmod-i2c-algo-bit +kmod-ptp +kmod-hwmon-core +kmod-libphy + DEPENDS:=@PCI_SUPPORT @TARGET_x86_64 @KERNEL_5_4 +kmod-i2c-core +kmod-i2c-algo-bit +kmod-ptp +kmod-hwmon-core +kmod-libphy KCONFIG:=CONFIG_AQUANTIA_PHY HIDDEN:=1 FILES:=$(LINUX_DIR)/drivers/net/phy/aquantia.ko