EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

image.mk: rework FILESYSTEM evaluation order to fix some build issues

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

SVN-Revision: 45312
This commit is contained in:
Felix Fietkau 2015-04-08 09:26:10 +00:00
parent 4c1ee6f24d
commit d0c0cc9a9a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/image.mk
View File

@ -353,7 +353,10 @@ define Device/ExportVar
$(1) : $(2):=$$($(2)) $(1) : $(2):=$$($(2))
endef endef
Device/Export = $(foreach var,$(DEVICE_VARS) KERNEL KERNEL_INITRAMFS FILESYSTEM,$(call Device/ExportVar,$(1),$(var))) define Device/Export
$(foreach var,$(DEVICE_VARS) KERNEL KERNEL_INITRAMFS,$(call Device/ExportVar,$(1),$(var)))
$(1) : FILESYSTEM:=$(2)
endef
define Device/Check define Device/Check
_TARGET = $$(if $$(filter $(PROFILE),$$(PROFILES)),install,install-disabled) _TARGET = $$(if $$(filter $(PROFILE),$$(PROFILES)),install,install-disabled)
@ -389,11 +392,10 @@ define Device/Build/kernel
endef endef
define Device/Build/image define Device/Build/image
FILESYSTEM := $(1)
$$(_TARGET): $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2)) $$(_TARGET): $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2))
$(eval $(call Device/Export,$(KDIR)/$(KERNEL_IMAGE))) $(eval $(call Device/Export,$(KDIR)/$(KERNEL_IMAGE),$(1)))
$(eval $(call Device/Export,$(KDIR)/$(KERNEL_INITRAMFS_IMAGE))) $(eval $(call Device/Export,$(KDIR)/$(KERNEL_INITRAMFS_IMAGE),$(1)))
$(eval $(call Device/Export,$(KDIR)/$(call IMAGE_NAME,$(1),$(2)))) $(eval $(call Device/Export,$(KDIR)/$(call IMAGE_NAME,$(1),$(2)),$(1)))
$(KDIR)/$(call IMAGE_NAME,$(1),$(2)): $(KDIR)/$$(KERNEL_IMAGE) $(KDIR)/root.$(1) $(KDIR)/$(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,$$^) ]