ar71xx: seama: fix making factory images

[openwrt/staging/lynxis/omap.git] / include / image.mk

diff --git a/include/image.mk b/include/image.mk
index 7fe149fee4057bd16e65a1e3ecc5147ccb971a1f..a47d588488bda6c3cc24034de7babf74cfddd534 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -351,7 +351,7 @@ endef
 ifndef IB
 define Device/Build/initramfs
   $(call Device/Export,$(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE),$(1))
-  $$(_TARGET): $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE)
+  $$(_TARGET): $$(if $$(KERNEL_INITRAMFS),$(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE))
 
   $(KDIR)/$$(KERNEL_INITRAMFS_NAME):: image_prepare
   $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE)
@@ -453,7 +453,7 @@ define LegacyDevice/Check
   _TARGET := $$(if $$(_PROFILE_SET),legacy-images,install-disabled)
   $$(if $$(_PROFILE_SET),install: legacy-images-make)
   ifndef IB
-    $$(if $$(_PROFILE_SET),compile: legacy-images-prepare-make)
+    $$(if $$(_PROFILE_SET),mkfs_prepare: legacy-images-prepare-make)
   endif
 endef
 
@@ -463,11 +463,10 @@ define LegacyDevice/Build
   .PHONY: legacy-image-prepare-$(1) legacy-image-$(1)
 
   legacy-image-prepare-$(1):
-       $(foreach fs,$(TARGET_FILESYSTEMS),
-               $$(call Image/Prepare/Profile,$(1),$(fs))
-       )
+       $$(call Image/Prepare/Profile,$(1))
 
   legacy-image-$(1):
+       $$(call Image/BuildKernel/Profile,$(1))
        $(foreach fs,$(TARGET_FILESYSTEMS),
                $$(call Image/Build/Profile,$(1),$(fs))
        )
@@ -481,6 +480,7 @@ define LegacyDevice
   $(call LegacyDevice/$(1),$(1))
   $(call LegacyDevice/Check,$(1))
   $(call LegacyDevice/$(if $(DUMP),Dump,Build),$(1))
+
 endef
 
 define BuildImage