diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-04-08 09:26:10 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-04-08 09:26:10 +0000 |
| commit | ff4a22a3eceaac33f836dbcc975d8cab48f72af4 (patch) | |
| tree | b91d13aa95e6b3612f60e85793fa316395497a20 /include | |
| parent | a9bad0538e99b815a8e4b73f91ba0acdd06840a4 (diff) | |
| download | upstream-ff4a22a3eceaac33f836dbcc975d8cab48f72af4.tar.gz upstream-ff4a22a3eceaac33f836dbcc975d8cab48f72af4.tar.bz2 upstream-ff4a22a3eceaac33f836dbcc975d8cab48f72af4.zip | |
image.mk: rework FILESYSTEM evaluation order to fix some build issues
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45312 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
| -rw-r--r-- | include/image.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/image.mk b/include/image.mk index 3ff8768a6a..6e0456f42a 100644 --- a/include/image.mk +++ b/include/image.mk @@ -353,7 +353,10 @@ define Device/ExportVar $(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 @@ define Device/Build/kernel 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,$$^) ] |