From 6add79ce4412b471d90fdf9de33ee009d7f769f5 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Tue, 29 Jun 2021 22:37:51 +0800 Subject: [PATCH] fix luci-app-turboacc dependence --- include/target.mk | 2 +- package/lean/dnsproxy/Makefile | 2 +- package/lean/luci-app-turboacc/Makefile | 2 +- target/linux/ipq40xx/Makefile | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/target.mk b/include/target.mk index c922c9ac5..2f5d2669d 100644 --- a/include/target.mk +++ b/include/target.mk @@ -50,7 +50,7 @@ DEFAULT_PACKAGES.router:=\ default-settings luci luci-app-ddns luci-app-upnp luci-app-autoreboot \ luci-app-filetransfer luci-app-vsftpd luci-app-ssr-plus luci-app-unblockmusic luci-app-arpbind \ luci-app-vlmcsd luci-app-wol luci-app-ramfree \ - luci-app-flowoffload luci-app-nlbwmon luci-app-accesscontrol \ + luci-app-turboacc luci-app-nlbwmon luci-app-accesscontrol \ ddns-scripts_aliyun ddns-scripts_dnspod ifneq ($(DUMP),) diff --git a/package/lean/dnsproxy/Makefile b/package/lean/dnsproxy/Makefile index 7222efba3..de4229945 100644 --- a/package/lean/dnsproxy/Makefile +++ b/package/lean/dnsproxy/Makefile @@ -29,7 +29,7 @@ GO_PKG_LDFLAGS:=-s -w GO_PKG_LDFLAGS_X:=main.VersionString=v$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk -include ../../lang/golang/golang-package.mk +include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk define Package/dnsproxy/config config DNSPROXY_COMPRESS_GOPROXY diff --git a/package/lean/luci-app-turboacc/Makefile b/package/lean/luci-app-turboacc/Makefile index 9bc9cc56a..09e80eb63 100644 --- a/package/lean/luci-app-turboacc/Makefile +++ b/package/lean/luci-app-turboacc/Makefile @@ -50,6 +50,6 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_TURBOACC_INCLUDE_OFFLOADING \ CONFIG_PACKAGE_TURBOACC_INCLUDE_SHORTCUT_FE -include ../../luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/target/linux/ipq40xx/Makefile b/target/linux/ipq40xx/Makefile index 76a176f0d..2bdd14abb 100644 --- a/target/linux/ipq40xx/Makefile +++ b/target/linux/ipq40xx/Makefile @@ -19,7 +19,6 @@ DEFAULT_PACKAGES += \ kmod-ath10k wpad-openssl \ kmod-usb3 kmod-usb-dwc3 ath10k-firmware-qca4019 \ autocore-arm automount autosamba luci-app-adbyby-plus luci-app-ipsec-vpnd luci-app-unblockmusic luci-app-cpufreq luci-app-zerotier \ - htop ethtool luci-app-cpufreq \ - -luci-app-flowoffload luci-app-sfe + htop ethtool luci-app-cpufreq $(eval $(call BuildTarget))