From 057e5f6edee34e6bbd49dfe6f9944a3ba1936719 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 29 May 2020 18:40:03 +0200 Subject: [PATCH] treewide: provide consistent basic DEVICE_TYPE While the effective "default" based on frequent use is "router", the DEVICE_TYPE variable actually provides a "basic" configuration without selecting any additional packages. This is currently set up with the identifier "bootloader", which seems to be not used at all. However, the only targets not using "router" or "nas" are actually archs38 and arc770, which use their own value "developerboard" for DEVICE_TYPE which seems to have been invented when these targets where added. The latter is not implemented in target.mk, though, and will fall back to the "basic" set of packages then. So, to clean this up and make it more readable, let's just define a DEVICE_TYPE "basic" and use it for the aforementioned cases. Cc: Christian Lamparter Cc: Sungbo Eo Cc: Linus Walleij Signed-off-by: Adrian Schmutzler --- include/target.mk | 3 ++- target/linux/arc770/Makefile | 2 +- target/linux/archs38/Makefile | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/target.mk b/include/target.mk index 9bd4c14936c..a2ceb7f783f 100644 --- a/include/target.mk +++ b/include/target.mk @@ -14,11 +14,12 @@ 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 urandom-seed urngd +# For the basic set +DEFAULT_PACKAGES.basic:= # For nas targets DEFAULT_PACKAGES.nas:=block-mount fdisk lsblk mdadm # For router targets DEFAULT_PACKAGES.router:=dnsmasq iptables ip6tables ppp ppp-mod-pppoe firewall odhcpd-ipv6only odhcp6c kmod-ipt-offload -DEFAULT_PACKAGES.bootloader:= ifneq ($(DUMP),) all: dumpinfo diff --git a/target/linux/arc770/Makefile b/target/linux/arc770/Makefile index 8150f147c5a..018d6e54489 100644 --- a/target/linux/arc770/Makefile +++ b/target/linux/arc770/Makefile @@ -13,7 +13,7 @@ SUBTARGETS:=generic KERNEL_PATCHVER:=4.14 -DEVICE_TYPE:=developerboard +DEVICE_TYPE:=basic define Target/Description Synopsys DesignWare boards diff --git a/target/linux/archs38/Makefile b/target/linux/archs38/Makefile index 55708a09b0a..5b3650ef8de 100644 --- a/target/linux/archs38/Makefile +++ b/target/linux/archs38/Makefile @@ -14,7 +14,7 @@ SUBTARGETS:=generic KERNEL_PATCHVER:=5.4 -DEVICE_TYPE:=developerboard +DEVICE_TYPE:=basic define Target/Description Synopsys DesignWare boards -- 2.30.2