diff mbox

[LEDE-DEV] x86: image: drop duplicated copy of bzImage into vmlinuz

Message ID 20170312174659.22628-1-zajec5@gmail.com
State Accepted
Headers show

Commit Message

Rafał Miłecki March 12, 2017, 5:46 p.m. UTC 
From: Rafał Miłecki <rafal@milecki.pl>

It's already done once few lines earlier in the Image/Build/iso.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
I used following change to make sure this is not needed:
@@ -103,6 +103,7 @@ endef
 define Image/Build/iso
 	$(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2
 	$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
+	md5sum $(KDIR)/root.grub/boot/vmlinuz
 	grub-mkimage \
 		-p /boot/grub \
 		-d $(STAGING_DIR_HOST)/lib/grub/i386-pc \
@@ -121,6 +122,7 @@ define Image/Build/iso
 		-e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \
 		./grub-iso.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg
 	$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
+	md5sum $(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

I got following output:
md5sum /lede/x86/build_dir/target-i386_pentium4_musl/linux-x86_generic/root.grub/boot/vmlinuz
1ecb33e1df18a322e975fe531fe27b6a  /lede/x86/build_dir/target-i386_pentium4_musl/linux-x86_generic/root.grub/boot/vmlinuz
grub-mkimage -p /boot/grub -d /lede/x86/staging_dir/host/lib/grub/i386-pc -o /lede/x86/build_dir/target-i386_pentium4_musl/linux-x86_generic/grub2/eltorito.img -O i386-pc -c ./grub-early.cfg biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial vga at_keyboard
cat /lede/x86/staging_dir/host/lib/grub/i386-pc/cdboot.img /lede/x86/build_dir/target-i386_pentium4_musl/linux-x86_generic/grub2/eltorito.img > /lede/x86/build_dir/target-i386_pentium4_musl/linux-x86_generic/root.grub/boot/grub/eltorito.img
sed -e 's#@SERIAL_CONFIG@#serial --unit=0 --speed=38400 --word=8 --parity=no --stop=1 --rtscts=off#g' -e 's#@TERMINAL_CONFIG@#terminal_input console serial; terminal_output console serial#g' -e 's#@CMDLINE@#root=/dev/sr0 rootfstype=iso9660 rootwait console=tty0 console=ttyS0,38400n8#g' -e 's#@TIMEOUT@#5#g' ./grub-iso.cfg > /lede/x86/build_dir/target-i386_pentium4_musl/linux-x86_generic/root.grub/boot/grub/grub.cfg
cp -fpR /lede/x86/build_dir/target-i386_pentium4_musl/linux-x86_generic/bzImage /lede/x86/build_dir/target-i386_pentium4_musl/linux-x86_generic/root.grub/boot/vmlinuz
md5sum /lede/x86/build_dir/target-i386_pentium4_musl/linux-x86_generic/root.grub/boot/vmlinuz
1ecb33e1df18a322e975fe531fe27b6a  /lede/x86/build_dir/target-i386_pentium4_musl/linux-x86_generic/root.grub/boot/vmlinuz
---
 target/linux/x86/image/Makefile | 1 -
 1 file changed, 1 deletion(-)
diff mbox

Patch

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