[source] octeon: fix image build

LEDE Commits lede-commits at lists.infradead.org
Thu Jul 28 10:42:51 PDT 2016


jow pushed a commit to source.git, branch master:
https://git.lede-project.org/?p=source.git;a=commitdiff;h=3bb2b46bc32f35e18eb5e656fa8dafa3e3434592

commit 3bb2b46bc32f35e18eb5e656fa8dafa3e3434592
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Thu Jul 28 19:21:44 2016 +0200

    octeon: fix image build
    
    After b47f438 "build: remove image prefix from kernel files in KDIR", the
    kernel image in $(KDIR) has a different name and could not be found by the
    tar-file build step anymore, leading to the following error on the build
    servers:
    
      cp: cannot stat `.../linux-octeon/lede-octeon-generic-kernel.bin': No such file or directory
      make[4]: *** [.../linux-octeon/tmp/lede-octeon-generic-ext4-sysupgrade.tar] Error 1
    
    Adjust the path to the source kernel image in order to fix the problem.
    
    Signed-off-by: Jo-Philipp Wich <jo at mein.io>
---
 target/linux/octeon/image/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/linux/octeon/image/Makefile b/target/linux/octeon/image/Makefile
index 89cbba5..e2d6539 100644
--- a/target/linux/octeon/image/Makefile
+++ b/target/linux/octeon/image/Makefile
@@ -22,7 +22,7 @@ endef
 define Build/tar-file
 	mkdir -p $(KDIR)/sysupgrade-$(DEVICE_NAME)/
 	echo "BOARD=$(BOARD)" > $(KDIR)/sysupgrade-$(DEVICE_NAME)/CONTROL
-	$(CP) $(KDIR)/$(KERNEL_IMAGE) $(KDIR)/sysupgrade-$(DEVICE_NAME)/kernel
+	$(CP) $(KDIR_KERNEL_IMAGE) $(KDIR)/sysupgrade-$(DEVICE_NAME)/kernel
 	$(CP) $(KDIR)/root.$(1) $(KDIR)/sysupgrade-$(DEVICE_NAME)/root
 	(cd $(KDIR); $(TAR) cvf \
 		$@ sysupgrade-$(DEVICE_NAME))



More information about the lede-commits mailing list