hurricos/openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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

SVN-Revision: 45835
This commit is contained in:
Felix Fietkau 2015-05-29 13:41:02 +00:00
parent a6ad9f8ad8
commit ddf120fc03
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/image.mk
View File

@ -367,10 +367,10 @@ define Device/Build/initramfs
$$(_TARGET): $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE) $$(_TARGET): $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE)
$(KDIR)/$$(KERNEL_NAME)-initramfs: image_prepare $(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 $$^ $$@ cp $$^ $$@
$(KDIR)/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/$$(KERNEL_NAME)-initramfs $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/$$(KERNEL_NAME)-initramfs
@rm -f $$@ @rm -f $$@
$$(call concat_cmd,$$(KERNEL_INITRAMFS)) $$(call concat_cmd,$$(KERNEL_INITRAMFS))
endef endef
@ -406,7 +406,7 @@ endef
define Device/Build/image 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)/tmp/$(KERNEL_INITRAMFS_IMAGE),$(1)))
$(eval $(call Device/Export,$(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)),$(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) $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)): $(KDIR)/$$(KERNEL_IMAGE) $(KDIR)/root.$(1)
@rm -f $$@ @rm -f $$@