Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 145a13b in mainline


Ignore:
Timestamp:
2020-05-26T18:22:10Z (2 months ago)
Author:
Petr Pavlu <setup@…>
Branches:
master
Children:
df7dc9e
Parents:
807be7e
git-author:
Petr Pavlu <setup@…> (2020-05-25 20:37:34)
git-committer:
Petr Pavlu <setup@…> (2020-05-26 18:22:10)
Message:

Fix generating a boot image for grub-efi with mkisofs

A boot ISO image for grub-efi is currently generated using the
genisoimage-specific option '—efi-boot <grub_image>'. This is accepted
by genisoimage and 'xorriso -as genisoimage' but not by mkisofs:

/usr/bin/mkisofs -J -r -input-charset utf-8 -V HelenOS-CD —efi-boot boot/grub/efi.img -o boot/grub/image.iso boot/grub/grub_dist
Bad Option '—efi-boot' (error -1 BADFLAG).

When mkisofs is selected during the configure time, run the build
command with the equivalent options '-eltorito-platform efi
-eltorito-boot <grub_image> -no-emul-boot'.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • boot/grub/meson.build

    r807be7e r145a13b  
    108108        genisoimage_args = [ '-eltorito-boot', grub_image, '-no-emul-boot', '-boot-info-table' ]
    109109elif GRUB_ARCH == 'efi'
    110         genisoimage_args = [ '--efi-boot', grub_image ]
     110        if genisoimage_type == 'mkisofs'
     111                genisoimage_args = [ '-eltorito-platform', 'efi', '-eltorito-boot', grub_image, '-no-emul-boot' ]
     112        else
     113                genisoimage_args = [ '--efi-boot', grub_image ]
     114        endif
    111115endif
    112116
  • meson/part/tools/meson.build

    r807be7e r145a13b  
    6262
    6363genisoimage = find_program('genisoimage', required: false)
    64 
    65 if not genisoimage.found()
     64if genisoimage.found()
     65        genisoimage_type = 'genisoimage'
     66else
    6667        genisoimage = find_program('mkisofs', required: false)
    67 endif
    68 
    69 if not genisoimage.found()
    70         xorriso = find_program('xorriso', required: false)
    71 
    72         if xorriso.found()
    73                 genisoimage = [ xorriso, '-as', 'genisoimage' ]
     68        if genisoimage.found()
     69                genisoimage_type = 'mkisofs'
    7470        else
    75                 error('Need genisoimage, mkisofs or xorriso.')
     71                xorriso = find_program('xorriso', required: false)
     72                if xorriso.found()
     73                        genisoimage = [ xorriso, '-as', 'genisoimage' ]
     74                        genisoimage_type = 'genisoimage'
     75                else
     76                        error('Need genisoimage, mkisofs or xorriso.')
     77                endif
    7678        endif
    7779endif
Note: See TracChangeset for help on using the changeset viewer.