From: Felix Fietkau <nbd@nbd.name>
Date: Sun, 15 May 2016 15:44:10 +0000 (+0200)
Subject: image.mk: fix emitting profiles for targets that have no subtargets
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ace946152dd0806b25bcb3812b33ab5df95966b7;p=openwrt%2Fstaging%2Flynxis.git

image.mk: fix emitting profiles for targets that have no subtargets

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/include/image.mk b/include/image.mk
index 67879b3780..7dbaa7818c 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -20,7 +20,6 @@ DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts
 
 sanitize = $(call tolower,$(subst _,-,$(1)))
 
-SUBTARGET ?= default
 DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST))
 EXTRA_NAME_SANITIZED=$(call sanitize,$(EXTRA_IMAGE_NAME))
 
@@ -475,7 +474,7 @@ define Device/Export
 endef
 
 define Device/Check
-  _TARGET = $$(if $$(and $$(filter $(SUBTARGET),$$(SUBTARGETS)),$$(filter $(PROFILE),$$(PROFILES) DEVICE_$(1))),install,install-disabled)
+  _TARGET = $$(if $$(and $(if $(SUBTARGET),,1)$$(filter $(SUBTARGET),$$(SUBTARGETS)),$$(filter $(PROFILE),$$(PROFILES) DEVICE_$(1))),install,install-disabled)
   _COMPILE_TARGET = $$(if $(if $(IB),,$(CONFIG_IB)$$(filter $(PROFILE),$$(PROFILES) DEVICE_$(1))),compile,compile-disabled)
 endef
 
@@ -563,7 +562,7 @@ $(DEVICE_DESCRIPTION)
 
 endef
 
-DEVICE_PROFILE_CHECK=$(and $(DEVICE_TITLE),$(filter $(SUBTARGET),$(SUBTARGETS)))
+DEVICE_PROFILE_CHECK=$(and $(DEVICE_TITLE),$(if $(SUBTARGET),,1)$(filter $(SUBTARGET),$(SUBTARGETS)))
 
 define Device/Dump
 $$(eval $$(if $$(DEVICE_PROFILE_CHECK),$$(info $$(call Device/DumpInfo,$(1)))))
diff --git a/include/target.mk b/include/target.mk
index 08e0a62af6..0666df63a1 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -274,7 +274,7 @@ endif
 
 CUR_SUBTARGET:=$(SUBTARGET)
 ifeq ($(SUBTARGETS),)
-  CUR_SUBTARGET ?= default
+  CUR_SUBTARGET := default
 endif
 
 define BuildTargets/DumpCurrent