From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 29 May 2015 13:41:02 +0000 (+0000)
Subject: build: store initramfs kernels in $(KDIR)/tmp - prevents them from being included... 
X-Git-Tag: reboot~2915
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ddf120fc0394d15dc3c012f1f8fac2e8a89c43cd;p=openwrt%2Fstaging%2Fjogo.git

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

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

SVN-Revision: 45835
---

diff --git a/include/image.mk b/include/image.mk
index f36c91bb12..8e8ddc29ac 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -367,10 +367,10 @@ define Device/Build/initramfs
   $$(_TARGET): $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE)
 
   $(KDIR)/$$(KERNEL_NAME)-initramfs: image_prepare
-  $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/$$(KERNEL_INITRAMFS_IMAGE)
+  $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE)
 	cp $$^ $$@
 
-  $(KDIR)/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/$$(KERNEL_NAME)-initramfs
+  $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/$$(KERNEL_NAME)-initramfs
 	@rm -f $$@
 	$$(call concat_cmd,$$(KERNEL_INITRAMFS))
 endef
@@ -406,7 +406,7 @@ endef
 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)/tmp/$(KERNEL_INITRAMFS_IMAGE),$(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 $$@