Changeset 25a76ab8 in mainline for boot/Makefile.silo

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (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.

Message:

Merge mainline changes.

File:

• boot/Makefile.silo (moved) (moved from boot/arch/ia64/loader/Makefile.toolchain ) (1 diff)

boot/Makefile.silo

@@ -27 +27 @@
 #
 
-BFD_NAME = elf64-ia64-little
-BFD_ARCH = ia64
+.PHONY: all build_dist clean
 
-JOBFILE = ../../../../tools/jobfile.py
+include Makefile.common
 
-CFLAGS = \
-        -DRELEASE=$(RELEASE) -I. -I../../../generic -I../../../genarch \
-        -I../../../../kernel/generic/include -imacros ../../../../config.h \
-        -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration \
-        -Wmissing-prototypes -Werror -O3 -fno-unwind-tables -mfixed-range=f32-f127 \
-        -mno-pic -pipe
+ifeq ($(CONFIG_AOUT_ISOFS_B),y)
+        SILO_PACKAGE = a.out
+else
+        SILO_PACKAGE = raw
+endif
 
-DEPEND_DEFS = $(CONFIG_DEFS)
+ISOFS_B = silo/$(SILO_PACKAGE)/isofs.b
+SECOND_B = silo/$(SILO_PACKAGE)/second.b
+SILO_CONF = silo/silo.conf
+ISOFS_B_IN = $(DISTROOT)/boot/isofs.b
+
+all: $(POST_OUTPUT)
+
+$(POST_OUTPUT): build_dist
+        mkisofs -f -G $(ISOFS_B_IN) -B ... -r -o $@ $(DISTROOT)/
+
+build_dist: clean
+        mkdir -p $(DISTROOT)/boot
+        mkdir -p $(DISTROOT)/HelenOS
+        cp $(BOOT_OUTPUT) $(DISTROOT)/HelenOS/
+        cp $(ISOFS_B) $(DISTROOT)/boot/
+        cp $(SECOND_B) $(DISTROOT)/boot/
+        cp $(SILO_CONF) $(DISTROOT)/boot/
+
+clean:
+        rm -fr $(DISTROOT)