Changeset 28fcaee in mainline for meson.build

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:

643640a

Parents:

fd6c8b1

git-author:

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

git-committer:

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

Message:

amd64 boot

File:

• meson.build (modified) (5 diffs)

meson.build

@@ -22 +22 @@
 unzip = find_program('unzip')
 which = find_program('which')
-sh = find_program('sh')
+sh = [ find_program('sh'), '-x', '-u', '-e' ]
 mkext4 = find_program('tools/mkext4.py')
 mkfat = find_program('tools/mkfat.py')
+cp = find_program('cp')
+
+genisoimage = find_program('genisoimage', required: false)
+
+if not genisoimage.found()
+        genisoimage = find_program('mkisofs', required: false)
+endif
+
+if not genisoimage.found()
+        xorriso = find_program('xorriso', required: false)
+
+        if xorriso.found()
+                genisoimage = [ xorriso, '-as', 'genisoimage' ]
+        else
+                error('Need genisoimage, mkisofs or xorriso.')
+        endif
+endif
+
 
 autocheck = generator(find_program('tools/autocheck.awk'),
@@ -136 +154 @@
         'UARCH',
         'KARCH',
+        'BARCH',
+        'GRUB_ARCH',
 ]
 
@@ -275 +295 @@
 # Init binaries.
 rd_init = [
+        # IMPORTANT: The order of entries is important for bootloader!
+        'srv/ns',
+        'srv/loader',
         'app/init',
+        'srv/locsrv',
         'srv/bd/rd',
+        'srv/vfs',
+        'srv/logger',
         'srv/fs/' + RDFMT,
-        'srv/loader',
-        'srv/locsrv',
-        'srv/logger',
-        'srv/ns',
-        'srv/vfs',
-]
+]
+
+# References to the actual binary files. Filled in by uspace.
+rd_init_binaries = []
 
 # Binaries allowed on the initrd image when CONFIG_BAREBONE is enabled.
@@ -451 +475 @@
         output: 'dist.tag',
         input: [ install_script, install_deps ],
-        command: [ sh, '-x', '-u', '-e', '@INPUT0@', '@OUTPUT@', dist_dir ],
-        build_by_default: true,
+        command: [ sh, '@INPUT0@', '@OUTPUT@', dist_dir ],
 )
 
@@ -471 +494 @@
         input: dist,
         command: initrd_cmd,
+)
+
+rd_init_binaries += [[ initrd_img, 'boot/initrd.img' ]]
+
+subdir('boot')
+
+custom_target(POST_OUTPUT,
+        output: POST_OUTPUT,
+        input: POST_INPUT,
+        command: [ cp, '@INPUT@', '@OUTPUT@' ],
         build_by_default: true,
 )
-