Changeset 145a13b in mainline

Timestamp:

2020-05-26T18:22:10Z (4 years ago)

Author:

Petr Pavlu <setup@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

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:

• boot/grub/meson.build (modified) (1 diff)
• meson/part/tools/meson.build (modified) (1 diff)

boot/grub/meson.build

@@ -108 +108 @@
         genisoimage_args = [ '-eltorito-boot', grub_image, '-no-emul-boot', '-boot-info-table' ]
 elif GRUB_ARCH == 'efi'
-        genisoimage_args = [ '--efi-boot', grub_image ]
+        if genisoimage_type == 'mkisofs'
+                genisoimage_args = [ '-eltorito-platform', 'efi', '-eltorito-boot', grub_image, '-no-emul-boot' ]
+        else
+                genisoimage_args = [ '--efi-boot', grub_image ]
+        endif
 endif
 

meson/part/tools/meson.build

@@ -62 +62 @@
 
 genisoimage = find_program('genisoimage', required: false)
-
-if not genisoimage.found()
+if genisoimage.found()
+        genisoimage_type = 'genisoimage'
+else
         genisoimage = find_program('mkisofs', required: false)
-endif
-
-if not genisoimage.found()
-        xorriso = find_program('xorriso', required: false)
-
-        if xorriso.found()
-                genisoimage = [ xorriso, '-as', 'genisoimage' ]
+        if genisoimage.found()
+                genisoimage_type = 'mkisofs'
         else
-                error('Need genisoimage, mkisofs or xorriso.')
+                xorriso = find_program('xorriso', required: false)
+                if xorriso.found()
+                        genisoimage = [ xorriso, '-as', 'genisoimage' ]
+                        genisoimage_type = 'genisoimage'
+                else
+                        error('Need genisoimage, mkisofs or xorriso.')
+                endif
         endif
 endif