From b17c722b7e729f0042cf9dccbe09fc4ad67a071c Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sun, 3 Jul 2011 17:38:23 +0000 Subject: automatic subtarget enumaration git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27407 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/target.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/target.mk b/include/target.mk index 676b983271..cfd7c9f3c3 100644 --- a/include/target.mk +++ b/include/target.mk @@ -17,9 +17,6 @@ DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg hotplug2 DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe kmod-ipt-nathelper firewall DEFAULT_PACKAGES.bootloader:= -# Add device specific packages -DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE)) - ifneq ($(DUMP),) all: dumpinfo endif @@ -30,6 +27,9 @@ ifeq ($(DUMP),) SUBTARGET:=$(strip $(foreach subdir,$(patsubst $(PLATFORM_DIR)/%/target.mk,%,$(wildcard $(PLATFORM_DIR)/*/target.mk)),$(if $(CONFIG_TARGET_$(call target_conf,$(BOARD)_$(subdir))),$(subdir)))) else PLATFORM_DIR:=${CURDIR} + ifeq ($(SUBTARGETS),) + SUBTARGETS:=$(strip $(patsubst $(PLATFORM_DIR)/%/target.mk,%,$(wildcard $(PLATFORM_DIR)/*/target.mk))) + endif endif TARGETID:=$(BOARD)$(if $(SUBTARGET),/$(SUBTARGET)) @@ -48,6 +48,9 @@ else endif endif +# Add device specific packages (here below to allow device type set from subtarget) +DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE)) + define Profile/Default NAME:= PACKAGES:= -- cgit v1.2.3