From f47089ddf8b4af33af6466f79bd4eb00b9482450 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Sat, 6 Apr 2019 00:15:38 +0800 Subject: [PATCH] target: adjust some packages --- include/target.mk | 2 +- package/lean/automount/Makefile | 12 ++---------- target/linux/ipq40xx/image/Makefile | 2 +- target/linux/x86/Makefile | 3 ++- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/include/target.mk b/include/target.mk index a9b141419..736fb9f7b 100644 --- a/include/target.mk +++ b/include/target.mk @@ -13,7 +13,7 @@ __target_inc=1 DEVICE_TYPE?=router # Default packages - the really basic set -DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch logd block-mount \ +DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch logd block-mount automount \ kmod-nf-nathelper kmod-nf-nathelper-extra kmod-ipt-raw \ default-settings luci luci-app-ddns luci-app-sqm luci-app-upnp luci-app-adbyby-plus luci-app-autoreboot \ luci-app-filetransfer luci-app-ssr-plus luci-app-vsftpd ddns-scripts_aliyun \ diff --git a/package/lean/automount/Makefile b/package/lean/automount/Makefile index e4d20f222..3f000ba23 100644 --- a/package/lean/automount/Makefile +++ b/package/lean/automount/Makefile @@ -9,23 +9,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=automount PKG_VERSION:=1 -PKG_RELEASE:=23 +PKG_RELEASE:=25 PKG_ARCH:=all -PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_NTFS-3G - include $(INCLUDE_DIR)/package.mk -define Package/$(PKG_NAME)/config -config PACKAGE_$(PKG_NAME)_NTFS-3G - bool "Support NTFS mount" - default n -endef - define Package/automount TITLE:=Mount autoconfig hotplug script. MAINTAINER:=Lean - DEPENDS:=+block-mount +kmod-usb-storage +kmod-usb-storage-extras +kmod-fs-vfat +kmod-fs-ext4 +PACKAGE_$(PKG_NAME)_NTFS-3G:ntfs-3g + DEPENDS:=+block-mount +kmod-usb-storage +kmod-usb-storage-extras +kmod-fs-vfat +kmod-fs-ext4 +ntfs-3g endef define Package/automount/description diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile index c3a1cbd5e..2121a6416 100644 --- a/target/linux/ipq40xx/image/Makefile +++ b/target/linux/ipq40xx/image/Makefile @@ -106,7 +106,7 @@ define Device/asus_rt-acrh17 KERNEL_INITRAMFS := $$(KERNEL) | uImage none KERNEL_INITRAMFS_SUFFIX := -factory.trx IMAGES := sysupgrade.bin - DEVICE_PACKAGES := ipq-wifi-rt-acrh17 ath10k-firmware-qca9984 kmod-ath10k ath10k-firmware-qca4019 -kmod-ath10k-ct -ath10k-firmware-qca4019-ct + DEVICE_PACKAGES := ipq-wifi-rt-acrh17 ath10k-firmware-qca9984 kmod-ath10k ath10k-firmware-qca4019 endef TARGET_DEVICES += asus_rt-acrh17 diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 7985848b1..b153ae739 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -23,7 +23,8 @@ DEFAULT_PACKAGES += partx-utils mkf2fs fdisk e2fsprogs wpad kmod-usb-hid \ kmod-ath5k kmod-ath9k kmod-ath9k-htc kmod-ath10k kmod-rt2800-usb kmod-e1000e kmod-igb kmod-igbvf kmod-ixgbe kmod-pcnet32 kmod-tulip kmod-vmxnet3 htop lm-sensors autocore automount autosamba luci-app-zerotier luci-app-ipsec-vpnd luci-app-pptp-server luci-proto-bonding luci-app-zerotier \ ath10k-firmware-qca988x ath10k-firmware-qca9888 ath10k-firmware-qca9984 brcmfmac-firmware-43602a1-pcie intel-microcode amd64-microcode\ alsa-utils kmod-ac97 kmod-sound-hda-core kmod-sound-hda-codec-realtek kmod-sound-hda-codec-via kmod-sound-via82xx kmod-usb-audio \ -kmod-usb-net kmod-usb-net-asix kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8150 kmod-usb-net-rtl8152 +kmod-usb-net kmod-usb-net-asix kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8150 kmod-usb-net-rtl8152 \ +shadowsocks-libev-ss-redir v2ray shadowsocksr-libev-server shadowsocksr-libev-ssr-local $(eval $(call BuildTarget))