Changeset e28175d in mainline for meson/part

Timestamp:

2020-03-15T10:44:02Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

b401b33 (diff), 44dde42 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

heiducteam <tristanided@…> (2020-03-15 10:44:02)

git-committer:

GitHub <noreply@…> (2020-03-15 10:44:02)

Message:

Merge pull request #1 from HelenOS/master

sync

Location:

meson/part

Files:

• compiler_args/meson.build (added)
• exports/config.mk.in (added)
• exports/meson.build (added)
• extra_targets/doxygen.cfg.diff (moved) (moved from doxygen/doxygen.cfg.diff )
• extra_targets/meson.build (added)
• initrd/install.sh.in (added)
• initrd/install_devel.sh.in (added)
• initrd/meson.build (added)
• initrd_manifest/meson.build (moved) (moved from uspace/lib/c/arch/ia32/Makefile.common ) (2 diffs)
• read_config/meson.build (added)
• tools/meson.build (added)

meson/part/initrd_manifest/meson.build

@@ -1 +1 @@
 #
-# Copyright (c) 2005 Martin Decky
+# Copyright (c) 2019 Jiří Zárevúcky
 # All rights reserved.
 #
@@ -27 +27 @@
 #
 
-ifeq ($(PROCESSOR),i486)
-        COMMON_CFLAGS += -march=i486
-else
-        COMMON_CFLAGS += -march=pentium
+# Init binaries. These are actually baked into the bootloader.
+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,
+]
+
+# Binaries allowed on the initrd image when CONFIG_BAREBONE is enabled.
+rd_essential = [
+        'app/bdsh',
+        'app/getterm',
+        'app/kio',
+
+        'srv/devman',
+        'srv/fs/locfs',
+        'srv/hid/console',
+        'srv/hid/input',
+        'srv/hid/output',
+        'srv/klog',
+
+        'drv/root/root',
+        'drv/root/virt',
+        'drv/fb/kfb',
+]
+
+if CONFIG_FB
+        rd_essential += [
+                'app/vlaunch',
+                'app/vterm',
+
+                'srv/hid/compositor',
+        ]
 endif
-
-# XXX: This architecture requires unoptimized TLS pointer access,
-#      as with the GCC option `-mno-tls-direct-seg-refs`.
-#      The `i686-helenos` target defaults to this behavior.
-
-COMMON_CFLAGS += -mno-tls-direct-seg-refs -fno-omit-frame-pointer
-LDFLAGS += -Wl,--gc-sections
-
-ENDIANESS = LE
-
-BFD_NAME = elf32-i386
-BFD_ARCH = i386