RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Felix Fietkau 2015-05-29 13:40:55 +00:00
parent afbf104a4e
commit a6ad9f8ad8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/image.mk
View File

@ -407,14 +407,14 @@ define Device/Build/image
$$(_TARGET): $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2)) $$(_TARGET): $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2))
$(eval $(call Device/Export,$(KDIR)/$(KERNEL_IMAGE),$(1))) $(eval $(call Device/Export,$(KDIR)/$(KERNEL_IMAGE),$(1)))
$(eval $(call Device/Export,$(KDIR)/$(KERNEL_INITRAMFS_IMAGE),$(1))) $(eval $(call Device/Export,$(KDIR)/$(KERNEL_INITRAMFS_IMAGE),$(1)))
$(eval $(call Device/Export,$(KDIR)/$(call IMAGE_NAME,$(1),$(2)),$(1))) $(eval $(call Device/Export,$(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)),$(1)))
$(KDIR)/$(call IMAGE_NAME,$(1),$(2)): $(KDIR)/$$(KERNEL_IMAGE) $(KDIR)/root.$(1) $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)): $(KDIR)/$$(KERNEL_IMAGE) $(KDIR)/root.$(1)
@rm -f $$@ @rm -f $$@
[ -f $$(word 1,$$^) -a -f $$(word 2,$$^) ] [ -f $$(word 1,$$^) -a -f $$(word 2,$$^) ]
$$(call concat_cmd,$(if $(IMAGE/$(2)/$(1)),$(IMAGE/$(2)/$(1)),$(IMAGE/$(2)))) $$(call concat_cmd,$(if $(IMAGE/$(2)/$(1)),$(IMAGE/$(2)/$(1)),$(IMAGE/$(2))))
.IGNORE: $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(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 $$^ $$@ cp $$^ $$@
endef endef
@ -457,6 +457,7 @@ define BuildImage
$(call Build/Clean) $(call Build/Clean)
image_prepare: compile image_prepare: compile
mkdir -p $(KDIR)/tmp
$(call Image/Prepare) $(call Image/Prepare)
endif endif