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/alpha | |
| parent | 30424fe1dc50a4724026246ffa0ce50e426c5681 (diff) | |
Use new rdsetroot.
Diffstat (limited to 'distrib/alpha')
| -rw-r--r-- | distrib/alpha/bsd.rd/Makefile | 11 | ||||
| -rw-r--r-- | distrib/alpha/common/Makefile.inc | 11 |
2 files changed, 6 insertions, 16 deletions
diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile index cf2997c02ec..39168a4e9bd 100644 --- a/distrib/alpha/bsd.rd/Makefile +++ b/distrib/alpha/bsd.rd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2017/09/18 20:13:52 jasper Exp $ +# $OpenBSD: Makefile,v 1.31 2019/04/05 21:08:00 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -24,9 +24,9 @@ bsd.rd: bsd.rd_unz strip ${STRIPOPTS} bsd.strip gzip -c ${GZIPFLAGS} bsd.strip > bsd.rd -bsd.rd_unz: bsd ${IMAGE} rdsetroot +bsd.rd_unz: bsd ${IMAGE} cp bsd bsd.rd_unz - ${.OBJDIR}/rdsetroot bsd.rd_unz ${IMAGE} + rdsetroot bsd.rd_unz ${IMAGE} strip -R .SUNW_ctf -R .shstrtab bsd.rd_unz bsd: @@ -44,11 +44,6 @@ ${IMAGE}: ${CBIN} rm $@.d/${CBIN} makefs ${MAKEFSARGS_RD} $@ $@.d -rdsetroot: ${TOP}/../common/elfrdsetroot.c - ${HOSTCC} ${HOSTCFLAGS} -o rdsetroot \ - ${TOP}/../common/elfrdsetroot.c ${TOP}/../common/elf32.c \ - ${TOP}/../common/elf64.c - .ifdef RELEASEDIR beforeinstall: cp bsd.rd ${RELEASEDIR} diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc index 6e463a60a31..162759f90fa 100644 --- a/distrib/alpha/common/Makefile.inc +++ b/distrib/alpha/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.35 2017/09/18 20:13:52 jasper Exp $ +# $OpenBSD: Makefile.inc,v 1.36 2019/04/05 21:08:00 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -66,9 +66,9 @@ bsd.gz: bsd.rd strip bsd.strip gzip -c ${GZIPFLAGS} bsd.strip > bsd.gz -bsd.rd: bsd ${IMAGE} rdsetroot +bsd.rd: bsd ${IMAGE} cp bsd bsd.rd - ${.OBJDIR}/rdsetroot bsd.rd ${IMAGE} + rdsetroot bsd.rd ${IMAGE} bsd: cd ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK} && \ @@ -85,11 +85,6 @@ ${IMAGE}: ${CBIN} rm $@.d/${CBIN} makefs ${MAKEFSARGS_RD} $@ $@.d -rdsetroot: ${TOP}/../common/elfrdsetroot.c - ${HOSTCC} ${HOSTCFLAGS} -o rdsetroot \ - ${TOP}/../common/elfrdsetroot.c ${TOP}/../common/elf32.c \ - ${TOP}/../common/elf64.c - unconfig: -umount ${MOUNT_POINT} -vnconfig -u ${VND} |