Changeset a73a1453 in mainline for boot/grub

Timestamp:

2019-08-17T12:49:43Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

512579c

Parents:

5b586b9

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-28 17:53:10)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)

Message:

arm64 wip

File:

• boot/grub/meson.build (modified) (3 diffs)

boot/grub/meson.build

@@ -5 +5 @@
 dist_dirname = 'grub_dist'
 
-build_dist_text = []
-build_dist_deps = []
-foreach init : rd_init_binaries
-        target = 'boot/' + run_command(basename, init[1], check: true).stdout().strip()
+if GRUB_LOADER == 'multiboot'
+        build_dist_text = []
+        build_dist_deps = []
+        foreach init : rd_init_binaries
+                target = 'boot/' + run_command(basename, init[1], check: true).stdout().strip()
 
-        build_dist_text += install_snippet.format(init[0].full_path(), target)
-        build_dist_deps += init[0]
-endforeach
+                build_dist_text += install_snippet.format(init[0].full_path(), target)
+                build_dist_deps += init[0]
+        endforeach
+
+        LOADS = [ 'echo \'Loading kernel\'' ]
+        LOADS += [ MULTIBOOT_CMD + ' /boot/kernel.elf' ]
+
+        MODULES = rd_init + [ 'boot/initrd.img' ]
+
+        foreach module : MODULES
+                module = '/boot/' + run_command(basename, module, check: true).stdout().strip()
+                LOADS += 'echo \'Loading @0@\''.format(module)
+                LOADS += '@0@ @1@ @1@'.format(MODULE_CMD, module)
+        endforeach
+endif
+
+if GRUB_LOADER == 'chainloader'
+        # init binaries are already part of the chainloaded boot image.
+        build_dist_text = [ install_snippet.format(boot_image.full_path(), 'boot/' + boot_image_name) ]
+        build_dist_deps = [ boot_image ]
+
+        LOADS = [
+                'echo \'Loading ' + boot_image_name + '\'',
+                'chainloader /boot/' + boot_image_name,
+                'boot',
+        ]
+endif
 
 build_dist_sh = configure_file(
@@ -20 +45 @@
 )
 
-
-MODULES = rd_init + [ 'boot/initrd.img' ]
 
 if GRUB_ARCH == 'pc'
@@ -31 +54 @@
         MODULE_CMD = 'module2'
         INSMODS = [ 'insmod efi_gop', 'insmod efi_uga' ]
-endif
-
-if GRUB_LOADER == 'multiboot'
-        LOADS = [ 'echo \'Loading kernel\'' ]
-        LOADS += [ MULTIBOOT_CMD + ' /boot/kernel.elf' ]
-
-        foreach module : MODULES
-                module = '/boot/' + run_command(basename, module, check: true).stdout().strip()
-                LOADS += 'echo \'Loading @0@\''.format(module)
-                LOADS += '@0@ @1@ @1@'.format(MODULE_CMD, module)
-        endforeach
-endif
-
-if GRUB_LOADER == 'chainloader'
-        LOADS = [
-                'echo \'Loading ' + BOOT_OUTPUT + '\'',
-                'chainloader /boot/' + BOOT_OUTPUT,
-                'boot',
-        ]
 endif