aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-04-18 21:35:22 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-04-18 21:35:22 +0000
commit2f49517c2fbb74ff38488698570fba96da0e6db9 (patch)
tree086b14b00c905c5363bb846161771098fdc2a608
parent6293aae9d35c52866f16b6453bbc94a59a833f7b (diff)
downloadupstream-2f49517c2fbb74ff38488698570fba96da0e6db9.tar.gz
upstream-2f49517c2fbb74ff38488698570fba96da0e6db9.tar.bz2
upstream-2f49517c2fbb74ff38488698570fba96da0e6db9.zip
image.mk: do not emit multiple target definitions for kernel images
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 45498
-rw-r--r--include/image.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/image.mk b/include/image.mk
index ebeec5ebb5..bd6a88af61 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -380,8 +380,8 @@ define Device/Build/check_size
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 @@ define BuildImage
$(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))