From 07d1e5f1f9f67c7e2b0ad1add392ea16f292de40 Mon Sep 17 00:00:00 2001 From: jow Date: Sat, 10 Jan 2015 18:19:59 +0000 Subject: [PATCH] imagebuilder: fail with error if the passed profile name does not exist Signed-off-by: Jo-Philipp Wich git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43916 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/imagebuilder/files/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index 8136111b67..f3bfec1e31 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -78,6 +78,7 @@ define Profile endif $(1)_NAME:=$(NAME) $(1)_PACKAGES:=$(PACKAGES) + PROFILE_NAMES += $(1) PROFILE_LIST += \ echo '$(1):'; [ -z '$(NAME)' ] || echo ' $(NAME)'; echo ' Packages: $(PACKAGES)'; endef @@ -167,6 +168,13 @@ info: (unset PROFILE FILES PACKAGES MAKEFLAGS; $(MAKE) -s _call_info) 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; \ $(MAKE) _call_image \ $(if $(PROFILE),USER_PROFILE="$(PROFILE)") \ -- 2.11.0