diff options
| author | phk <phk@FreeBSD.org> | 2003-01-26 13:33:57 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-01-26 13:33:57 +0000 |
| commit | 9aa3b3c3f77e3399b315732c3cb57d368263c901 (patch) | |
| tree | 7df7f8413841e4afeec14e51845a7c062336f880 /sys | |
| parent | a3f942c75e4cbdd3158b0a54072150ac17639afb (diff) | |
| download | FreeBSD-src-9aa3b3c3f77e3399b315732c3cb57d368263c901.zip FreeBSD-src-9aa3b3c3f77e3399b315732c3cb57d368263c901.tar.gz | |
Build a file "boot" which consists of boot1 and boot2 concatenated.
There is little if any reason to treat the two components separately
and it will simplify disklabel(8) and libdisk if we didn't.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/boot/i386/boot2/Makefile | 7 | ||||
| -rw-r--r-- | sys/boot/i386/gptboot/Makefile | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile index ec7a536..900a3d4 100644 --- a/sys/boot/i386/boot2/Makefile +++ b/sys/boot/i386/boot2/Makefile @@ -47,7 +47,10 @@ CFLAGS= -elf -ffreestanding -Os -fno-builtin \ LDFLAGS=-nostdlib -static -N --gc-sections -all: boot1 boot2 +all: boot1 boot2 boot + +boot: boot1 boot2 + cat boot1 boot2 > boot boot1: boot1.out objcopy -S -O binary boot1.out ${.TARGET} @@ -99,6 +102,8 @@ sio.o: sio.s install: ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + boot ${DESTDIR}${BINDIR}/boot + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ boot1 ${DESTDIR}${BINDIR}/boot1 ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ boot2 ${DESTDIR}${BINDIR}/boot2 diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile index ec7a536..900a3d4 100644 --- a/sys/boot/i386/gptboot/Makefile +++ b/sys/boot/i386/gptboot/Makefile @@ -47,7 +47,10 @@ CFLAGS= -elf -ffreestanding -Os -fno-builtin \ LDFLAGS=-nostdlib -static -N --gc-sections -all: boot1 boot2 +all: boot1 boot2 boot + +boot: boot1 boot2 + cat boot1 boot2 > boot boot1: boot1.out objcopy -S -O binary boot1.out ${.TARGET} @@ -99,6 +102,8 @@ sio.o: sio.s install: ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + boot ${DESTDIR}${BINDIR}/boot + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ boot1 ${DESTDIR}${BINDIR}/boot1 ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ boot2 ${DESTDIR}${BINDIR}/boot2 |
