crans/openwrt-chaoscalmer-uappro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

imagebuilder: fail with error if the passed profile name does not exist

Browse source 
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43916 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2015-01-10 18:19:59 +00:00
parent cb3d17832d
commit 07d1e5f1f9
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
target/imagebuilder/files/Makefile
View file

@ -78,6 +78,7 @@ define Profile
endif endif
$(1)_NAME:=$(NAME) $(1)_NAME:=$(NAME)
$(1)_PACKAGES:=$(PACKAGES) $(1)_PACKAGES:=$(PACKAGES)
PROFILE_NAMES += $(1)
PROFILE_LIST += \ PROFILE_LIST += \
echo '$(1):'; [ -z '$(NAME)' ] || echo ' $(NAME)'; echo ' Packages: $(PACKAGES)'; echo '$(1):'; [ -z '$(NAME)' ] || echo ' $(NAME)'; echo ' Packages: $(PACKAGES)';
endef endef
@ -167,6 +168,13 @@ info:
(unset PROFILE FILES PACKAGES MAKEFLAGS; $(MAKE) -s _call_info) (unset PROFILE FILES PACKAGES MAKEFLAGS; $(MAKE) -s _call_info)
image: image:
ifneq ($(PROFILE),)
ifeq ($(filter $(PROFILE),$(PROFILE_NAMES)),)
@echo 'Profile "$(PROFILE)" does not exist!'
@echo 'Use "make info" to get a list of available profile names.'
@exit 1
endif
endif
(unset PROFILE FILES PACKAGES MAKEFLAGS; \ (unset PROFILE FILES PACKAGES MAKEFLAGS; \
$(MAKE) _call_image \ $(MAKE) _call_image \
$(if $(PROFILE),USER_PROFILE="$(PROFILE)") \ $(if $(PROFILE),USER_PROFILE="$(PROFILE)") \