Build now needs to do less work as the /EFI/Boot stucture is now correct in the source

pull/84/head
root 2019-10-03 20:28:11 +00:00
parent 24c62ad321
commit 1ec415e852
1 changed files with 2 additions and 5 deletions

7
build
View File

@ -49,16 +49,13 @@ if [ "$INITRAMFS" != "" ]; then
mv "$INITRAMFS" $BOOT/initrfs.img mv "$INITRAMFS" $BOOT/initrfs.img
fi fi
# BIOS / MBR booting cp -r bootfiles/* $BOOT
cp bootfiles/* $BOOT
cat bootfiles/syslinux.cfg | sed -r "s:/boot/:/$LIVEKITNAME/boot/:" > $BOOT/syslinux.cfg cat bootfiles/syslinux.cfg | sed -r "s:/boot/:/$LIVEKITNAME/boot/:" > $BOOT/syslinux.cfg
cat bootfiles/bootinst.bat | sed -r "s:/boot/:/$LIVEKITNAME/boot/:" | sed -r "s:\\\\boot\\\\:\\\\$LIVEKITNAME\\\\boot\\\\:" > $BOOT/bootinst.bat cat bootfiles/bootinst.bat | sed -r "s:/boot/:/$LIVEKITNAME/boot/:" | sed -r "s:\\\\boot\\\\:\\\\$LIVEKITNAME\\\\boot\\\\:" > $BOOT/bootinst.bat
cp $VMLINUZ $BOOT/ || exit cp $VMLINUZ $BOOT/ || exit
# UEFI booting # UEFI booting
mkdir -p $BOOT/EFI/Boot mv $BOOT/EFI/Boot/syslinux.efi $BOOT/EFI/Boot/bootx64.efi
cp bootfiles/efi-files/syslinux.efi $BOOT/EFI/Boot/bootx64.efi
cp bootfiles/efi-files/{ldlinux.e64,menu.c32,libutil.c32} $BOOT/EFI/Boot
cat $BOOT/syslinux.cfg | sed -r "s:/$LIVEKITNAME/boot/vesa::" > $BOOT/EFI/Boot/syslinux.cfg cat $BOOT/syslinux.cfg | sed -r "s:/$LIVEKITNAME/boot/vesa::" > $BOOT/EFI/Boot/syslinux.cfg
# create compressed 01-core.sb # create compressed 01-core.sb