From: Rafał Miłecki Date: Sun, 12 Mar 2017 17:46:59 +0000 (+0100) Subject: x86: image: drop duplicated copy of bzImage into vmlinuz X-Git-Tag: v17.01.5~268 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3225fbfcbf0d735ad66d03f5b60c310f6dc43396;p=oweals%2Fopenwrt.git 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 (cherry picked from commit 425f958830428f989d7381ddda3a8f503e587c5c) --- diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index ef5b3c03c8..f34788d67b 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