aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-05-29 13:40:55 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-05-29 13:40:55 +0000
commitf40fb567027c1a909ab3cd647d3b5dcbc4991d94 (patch)
tree9bb3dd6747eacb21af30f1b81385697147026520 /include
parentc3f886bce7e0f58ab6cd119de35fafe281a1cfd8 (diff)
downloadupstream-f40fb567027c1a909ab3cd647d3b5dcbc4991d94.tar.gz
upstream-f40fb567027c1a909ab3cd647d3b5dcbc4991d94.tar.bz2
upstream-f40fb567027c1a909ab3cd647d3b5dcbc4991d94.zip
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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45834 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-rw-r--r--include/image.mk7
1 files changed, 4 insertions, 3 deletions
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