commit 17fd41103dc4ea6a57839aec376f212c674f83c9 Author: Pau Escrich Date: Sat Oct 19 17:01:00 2013 +0200 Add support for specify the full output image name in targets.mk diff --git a/Makefile b/Makefile index ddfcc07..4f40e2d 100644 --- a/Makefile +++ b/Makefile @@ -53,9 +53,11 @@ $(eval $(if $(TARGET),,TARGET=$(T))) $(eval $(if $(TBUILD),,TBUILD=$(TARGET))) BUILD_PATH=$(BUILD_DIR)/$(TBUILD) -#Getting output image paths -IMAGE_PATH = $(IMAGE) -SIMAGE_PATH = $(SYSUPGRADE) +#Getting output image paths and names +IMAGE_PATH = $(shell echo "$(IMAGE)" | cut -d " " -f1) +IM_NAME= $(shell echo "$(IMAGE)" | cut -d " " -f2) +SIMAGE_PATH = $(shell echo "$(SYSUPGRADE)" | cut -d " " -f1) +SIM_NAME = $(shell echo "$(SYSUPGRADE)" | cut -d " " -f2) CONFIG = $(BUILD_PATH)/.config KCONFIG = $(BUILD_PATH)/target/linux/$(ARCH)/config-* @@ -141,8 +143,8 @@ endef define post_build $(eval BRANCH_GIT=$(shell git --git-dir=$(BUILD_DIR)/qmp/.git branch|grep ^*|cut -d " " -f 2)) - $(eval IM_NAME=$(NAME)-$(COMMUNITY)_$(BRANCH_GIT)-factory-$(TIMESTAMP).bin) - $(eval SIM_NAME=$(NAME)-$(COMMUNITY)_$(BRANCH_GIT)-sysupgrade-$(TIMESTAMP).bin) + $(if $(IM_NAME),,$(eval IM_NAME=$(NAME)-$(COMMUNITY)_$(BRANCH_GIT)-factory-$(TIMESTAMP).bin)) + $(if $(SIM_NAM),,$(eval SIM_NAME=$(NAME)-$(COMMUNITY)_$(BRANCH_GIT)-sysupgrade-$(TIMESTAMP).bin)) $(eval COMP=$(shell ls $(BUILD_PATH)/$(IMAGE_PATH) 2>/dev/null | grep -c \\.gz)) mkdir -p $(IMAGES) @[ $(COMP) -eq 1 ] && gunzip $(BUILD_PATH)/$(IMAGE_PATH) -c > $(IMAGES)/$(IM_NAME) || true diff --git a/targets.mk b/targets.mk index fb75ea0..7f25daa 100644 --- a/targets.mk +++ b/targets.mk @@ -35,11 +35,9 @@ ifeq ($(T),ath-ib) TBUILD:=ar71xx PROFILE:=ath-imagebuilder override MAKE_SRC = -j$(J) V=$(V) IGNORE_ERRORS=1 - IMAGE:=bin/$(ARCH)/OpenWrt-ImageBuilder-$(ARCH)_generic-for-linux-x86_64.tar.bz2 + IMAGE:=bin/$(ARCH)/OpenWrt-ImageBuilder-$(ARCH)_generic-for-linux-x86_64.tar.bz2 ImabeBuilder-qMp-ar71xx-x86_64.tar.bz2 endif - - ifeq ($(T),alix) NAME:=Alix ARCH:=x86