Changeset 3706d93 in mainline

Timestamp:

2019-08-17T12:49:43Z (5 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:

318af1a

Parents:

512579c

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-29 10:48:33)

git-committer:

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

Message:

Honor CONFIG_COMPRESSED_INIT

Files:

• boot/arch/arm64/meson.build (modified) (1 diff)
• boot/grub/meson.build (modified) (2 diffs)
• boot/meson.build (modified) (1 diff)
• meson.build (modified) (2 diffs)

boot/arch/arm64/meson.build

@@ -33 +33 @@
 GRUB_LOADER = 'chainloader'
 
+# FIXME: The loader crashed without explanation when CONFIG_COMPRESSED_INIT is disabled.
+
 # Request binary output. The ARM64 port manually prepares the .text
 # section to look as a PE file than can be loaded on EFI systems.

boot/grub/meson.build

@@ -1 @@
-
+if GRUB_ARCH == 'pc'
+        MULTIBOOT_CMD = 'multiboot'
+        MODULE_CMD = 'module'
+        INSMODS = [ 'insmod vbe', 'insmod vga' ]
+elif GRUB_ARCH == 'efi'
+        MULTIBOOT_CMD = 'multiboot2'
+        MODULE_CMD = 'module2'
+        INSMODS = [ 'insmod efi_gop', 'insmod efi_uga' ]
+endif
 
 # TODO
@@ -46 +54 @@
 
 
-if GRUB_ARCH == 'pc'
-        MULTIBOOT_CMD = 'multiboot'
-        MODULE_CMD = 'module'
-        INSMODS = [ 'insmod vbe', 'insmod vga' ]
-elif GRUB_ARCH == 'efi'
-        MULTIBOOT_CMD = 'multiboot2'
-        MODULE_CMD = 'module2'
-        INSMODS = [ 'insmod efi_gop', 'insmod efi_uga' ]
-endif
-
 grub_cfg = configure_file(
         input: 'grub.cfg.in',

boot/meson.build

@@ -16 +16 @@
                 foreach bin : rd_init_binaries
                         if bin[1] == m
-                                moddeps += bin[0]
+                                _dep = bin[0]
+                                _newname = run_command(basename, bin[1], check: true).stdout().strip()
+                                _oldname = run_command(basename, bin[0].full_path(), check: true).stdout().strip()
+
+                                if CONFIG_COMPRESSED_INIT
+                                        _dep = custom_target(_newname + '.gz',
+                                                output: _newname + '.gz',
+                                                input: _dep,
+                                                command: gzip,
+                                                capture: true,
+                                        )
+                                        _newname += '.gz'
+                                        _oldname = _newname
+                                endif
+
+                                moddeps += _dep
+                                name_transform += 's:.*/@0@:@1@:;'.format(_oldname, _newname)
                                 found = true
-
-                                _oldname = run_command(basename, bin[0].full_path(), check: true).stdout().strip()
-                                _newname = run_command(basename, bin[1], check: true).stdout().strip()
-
-                                name_transform += 's:.*/@0@:@1@:;'.format(_oldname, _newname)
                                 break
                         endif

meson.build

@@ -52 +52 @@
 )
 
-gzip = generator(find_program('gzip',
-        arguments: [ '--no-name', '-9', '--stdout', '@INPUT@' ]
-        output: '@PLAINNAME@.gz',
-        capture: true,
-)
+# TODO: bug in Meson
+#gzip = generator(find_program('gzip'),
+#       arguments: [ '--no-name', '-9', '--stdout', '@INPUT@' ],
+#       output: '@PLAINNAME@.gz',
+#       capture: true,
+#)
+
+gzip = [ find_program('gzip'), '--no-name', '-9', '--stdout', '@INPUT@' ]
 
 # Tar's arguments make sure that the archive is reproducible.
@@ -165 +168 @@
         'GRUB_ARCH',
         'UIMAGE_OS',
+        'CONFIG_COMPRESSED_INIT',
 ]