From 4e926a15bb3574d547824c16699221efa4bde9e3 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 7 May 2021 17:20:52 +0800 Subject: [PATCH] target: tweak default packages Signed-off-by: Tianling Shen --- include/target.mk | 44 +++++++++++++++++++++-------------- target/linux/ipq40xx/Makefile | 2 +- target/linux/ipq806x/Makefile | 2 +- target/linux/x86/Makefile | 2 +- 4 files changed, 30 insertions(+), 20 deletions(-) diff --git a/include/target.mk b/include/target.mk index be7d8644ed..2912ea46cd 100644 --- a/include/target.mk +++ b/include/target.mk @@ -13,34 +13,19 @@ DEVICE_TYPE?=router DEFAULT_PACKAGES:=\ base-files \ ca-bundle \ - ca-certificates \ - coreutils \ - default-settings \ dropbear \ fstools \ - kmod-ipt-raw \ - kmod-nf-nathelper \ - kmod-nf-nathelper-extra \ libc \ libgcc \ libustream-openssl \ logd \ - luci \ - luci-app-cpufreq \ - luci-app-turboacc \ - luci-compat \ - luci-lib-base \ - luci-lib-fs \ - luci-lib-ipkg \ - luci-proto-relay \ mtd \ netifd \ opkg \ uci \ uclient-fetch \ urandom-seed \ - urngd \ - wget + urngd ifneq ($(CONFIG_SELINUX),) DEFAULT_PACKAGES+=busybox-selinux procd-selinux @@ -49,7 +34,32 @@ DEFAULT_PACKAGES+=busybox procd endif # For the basic set -DEFAULT_PACKAGES.basic:= +DEFAULT_PACKAGES.basic:=\ + 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 # For nas targets DEFAULT_PACKAGES.nas:=\ block-mount \ diff --git a/target/linux/ipq40xx/Makefile b/target/linux/ipq40xx/Makefile index 90f212d3a1..86135490a3 100644 --- a/target/linux/ipq40xx/Makefile +++ b/target/linux/ipq40xx/Makefile @@ -20,6 +20,6 @@ DEFAULT_PACKAGES += \ kmod-ath10k-ct wpad-openssl \ kmod-usb3 kmod-usb-dwc3 ath10k-firmware-qca4019-ct \ autocore-arm automount luci-app-cpufreq \ - ca-certificates htop fdisk e2fsprogs ethtool + fdisk e2fsprogs ethtool $(eval $(call BuildTarget)) diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile index d1b861ed5c..9f4dedb810 100644 --- a/target/linux/ipq806x/Makefile +++ b/target/linux/ipq806x/Makefile @@ -20,7 +20,7 @@ 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-basic-wolfssl \ + kmod-ath10k-ct wpad-openssl \ uboot-envtools autocore-arm $(eval $(call BuildTarget)) diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index cb8969288f..a2f09d0bba 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -22,7 +22,7 @@ DEFAULT_PACKAGES += partx-utils mkf2fs fdisk e2fsprogs kmod-button-hotplug wpad 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 ca-certificates + htop lm-sensors autocore-x86 luci-proto-bonding $(eval $(call BuildTarget))