diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2017-03-12 18:46:59 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2017-12-13 14:45:31 +0100 |
| commit | 3225fbfcbf0d735ad66d03f5b60c310f6dc43396 (patch) | |
| tree | 832038afd6763f8d19990082e8b3b7fe07cbac38 | |
| parent | 37aae44a478bceeb0c9ced2e97404724bf5059bd (diff) | |
| download | upstream-3225fbfcbf0d735ad66d03f5b60c310f6dc43396.tar.gz upstream-3225fbfcbf0d735ad66d03f5b60c310f6dc43396.tar.bz2 upstream-3225fbfcbf0d735ad66d03f5b60c310f6dc43396.zip | |
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@milecki.pl>
(cherry picked from commit 425f958830428f989d7381ddda3a8f503e587c5c)
| -rw-r--r-- | target/linux/x86/image/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
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 |