Changeset 3706d93 in mainline for boot/meson.build

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:

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

File:

• boot/meson.build (modified) (1 diff)

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