[source] image.mk: force kernel rebuild on every run

LEDE Commits lede-commits at lists.infradead.org
Mon Mar 13 05:41:11 PDT 2017


nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/0d6494daf5cc7192f80c8a6af0aa5e1665ac07f2

commit 0d6494daf5cc7192f80c8a6af0aa5e1665ac07f2
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Mon Mar 13 10:49:58 2017 +0100

    image.mk: force kernel rebuild on every run
    
    DTS dependencies are not processed correctly so makes it safer against
    poentially stale builds
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 include/image.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/image.mk b/include/image.mk
index 9bc30c6..2153715 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -419,7 +419,7 @@ define Device/Build/initramfs
   $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE)
 	cp $$^ $$@
 
-  $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/$$(KERNEL_INITRAMFS_NAME) $(CURDIR)/Makefile $$(KERNEL_DEPENDS)
+  $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/$$(KERNEL_INITRAMFS_NAME) $(CURDIR)/Makefile $$(KERNEL_DEPENDS) image_prepare
 	@rm -f $$@
 	$$(call concat_cmd,$$(KERNEL_INITRAMFS))
 endef
@@ -443,7 +443,7 @@ define Device/Build/kernel
     ifdef CONFIG_IB
       install: $$(KDIR_KERNEL_IMAGE)
     endif
-    $$(KDIR_KERNEL_IMAGE): $(KDIR)/$$(KERNEL_NAME) $(CURDIR)/Makefile $$(KERNEL_DEPENDS)
+    $$(KDIR_KERNEL_IMAGE): $(KDIR)/$$(KERNEL_NAME) $(CURDIR)/Makefile $$(KERNEL_DEPENDS) image_prepare
 	@rm -f $$@
 	$$(call concat_cmd,$$(KERNEL))
 	$$(if $$(KERNEL_SIZE),$$(call Build/check-size,$$(KERNEL_SIZE)))



More information about the lede-commits mailing list