diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-04-05 21:08:02 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-04-05 21:08:02 +0000 |
| commit | 80cc16f025842d7b43c859eb99316624d1685ab8 (patch) | |
| tree | 1c1af08b3f3fab3478dcf168fcf9f47e04fce4b2 /distrib/octeon | |
| parent | 30424fe1dc50a4724026246ffa0ce50e426c5681 (diff) | |
Use new rdsetroot.
Diffstat (limited to 'distrib/octeon')
| -rw-r--r-- | distrib/octeon/ramdisk/Makefile | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/distrib/octeon/ramdisk/Makefile b/distrib/octeon/ramdisk/Makefile index 9752eb8f889..26b6b1b95f5 100644 --- a/distrib/octeon/ramdisk/Makefile +++ b/distrib/octeon/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2016/12/05 20:08:34 natano Exp $ +# $OpenBSD: Makefile,v 1.6 2019/04/05 21:08:00 deraadt Exp $ REV= ${OSrev} @@ -20,9 +20,9 @@ MAKEFSARGS_RD= -o disklabel=${DISKTYPE},minfree=0,density=4096 # mix config is not needed. all: ${BSD_RD} -${BSD_RD}: ${IMAGE} bsd rdsetroot +${BSD_RD}: ${IMAGE} bsd cp bsd ${BSD_RD} - ${.OBJDIR}/rdsetroot ${BSD_RD} ${IMAGE} + rdsetroot ${BSD_RD} ${IMAGE} ${IMAGE}: ${CBIN} rm -rf $@.d @@ -39,11 +39,6 @@ bsd: su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' cp -p ${TOP}/../../sys/arch/octeon/compile/RAMDISK/obj/bsd bsd -rdsetroot: ${TOP}/../common/elfrdsetroot.c - ${HOSTCC} ${HOSTCFLAGS} -o rdsetroot \ - ${TOP}/../common/elfrdsetroot.c ${TOP}/../common/elf32.c \ - ${TOP}/../common/elf64.c - ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen -M -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} @@ -55,8 +50,7 @@ ${CRUNCHCONF}: ${LISTS} clean cleandir: /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ - lib*.a lib*.olist ${CBIN}.map \ - *.o *.lo *.c bsd ${BSD_RD} rdsetroot + lib*.a lib*.olist ${CBIN}.map *.o *.lo *.c bsd ${BSD_RD} rm -rf cd-dir ${IMAGE}.d .ifdef RELEASEDIR |