Author: nbd Date: 2015-04-08 11:26:10 +0200 (Wed, 08 Apr 2015) New Revision: 45312
Modified: trunk/include/image.mk Log: image.mk: rework FILESYSTEM evaluation order to fix some build issues Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/include/image.mk =================================================================== --- trunk/include/image.mk 2015-04-08 09:22:02 UTC (rev 45311) +++ trunk/include/image.mk 2015-04-08 09:26:10 UTC (rev 45312) @@ -353,7 +353,10 @@ $(1) : $(2):=$$($(2)) 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 _TARGET = $$(if $$(filter $(PROFILE),$$(PROFILES)),install,install-disabled) @@ -389,11 +392,10 @@ endef define Device/Build/image - FILESYSTEM := $(1) $$(_TARGET): $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2)) - $(eval $(call Device/Export,$(KDIR)/$(KERNEL_IMAGE))) - $(eval $(call Device/Export,$(KDIR)/$(KERNEL_INITRAMFS_IMAGE))) - $(eval $(call Device/Export,$(KDIR)/$(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)/$(call IMAGE_NAME,$(1),$(2)),$(1))) $(KDIR)/$(call IMAGE_NAME,$(1),$(2)): $(KDIR)/$$(KERNEL_IMAGE) $(KDIR)/root.$(1) @rm -f $$@ [ -f $$(word 1,$$^) -a -f $$(word 2,$$^) ] _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
