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

build: optimize target metadata dump

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 43019
This commit is contained in:
Felix Fietkau 2014-10-22 08:57:25 +00:00
parent 20a3814a9c
commit cc43532293
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/target.mk
View file

@ -63,8 +63,8 @@ ifndef Profile
define Profile define Profile
$(eval $(call Profile/Default)) $(eval $(call Profile/Default))
$(eval $(call Profile/$(1))) $(eval $(call Profile/$(1)))
$(eval $(call shexport,Profile/$(1)/Config)) dumpinfo : $(call shexport,Profile/$(1)/Config)
$(eval $(call shexport,Profile/$(1)/Description)) dumpinfo : $(call shexport,Profile/$(1)/Description)
DUMPINFO += \ DUMPINFO += \
echo "Target-Profile: $(1)"; \ echo "Target-Profile: $(1)"; \
echo "Target-Profile-Name: $(NAME)"; \ echo "Target-Profile-Name: $(NAME)"; \
@ -73,10 +73,10 @@ define Profile
echo "Target-Profile-Kconfig: yes"; \ echo "Target-Profile-Kconfig: yes"; \
fi; \ fi; \
echo "Target-Profile-Config: "; \ echo "Target-Profile-Config: "; \
$(SH_FUNC) getvar "$(call shvar,Profile/$(1)/Config)"; \ echo "$$$$$$$$$(call shvar,Profile/$(1)/Config)"; \
echo "@@"; \ echo "@@"; \
echo "Target-Profile-Description:"; \ echo "Target-Profile-Description:"; \
$(SH_FUNC) getvar "$(call shvar,Profile/$(1)/Description)"; \ echo "$$$$$$$$$(call shvar,Profile/$(1)/Description)"; \
echo "@@"; \ echo "@@"; \
echo; echo;
ifeq ($(CONFIG_TARGET_$(call target_conf,$(BOARD)_$(if $(SUBTARGET),$(SUBTARGET)_))$(1)),y) ifeq ($(CONFIG_TARGET_$(call target_conf,$(BOARD)_$(if $(SUBTARGET),$(SUBTARGET)_))$(1)),y)
@ -104,8 +104,6 @@ else
endif endif
endif endif
$(eval $(call shexport,Target/Description))
ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),) ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),)
include $(INCLUDE_DIR)/kernel-version.mk include $(INCLUDE_DIR)/kernel-version.mk
endif endif
@ -259,6 +257,7 @@ endif
define BuildTargets/DumpCurrent define BuildTargets/DumpCurrent
.PHONY: dumpinfo .PHONY: dumpinfo
dumpinfo : export DESCRIPTION=$$(Target/Description)
dumpinfo: dumpinfo:
@echo 'Target: $(TARGETID)'; \ @echo 'Target: $(TARGETID)'; \
echo 'Target-Board: $(BOARD)'; \ echo 'Target-Board: $(BOARD)'; \
@ -273,9 +272,9 @@ define BuildTargets/DumpCurrent
echo 'Linux-Version: $(LINUX_VERSION)'; \ echo 'Linux-Version: $(LINUX_VERSION)'; \
echo 'Linux-Release: $(LINUX_RELEASE)'; \ echo 'Linux-Release: $(LINUX_RELEASE)'; \
echo 'Linux-Kernel-Arch: $(LINUX_KARCH)'; \ echo 'Linux-Kernel-Arch: $(LINUX_KARCH)'; \
$(if $(SUBTARGET),,$(if $(DEFAULT_SUBTARGET), echo 'Default-Subtarget: $(DEFAULT_SUBTARGET)'; )) $(if $(SUBTARGET),,$(if $(DEFAULT_SUBTARGET), echo 'Default-Subtarget: $(DEFAULT_SUBTARGET)'; )) \
echo 'Target-Description:'; \ echo 'Target-Description:'; \
$(SH_FUNC) getvar $(call shvar,Target/Description); \ echo "$$$$DESCRIPTION"; \
echo '@@'; \ echo '@@'; \
echo 'Default-Packages: $(DEFAULT_PACKAGES) $(call extra_packages,$(DEFAULT_PACKAGES))'; \ echo 'Default-Packages: $(DEFAULT_PACKAGES) $(call extra_packages,$(DEFAULT_PACKAGES))'; \
$(DUMPINFO) $(DUMPINFO)