diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-05-29 13:40:55 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-05-29 13:40:55 +0000 |
| commit | a6ad9f8ad892697f5fd689437337fe535eb4430d (patch) | |
| tree | 567d9f4556b7766fe097c2675c380aa8be560820 | |
| parent | afbf104a4efe810745f11d78014a65ad57ee0839 (diff) | |
| download | upstream-a6ad9f8ad892697f5fd689437337fe535eb4430d.tar.gz upstream-a6ad9f8ad892697f5fd689437337fe535eb4430d.tar.bz2 upstream-a6ad9f8ad892697f5fd689437337fe535eb4430d.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>
SVN-Revision: 45834
| -rw-r--r-- | include/image.mk | 7 |
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 |