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

imagebuilder: strip DEVICE_ prefix from profiles (FS#55)

Browse source 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-07-21 13:41:20 +02:00
parent ed90d50bc4
commit 8265fdcc4d
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/image.mk
View file

@ -327,7 +327,7 @@ define Device/Export
endef endef
ifdef IB ifdef IB
DEVICE_CHECK_PROFILE = $(filter $(1),$(PROFILE)) DEVICE_CHECK_PROFILE = $(filter $(1),DEVICE_$(PROFILE) $(PROFILE))
else else
DEVICE_CHECK_PROFILE = $(CONFIG_TARGET_$(if $(CONFIG_TARGET_MULTI_PROFILE),DEVICE_)$(call target_conf,$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET)))_$(1)) DEVICE_CHECK_PROFILE = $(CONFIG_TARGET_$(if $(CONFIG_TARGET_MULTI_PROFILE),DEVICE_)$(call target_conf,$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET)))_$(1))
endif endif

8
target/imagebuilder/files/Makefile
View file

@ -77,7 +77,7 @@ include $(INCLUDE_DIR)/target.mk
USER_PROFILE ?= $(firstword $(PROFILE_NAMES)) USER_PROFILE ?= $(firstword $(PROFILE_NAMES))
PROFILE_LIST = $(foreach p,$(PROFILE_NAMES), \ PROFILE_LIST = $(foreach p,$(PROFILE_NAMES), \
echo '$(p):'; $(if $($(p)_NAME),echo ' $($(p)_NAME)'; ) echo ' Packages: $($(p)_PACKAGES)'; \ echo '$(patsubst DEVICE_%,%,$(p)):'; $(if $($(p)_NAME),echo ' $($(p)_NAME)'; ) echo ' Packages: $($(p)_PACKAGES)'; \
) )
.profiles.mk: .targetinfo .profiles.mk: .targetinfo
@ -180,9 +180,11 @@ clean:
info: info:
(unset PROFILE FILES PACKAGES MAKEFLAGS; $(MAKE) -s _call_info) (unset PROFILE FILES PACKAGES MAKEFLAGS; $(MAKE) -s _call_info)
PROFILE_FILTER = $(filter DEVICE_$(PROFILE) $(PROFILE),$(PROFILE_NAMES))
image: image:
ifneq ($(PROFILE),) ifneq ($(PROFILE),)
ifeq ($(filter $(PROFILE),$(PROFILE_NAMES)),) ifeq ($(PROFILE_FILTER),)
@echo 'Profile "$(PROFILE)" does not exist!' @echo 'Profile "$(PROFILE)" does not exist!'
@echo 'Use "make info" to get a list of available profile names.' @echo 'Use "make info" to get a list of available profile names.'
@exit 1 @exit 1
@ -190,7 +192,7 @@ ifneq ($(PROFILE),)
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_FILTER)") \
$(if $(FILES),USER_FILES="$(FILES)") \ $(if $(FILES),USER_FILES="$(FILES)") \
$(if $(PACKAGES),USER_PACKAGES="$(PACKAGES)") \ $(if $(PACKAGES),USER_PACKAGES="$(PACKAGES)") \
$(if $(BIN_DIR),BIN_DIR="$(BIN_DIR)")) $(if $(BIN_DIR),BIN_DIR="$(BIN_DIR)"))