emeryth
/
openwrt_zsun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

image: fix device variable exports for initramfs images 

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

Backport of r46496

git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46590 3c298f89-4303-0410-b956-a3cf2f4a3e73
zsun
nbd 2015-08-13 19:35:26 +00:00
parent b62dde9c1c
commit de041ddd38
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/image.mk
View File

@ -364,6 +364,7 @@ endef
ifndef IB
define Device/Build/initramfs
$(call Device/Export,$(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE),$(1))
$$(_TARGET): $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE)
$(KDIR)/$$(KERNEL_NAME)-initramfs: image_prepare
@ -411,7 +412,6 @@ 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)/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 $$@