From 80f4988da31f7ccc01ad24aa1a4a68af2f6f5563 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 13 May 2016 16:32:23 +0200 Subject: [PATCH] target/imagebuilder: fix using new device profiles Signed-off-by: Felix Fietkau --- target/imagebuilder/files/Makefile | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index 1056a42ca3..e0dc0b9cea 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -72,20 +72,16 @@ OPKG:= \ --add-arch all:100 \ --add-arch $(ARCH_PACKAGES):200 -define Profile - $(eval $(call Profile/Default)) - $(eval $(call Profile/$(1))) - ifeq ($(USER_PROFILE),) - USER_PROFILE:=$(1) - endif - $(1)_NAME:=$(NAME) - $(1)_PACKAGES:=$(PACKAGES) - PROFILE_NAMES += $(1) - PROFILE_LIST += \ - echo '$(1):'; [ -z '$(NAME)' ] || echo ' $(NAME)'; echo ' Packages: $(PACKAGES)'; -endef - include $(INCLUDE_DIR)/target.mk +-include .profiles.mk + +USER_PROFILE ?= $(firstword $(PROFILE_NAMES)) +PROFILE_LIST = $(foreach p,$(PROFILE_NAMES), \ + echo '$(p):'; $(if $($(p)_NAME),echo ' $($(p)_NAME)'; ) echo ' Packages: $($(p)_PACKAGES)'; \ +) + +.profiles.mk: .targetinfo + $(SCRIPT_DIR)/metadata.pl profile_mk $< '$(BOARD)$(if $(SUBTARGET),/$(SUBTARGET))' > $@ staging_dir/host/.prereq-build: include/prereq-build.mk mkdir -p tmp -- 2.25.1