diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-04-30 23:37:33 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-04-30 23:37:33 +0000 |
| commit | d547966bd5e1c7754dba039d69f6a000e69a190d (patch) | |
| tree | 2670385b1f37ba5cb1c0e2f0028a3a173e64458a /distrib/octeon | |
| parent | 6879612b7d7e67eb54977949544e3092c4c2c71d (diff) | |
step by step, more removal of differences
Diffstat (limited to 'distrib/octeon')
| -rw-r--r-- | distrib/octeon/ramdisk/Makefile | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/distrib/octeon/ramdisk/Makefile b/distrib/octeon/ramdisk/Makefile index 4d391d4bf17..9b1790f2e9b 100644 --- a/distrib/octeon/ramdisk/Makefile +++ b/distrib/octeon/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2019/04/30 23:25:19 deraadt Exp $ +# $OpenBSD: Makefile,v 1.14 2019/04/30 23:37:32 deraadt Exp $ FS= miniroot${OSrev}.fs FSSIZE= 24576 @@ -33,6 +33,11 @@ bsd.rd: mr.fs bsd cp bsd bsd.rd rdsetroot bsd.rd mr.fs +bsd: + cd ${.CURDIR}/../../../sys/arch/octeon/compile/RAMDISK && \ + su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' + cp -p ${.CURDIR}/../../../sys/arch/octeon/compile/RAMDISK/obj/bsd bsd + mr.fs: instbin rm -rf $@.d install -d -o root -g wheel $@.d @@ -43,11 +48,6 @@ mr.fs: instbin rm $@.d/instbin makefs ${MRMAKEFSARGS} $@ $@.d -bsd: - cd ${.CURDIR}/../../../sys/arch/octeon/compile/RAMDISK && \ - su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' - cp -p ${.CURDIR}/../../../sys/arch/octeon/compile/RAMDISK/obj/bsd bsd - instbin.mk instbin.cache instbin.c: instbin.conf crunchgen -E -M -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib \ -c instbin.c -e instbin -m instbin.mk instbin.conf @@ -58,11 +58,6 @@ instbin: instbin.mk instbin.cache instbin.c instbin.conf: ${LISTS} awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf -clean cleandir: - rm -f *.core mr.fs instbin instbin.mk instbin.cache \ - lib*.a lib*.olist instbin.map *.o *.lo *.c bsd bsd.rd - rm -rf cd-dir mr.fs.d - unconfig: -umount -f ${MOUNT_POINT} -[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd @@ -74,4 +69,9 @@ install: cp ${FS} ${RELEASEDIR} .endif +clean cleandir: + rm -f *.core mr.fs instbin instbin.mk instbin.cache \ + lib*.a lib*.olist instbin.map *.o *.lo *.c bsd bsd.rd + rm -rf cd-dir mr.fs.d + .include <bsd.obj.mk> |