[source] x86: image: drop duplicated copy of bzImage into vmlinuz

LEDE Commits lede-commits at lists.infradead.org
Thu Dec 14 09:43:32 PST 2017


jow pushed a commit to source.git, branch lede-17.01:
https://git.lede-project.org/3225fbfcbf0d735ad66d03f5b60c310f6dc43396

commit 3225fbfcbf0d735ad66d03f5b60c310f6dc43396
Author: Rafał Miłecki <rafal at milecki.pl>
AuthorDate: Sun Mar 12 18:46:59 2017 +0100

    x86: image: drop duplicated copy of bzImage into vmlinuz
    
    It's already done once few lines earlier in the Image/Build/iso.
    
    Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
    (cherry picked from commit 425f958830428f989d7381ddda3a8f503e587c5c)
---
 target/linux/x86/image/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index ef5b3c0..f34788d 100644
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -120,7 +120,6 @@ define Image/Build/iso
 		-e 's#@CMDLINE@#root=/dev/sr0 rootfstype=iso9660 rootwait $(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \
 		-e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \
 		./grub-iso.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg
-	$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
 	mkisofs -R -b boot/grub/eltorito.img -no-emul-boot -boot-info-table \
 		-o $(KDIR)/root.iso $(KDIR)/root.grub $(TARGET_DIR)
 endef



More information about the lede-commits mailing list