Changeset 3e828ea in mainline for boot/arch/ppc32/meson.build

Timestamp:

2019-09-23T12:49:29Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• boot/arch/ppc32/meson.build (moved) (moved from boot/Makefile.yaboot ) (1 diff)

boot/arch/ppc32/meson.build

@@ -27 +27 @@
 #
 
-.PHONY: all build_dist clean
+BUILD = true
+POSTBUILD = 'yaboot'
+POST_OUTPUT = 'image.iso'
+boot_image_format = 'elf'
 
-include Makefile.common
+boot_src = files(
+        'src/asm.S',
+        'src/main.c',
+        'src/ofw.c',
 
-OFBOOT = yaboot/ofboot.b
-BOOTINFO = yaboot/bootinfo.txt
-YABOOT = yaboot/yaboot
-YABOOT_CONF = yaboot/yaboot.conf
-MAPS = yaboot/maps
-
-all: $(POST_OUTPUT)
-
-$(POST_OUTPUT): build_dist
-        $(GENISOIMAGE) -hfs -part -map $(MAPS) -no-desktop -hfs-volid "HelenOS" -hfs-bless $(DISTROOT)/boot -r -o $@ $(DISTROOT)/
-
-build_dist: clean
-        mkdir -p $(DISTROOT)/boot
-        mkdir -p $(DISTROOT)/ppc
-        cp $(BOOT_OUTPUT) $(DISTROOT)/boot/
-        cp $(OFBOOT) $(DISTROOT)/boot/
-        cp $(BOOTINFO) $(DISTROOT)/ppc/
-        cp $(YABOOT) $(DISTROOT)/boot/
-        cp $(YABOOT_CONF) $(DISTROOT)/boot/
-
-clean:
-        rm -fr $(DISTROOT)
+        '../../genarch/src/ofw.c',
+        '../../genarch/src/ofw_tree.c',
+        '../../genarch/src/division.c',
+        '../../genarch/src/multiplication.c',
+        '../../generic/src/balloc.c',
+        '../../generic/src/memstr.c',
+        '../../generic/src/printf_core.c',
+        '../../generic/src/vprintf.c',
+        '../../generic/src/printf.c',
+        '../../generic/src/str.c',
+        '../../generic/src/version.c',
+        '../../generic/src/inflate.c',
+        '../../generic/src/gzip.c',
+        '../../generic/src/tar.c',
+        '../../generic/src/kernel.c',
+        '../../generic/src/payload.c',
+)