KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-05-15 17:44:10 +02:00
parent ce21e18d57
commit ace946152d
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/image.mk
View file

@ -20,7 +20,6 @@ DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts
sanitize = $(call tolower,$(subst _,-,$(1))) sanitize = $(call tolower,$(subst _,-,$(1)))
SUBTARGET ?= default
DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST)) DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST))
EXTRA_NAME_SANITIZED=$(call sanitize,$(EXTRA_IMAGE_NAME)) EXTRA_NAME_SANITIZED=$(call sanitize,$(EXTRA_IMAGE_NAME))
@ -475,7 +474,7 @@ define Device/Export
endef endef
define Device/Check 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) _COMPILE_TARGET = $$(if $(if $(IB),,$(CONFIG_IB)$$(filter $(PROFILE),$$(PROFILES) DEVICE_$(1))),compile,compile-disabled)
endef endef
@ -563,7 +562,7 @@ $(DEVICE_DESCRIPTION)
endef 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 define Device/Dump
$$(eval $$(if $$(DEVICE_PROFILE_CHECK),$$(info $$(call Device/DumpInfo,$(1))))) $$(eval $$(if $$(DEVICE_PROFILE_CHECK),$$(info $$(call Device/DumpInfo,$(1)))))

2
include/target.mk
View file

@ -274,7 +274,7 @@ endif
CUR_SUBTARGET:=$(SUBTARGET) CUR_SUBTARGET:=$(SUBTARGET)
ifeq ($(SUBTARGETS),) ifeq ($(SUBTARGETS),)
CUR_SUBTARGET ?= default CUR_SUBTARGET := default
endif endif
define BuildTargets/DumpCurrent define BuildTargets/DumpCurrent