Author: nbd
Date: 2015-04-18 23:35:22 +0200 (Sat, 18 Apr 2015)
New Revision: 45498

Modified:
   trunk/include/image.mk
Log:
image.mk: do not emit multiple target definitions for kernel images

Signed-off-by: Felix Fietkau <[email protected]>

Modified: trunk/include/image.mk
===================================================================
--- trunk/include/image.mk      2015-04-18 21:35:16 UTC (rev 45497)
+++ trunk/include/image.mk      2015-04-18 21:35:22 UTC (rev 45498)
@@ -380,8 +380,8 @@
 endef
 
 define Device/Build/kernel
+  _KERNEL_IMAGES += $(KDIR)/$$(KERNEL_NAME)
   $(KDIR)/$$(KERNEL_NAME): image_prepare
-       touch $$@
   $$(_TARGET): $$(if $$(KERNEL_INSTALL),$(BIN_DIR)/$$(KERNEL_IMAGE))
   $(BIN_DIR)/$$(KERNEL_IMAGE): $(KDIR)/$$(KERNEL_IMAGE)
        cp $$^ $$@
@@ -456,6 +456,9 @@
   $(foreach device,$(TARGET_DEVICES),$(call Device,$(device)))
   $(foreach fs,$(TARGET_FILESYSTEMS) $(fs-subtypes-y),$(call 
BuildImage/mkfs,$(fs)))
 
+  $$(sort $$(_KERNEL_IMAGES)):
+       @touch $$@
+
   install: kernel_prepare
        $(foreach fs,$(TARGET_FILESYSTEMS),
                $(call Image/Build,$(fs))
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to