From 50930de0486e3068a905b43b4741785fc8c8e062 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 11 Sep 2021 05:08:08 +0800 Subject: [PATCH] target: drop some default packages Let users to decide build them or not. Signed-off-by: Tianling Shen (cherry picked from commit 8b51e8c3083e8369236ba385b321074b13a2764e) --- include/target.mk | 15 +-------------- target/linux/ipq40xx/Makefile | 3 +-- target/linux/ipq806x/Makefile | 3 +-- target/linux/rockchip/Makefile | 3 +-- target/linux/x86/Makefile | 11 ++++++----- 5 files changed, 10 insertions(+), 25 deletions(-) diff --git a/include/target.mk b/include/target.mk index 91b6a01682..69bcc641cf 100644 --- a/include/target.mk +++ b/include/target.mk @@ -51,31 +51,18 @@ DEFAULT_PACKAGES.router:=\ # For easy usage DEFAULT_PACKAGES.tweak:=\ block-mount \ - ca-certificates \ - coreutils \ - ddns-scripts_aliyun \ - ddns-scripts_dnspod \ default-settings \ kmod-ipt-raw \ kmod-nf-nathelper \ kmod-nf-nathelper-extra \ luci \ - luci-app-accesscontrol \ - luci-app-arpbind \ luci-app-cpufreq \ - luci-app-ddns \ luci-app-filetransfer \ luci-app-turboacc \ - luci-app-ramfree \ - luci-app-ssr-plus \ - luci-app-vlmcsd \ - luci-app-wol \ luci-compat \ luci-lib-base \ luci-lib-fs \ - luci-lib-ipkg \ - luci-proto-relay \ - wget-ssl + luci-lib-ipkg ifneq ($(DUMP),) all: dumpinfo diff --git a/target/linux/ipq40xx/Makefile b/target/linux/ipq40xx/Makefile index 8c85cc11a4..67626cf8ef 100644 --- a/target/linux/ipq40xx/Makefile +++ b/target/linux/ipq40xx/Makefile @@ -19,7 +19,6 @@ DEFAULT_PACKAGES += \ kmod-leds-gpio kmod-gpio-button-hotplug swconfig \ kmod-ath10k-ct wpad-openssl \ kmod-usb3 kmod-usb-dwc3 ath10k-firmware-qca4019-ct \ - autocore-arm automount luci-app-cpufreq \ - fdisk e2fsprogs ethtool uboot-envtools + autocore-arm e2fsprogs uboot-envtools $(eval $(call BuildTarget)) diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile index 9f4dedb810..dc55dcdf6a 100644 --- a/target/linux/ipq806x/Makefile +++ b/target/linux/ipq806x/Makefile @@ -20,7 +20,6 @@ DEFAULT_PACKAGES += \ kmod-ata-ahci kmod-ata-ahci-platform \ kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \ kmod-phy-qcom-ipq806x-usb kmod-usb3 kmod-usb-dwc3-qcom \ - kmod-ath10k-ct wpad-openssl \ - uboot-envtools autocore-arm + kmod-ath10k-ct wpad-openssl uboot-envtools autocore-arm $(eval $(call BuildTarget)) diff --git a/target/linux/rockchip/Makefile b/target/linux/rockchip/Makefile index da07f0b3f9..acac24c13f 100644 --- a/target/linux/rockchip/Makefile +++ b/target/linux/rockchip/Makefile @@ -16,8 +16,7 @@ endef include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += uboot-envtools partx-utils e2fsprogs mkf2fs kmod-gpio-button-hotplug \ - automount autocore-arm fdisk e2fsprogs ethtool haveged htop lm-sensors \ - luci-app-zerotier + automount autocore-arm fdisk e2fsprogs ethtool KERNELNAME:=Image dtbs diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index a2f09d0bba..d8418904ec 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -18,11 +18,12 @@ KERNELNAME:=bzImage include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += partx-utils mkf2fs fdisk e2fsprogs kmod-button-hotplug 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 kmod-i40e kmod-i40evf kmod-r8125 kmod-8139cp kmod-8139too kmod-fs-f2fs \ - ath10k-firmware-qca988x ath10k-firmware-qca9888 ath10k-firmware-qca9984 brcmfmac-firmware-43602a1-pcie \ - alsa-utils kmod-ac97 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 \ - htop lm-sensors autocore-x86 luci-proto-bonding + kmod-e1000e kmod-igb kmod-igbvf kmod-ixgbe kmod-pcnet32 kmod-tulip kmod-vmxnet3 \ + kmod-i40e kmod-i40evf kmod-r8125 kmod-8139cp kmod-8139too kmod-fs-f2fs alsa-utils \ + kmod-ac97 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 autocore-x86 automount $(eval $(call BuildTarget))