From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 29 May 2015 13:40:55 +0000 (+0000)
Subject: build: store firmware images in $(KDIR)/tmp - prevents them from being included in... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a6ad9f8ad892697f5fd689437337fe535eb4430d;p=openwrt%2Fstaging%2Fyousong.git

build: store firmware images in $(KDIR)/tmp - prevents them from being included in the image builder tarball

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 45834
---

diff --git a/include/image.mk b/include/image.mk
index f6f30c59b0..f36c91bb12 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -407,14 +407,14 @@ define Device/Build/image
   $$(_TARGET): $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2))
   $(eval $(call Device/Export,$(KDIR)/$(KERNEL_IMAGE),$(1)))
   $(eval $(call Device/Export,$(KDIR)/$(KERNEL_INITRAMFS_IMAGE),$(1)))
-  $(eval $(call Device/Export,$(KDIR)/$(call IMAGE_NAME,$(1),$(2)),$(1)))
-  $(KDIR)/$(call IMAGE_NAME,$(1),$(2)): $(KDIR)/$$(KERNEL_IMAGE) $(KDIR)/root.$(1)
+  $(eval $(call Device/Export,$(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)),$(1)))
+  $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)): $(KDIR)/$$(KERNEL_IMAGE) $(KDIR)/root.$(1)
 	@rm -f $$@
 	[ -f $$(word 1,$$^) -a -f $$(word 2,$$^) ]
 	$$(call concat_cmd,$(if $(IMAGE/$(2)/$(1)),$(IMAGE/$(2)/$(1)),$(IMAGE/$(2))))
 
   .IGNORE: $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2))
-  $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2)): $(KDIR)/$(call IMAGE_NAME,$(1),$(2))
+  $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2)): $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2))
 	cp $$^ $$@
 
 endef
@@ -457,6 +457,7 @@ define BuildImage
 		$(call Build/Clean)
 
     image_prepare: compile
+		mkdir -p $(KDIR)/tmp
 		$(call Image/Prepare)
   endif