Commit 2cf1a9dc authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Upgraded grub to 2.06

parent 24ad5919
...@@ -9,6 +9,7 @@ skylake: grub.bios ...@@ -9,6 +9,7 @@ skylake: grub.bios
x4-945: grub.bios x4-945: grub.bios
e2-6110: grub.efi e2-6110: grub.efi
p4-630: grub.bios p4-630: grub.bios
core2duo-e6700: grub.bios
core2duo-q9550: grub.bios core2duo-q9550: grub.bios
i3-540: grub.bios i3-540: grub.bios
i5-3317u: grub.efi i5-3317u: grub.efi
...@@ -20,12 +21,13 @@ xeon-e5620: grub.efi ...@@ -20,12 +21,13 @@ xeon-e5620: grub.efi
xeon-x5650: grub.efi xeon-x5650: grub.efi
xeon-e3-1271: grub.efi xeon-e3-1271: grub.efi
lenovo-t460s: grub.efi lenovo-t460s: grub.efi
msi-mag-x570: grub.efi
grub.bios: grub-config grub.bios: grub-config
tar xf grub-2.04.tar.xz tar xf grub-2.06.tar.xz
cd grub-2.04 && ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --disable-efiemu --disable-werror cd grub-2.06 && ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --disable-efiemu --disable-werror
$(MAKE) -C grub-2.04 $(MAKE) -C grub-2.06
$(MAKE) -C grub-2.04 install $(MAKE) -C grub-2.06 install
rm /etc/bash_completion.d/grub rm /etc/bash_completion.d/grub
mkdir -p /boot/grub mkdir -p /boot/grub
mkfs -t vfat -n GRUB /dev/$(DISK)1 mkfs -t vfat -n GRUB /dev/$(DISK)1
...@@ -34,13 +36,13 @@ grub.bios: grub-config ...@@ -34,13 +36,13 @@ grub.bios: grub-config
grub-install /dev/$(DISK) grub-install /dev/$(DISK)
@echo "$$GRUB_CONFIG" > /boot/grub/grub.cfg @echo "$$GRUB_CONFIG" > /boot/grub/grub.cfg
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf grub-2.04 rm -rf grub-2.06
grub.efi32uga: grub-config grub.efi32uga: grub-config
tar xf grub-2.04.tar.xz tar xf grub-2.06.tar.xz
cd grub-2.04 && ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --with-platform=efi --target=i386 --disable-werror cd grub-2.06 && ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --with-platform=efi --target=i386 --disable-werror
$(MAKE) -C grub-2.04 $(MAKE) -C grub-2.06
$(MAKE) -C grub-2.04 install $(MAKE) -C grub-2.06 install
rm /etc/bash_completion.d/grub rm /etc/bash_completion.d/grub
mkdir -p /boot/efi mkdir -p /boot/efi
mkfs -t vfat -n EFIBOOT /dev/$(DISK)1 mkfs -t vfat -n EFIBOOT /dev/$(DISK)1
...@@ -50,13 +52,13 @@ grub.efi32uga: grub-config ...@@ -50,13 +52,13 @@ grub.efi32uga: grub-config
grub-mkimage -p /efi/boot -o /boot/efi/EFI/BOOT/bootia32.efi -O i386-efi part_gpt fat ext2 normal linux efi_uga test loadenv reboot hashsum echo halt gcry_sha256 grub-mkimage -p /efi/boot -o /boot/efi/EFI/BOOT/bootia32.efi -O i386-efi part_gpt fat ext2 normal linux efi_uga test loadenv reboot hashsum echo halt gcry_sha256
@echo "$$GRUB_CONFIG" > /boot/efi/EFI/BOOT/grub.cfg @echo "$$GRUB_CONFIG" > /boot/efi/EFI/BOOT/grub.cfg
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf grub-2.04 rm -rf grub-2.06
grub.efi: grub-config grub.efi: grub-config
tar xf grub-2.04.tar.xz tar xf grub-2.06.tar.xz
cd grub-2.04 && ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --with-platform=efi --disable-werror cd grub-2.06 && ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --with-platform=efi --disable-werror
$(MAKE) -C grub-2.04 $(MAKE) -C grub-2.06
$(MAKE) -C grub-2.04 install $(MAKE) -C grub-2.06 install
rm /etc/bash_completion.d/grub rm /etc/bash_completion.d/grub
mkdir -p /boot/efi mkdir -p /boot/efi
mkfs -t vfat -n EFIBOOT /dev/$(DISK)1 mkfs -t vfat -n EFIBOOT /dev/$(DISK)1
...@@ -66,7 +68,7 @@ grub.efi: grub-config ...@@ -66,7 +68,7 @@ grub.efi: grub-config
grub-mkimage -p /efi/boot -o /boot/efi/EFI/BOOT/bootx64.efi -O x86_64-efi part_gpt fat ext2 normal linux efi_gop test loadenv reboot hashsum echo halt gcry_sha256 grub-mkimage -p /efi/boot -o /boot/efi/EFI/BOOT/bootx64.efi -O x86_64-efi part_gpt fat ext2 normal linux efi_gop test loadenv reboot hashsum echo halt gcry_sha256
@echo "$$GRUB_CONFIG" > /boot/efi/EFI/BOOT/grub.cfg @echo "$$GRUB_CONFIG" > /boot/efi/EFI/BOOT/grub.cfg
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf grub-2.04 rm -rf grub-2.06
grub-config: grub-config:
define GRUB_CONFIG define GRUB_CONFIG
...@@ -77,7 +79,7 @@ set timeout=5 ...@@ -77,7 +79,7 @@ set timeout=5
insmod ext2 insmod ext2
set root=(hd0,2) set root=(hd0,2)
linux /boot/zImage console=tty1 root=/dev/disk/by-label/CLFS rootfstype=ext4 rootflags=discard rw rootwait elevator=noop quiet loglevel=3 systemd.show_status=1 net.ifnames=0 linux /boot/zImage console=tty1 root=/dev/disk/by-label/CLFS rootfstype=ext4 rootflags=discard rw rootwait quiet loglevel=3 systemd.show_status=1 net.ifnames=0
boot boot
endef endef
export GRUB_CONFIG export GRUB_CONFIG
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment