From 80abbb1656a00cce9067de30fad093ff95b8c62d Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Fri, 2 Jul 2021 22:17:15 +0800 Subject: [PATCH] x86: add luci-app-qbittorrent by default --- package/lean/luci-app-qbittorrent/Config.in | 13 ------------- package/lean/luci-app-qbittorrent/Makefile | 6 +++--- target/linux/x86/Makefile | 2 +- 3 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 package/lean/luci-app-qbittorrent/Config.in diff --git a/package/lean/luci-app-qbittorrent/Config.in b/package/lean/luci-app-qbittorrent/Config.in deleted file mode 100644 index dc107fc9f..000000000 --- a/package/lean/luci-app-qbittorrent/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -choice - prompt "qBittorrent Version" - default CONFIG_qBittorrent_Static - -config qBittorrent_Static - bool "qBittorrent Static Version" - depends on HAS_FPU - default y if x86_64||arm||aarch64 - -config qBittorrent_Nox - bool "qBittorrent Nox Version" - default y if !(x86_64||arm||aarch64) -endchoice diff --git a/package/lean/luci-app-qbittorrent/Makefile b/package/lean/luci-app-qbittorrent/Makefile index 07bbf6a08..62d41a27f 100644 --- a/package/lean/luci-app-qbittorrent/Makefile +++ b/package/lean/luci-app-qbittorrent/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-qbittorrent PKG_VERSION=1.0 -PKG_RELEASE:=21 +PKG_RELEASE:=22 include $(INCLUDE_DIR)/package.mk @@ -16,7 +16,7 @@ define Package/$(PKG_NAME)/config choice prompt "Build Version Selection" default PACKAGE_luci-app-qbittorrent_static if arm||aarch64||x86_64 - default PACKAGE_luci-app-qbittorrent_dynamic + default PACKAGE_luci-app-qbittorrent_dynamic if !(arm||aarch64||x86_64) config PACKAGE_luci-app-qbittorrent_static bool "Static Build" @@ -29,7 +29,7 @@ define Package/$(PKG_NAME)/config endef LUCI_TITLE:=LuCI support for qBittorrent -LUCI_DEPENDS:=+PACKAGE_luci-app-qbittorrent_static:qBittorrent-static +PACKAGE_luci-app-qbittorrent_dynamic:qBittorrent +LUCI_DEPENDS:=+PACKAGE_luci-app-qbittorrent_static:qBittorrent-static +PACKAGE_luci-app-qbittorrent_dynamic:qbittorrent LUCI_PKGARCH:=all include $(TOPDIR)/feeds/luci/luci.mk diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 0482fca76..da70be188 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs kmod-button-hotplug wpad kmod-usb-hid kmod-mmc-spi kmod-sdhci \ kmod-ath5k kmod-ath9k kmod-ath9k-htc kmod-ath10k kmod-rt2800-usb kmod-e1000e kmod-igb kmod-igc kmod-igbvf kmod-ixgbe kmod-ixgbevf kmod-pcnet32 kmod-tulip kmod-vmxnet3 kmod-i40e kmod-i40evf kmod-r8125 kmod-8139cp kmod-8139too kmod-fs-f2fs \ -htop lm-sensors autocore-x86 automount autosamba luci-app-adbyby-plus luci-app-ipsec-vpnd luci-proto-bonding luci-app-unblockmusic luci-app-zerotier luci-app-xlnetacc ddns-scripts_aliyun ddns-scripts_dnspod ca-certificates luci-app-uugamebooster \ +htop lm-sensors autocore-x86 automount autosamba luci-app-adbyby-plus luci-app-ipsec-vpnd luci-proto-bonding luci-app-unblockmusic luci-app-zerotier luci-app-xlnetacc ddns-scripts_aliyun ddns-scripts_dnspod ca-bundle luci-app-uugamebooster luci-app-qbittorrent \ ath10k-firmware-qca988x ath10k-firmware-qca9888 ath10k-firmware-qca9984 brcmfmac-firmware-43602a1-pcie \ kmod-sound-hda-core kmod-sound-hda-codec-realtek kmod-sound-hda-codec-via kmod-sound-via82xx kmod-sound-hda-intel kmod-sound-hda-codec-hdmi kmod-sound-i8x0 kmod-usb-audio \ kmod-usb-net kmod-usb-net-asix kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8150 kmod-usb-net-rtl8152-vendor kmod-mlx4-core kmod-mlx5-core