diff options
author | marius <marius@FreeBSD.org> | 2012-05-09 19:08:54 +0000 |
---|---|---|
committer | marius <marius@FreeBSD.org> | 2012-05-09 19:08:54 +0000 |
commit | 25b8009240a32f58ce297c50a7e29d52d3902bb3 (patch) | |
tree | 4811d4c668ff987117f3ce1e38d3bba74c4384ca | |
parent | f2b0ca2bf1dea919f1351f6766af5257cfd86852 (diff) | |
download | FreeBSD-src-25b8009240a32f58ce297c50a7e29d52d3902bb3.zip FreeBSD-src-25b8009240a32f58ce297c50a7e29d52d3902bb3.tar.gz |
Use a non-tricky approach for building and installing zfsboot sharing
the Makefile with boot1.
Submitted by: ru
-rw-r--r-- | sys/boot/sparc64/boot1/Makefile | 4 | ||||
-rw-r--r-- | sys/boot/sparc64/zfsboot/Makefile | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sys/boot/sparc64/boot1/Makefile b/sys/boot/sparc64/boot1/Makefile index 9a97400..048c083 100644 --- a/sys/boot/sparc64/boot1/Makefile +++ b/sys/boot/sparc64/boot1/Makefile @@ -5,7 +5,7 @@ INTERNALPROG= NO_MAN= FILES?= boot1 SRCS= _start.s boot1.c -CLEANFILES+=boot1 boot1.aout +CLEANFILES=${FILES} boot1.aout BOOTBLOCKBASE= 0x4000 @@ -14,7 +14,7 @@ LDFLAGS=-Ttext ${BOOTBLOCKBASE} -Wl,-N # Construct boot1. sunlabel expects it to contain zeroed-out space for the # label, and to be of the correct size. -boot1: boot1.aout +${FILES}: boot1.aout @set -- `ls -l boot1.aout`; x=$$((7680-$$5)); \ echo "$$x bytes available"; test $$x -ge 0 dd if=/dev/zero of=${.TARGET} bs=512 count=16 diff --git a/sys/boot/sparc64/zfsboot/Makefile b/sys/boot/sparc64/zfsboot/Makefile index bf30a32..9e58c27 100644 --- a/sys/boot/sparc64/zfsboot/Makefile +++ b/sys/boot/sparc64/zfsboot/Makefile @@ -5,9 +5,5 @@ PROGNAME= zfsboot CFLAGS+= -DZFSBOOT FILES= zfsboot -CLEANFILES+= zfsboot - -zfsboot: boot1 - ln -s ${.ALLSRC} ${.TARGET} .include "${.CURDIR}/../boot1/Makefile" |