diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2002-08-05 15:25:44 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2002-08-05 15:25:44 +0000 |
| commit | efafad0d1c9c19f988dea32d53f9d2ff25245c4c (patch) | |
| tree | dfc576be433ffce5f5def7d2bd1c87cf3df4f2b6 /distrib | |
| parent | 763486558dae62b5b5cfd6235437d915c53ed22c (diff) | |
If ELF_TOOLCHAIN, pass -E to crunchgen and build elfrdsetroot instead
of rdsetroot.
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/miniroot/Makefile | 8 | ||||
| -rw-r--r-- | distrib/ramdisk/Makefile | 11 |
2 files changed, 16 insertions, 3 deletions
diff --git a/distrib/miniroot/Makefile b/distrib/miniroot/Makefile index 4d1eae95047..8185acceb92 100644 --- a/distrib/miniroot/Makefile +++ b/distrib/miniroot/Makefile @@ -1,10 +1,12 @@ -# $OpenBSD: Makefile,v 1.24 2002/04/30 07:24:22 deraadt Exp $ +# $OpenBSD: Makefile,v 1.25 2002/08/05 15:25:43 art Exp $ REV= ${OSrev} CBIN= instbin ARCHDIR= ${.CURDIR}/../${MACHINE}/miniroot +.include <bsd.own.mk> + .if exists(${ARCHDIR}/Makefile.inc) .include "${ARCHDIR}/Makefile.inc" .endif @@ -20,7 +22,11 @@ IMAGE?= miniroot${REV}.fs IMAGESIZE?= 10240 # 5MB in 512 byte blocks NEWFSOPTS?= NEWFS_WILL_FAIL?=false +.if ${ELF_TOOLCHAIN} == "yes" +CRUNCHGENOPTS?=-E +.else CRUNCHGENOPTS?= +.endif LISTS= ${.CURDIR}/list ${ARCHDIR}/list CRUNCHCONF= ${CBIN}.conf diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile index 8c5c02fb5c0..f631610686f 100644 --- a/distrib/ramdisk/Makefile +++ b/distrib/ramdisk/Makefile @@ -1,10 +1,12 @@ -# $OpenBSD: Makefile,v 1.23 2002/05/19 08:56:58 deraadt Exp $ +# $OpenBSD: Makefile,v 1.24 2002/08/05 15:25:43 art Exp $ REV= ${OSrev} CBIN= instbin ARCHDIR= ${.CURDIR}/../${MACHINE}/ramdisk +.include <bsd.own.mk> + .if exists(${ARCHDIR}/Makefile.inc) .include "${ARCHDIR}/Makefile.inc" .endif @@ -19,11 +21,16 @@ REALIMAGE!= echo /tmp/image.${PID} IMAGE?= ramdisk${REV}.fs IMAGESIZE?= 8192 # 4MB in 512 byte blocks NEWFS_WILL_FAIL?=false +.if ${ELF_TOOLCHAIN} == "yes" +RDSETROOT?= elfrdsetroot +CRUNCHGENOPTS?=-E +.else +RDSETROOT?= rdsetroot CRUNCHGENOPTS?= +.endif KERNEL?= RAMDISK UTILS?= ${.CURDIR}/../miniroot STRIP?= strip -RDSETROOT?= rdsetroot LISTS= ${.CURDIR}/list ${ARCHDIR}/list MTREE= ${UTILS}/mtree.conf |