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/sparc64 | |
| parent | 6879612b7d7e67eb54977949544e3092c4c2c71d (diff) | |
step by step, more removal of differences
Diffstat (limited to 'distrib/sparc64')
| -rw-r--r-- | distrib/sparc64/miniroot/Makefile | 8 | ||||
| -rw-r--r-- | distrib/sparc64/ramdisk/Makefile | 8 | ||||
| -rw-r--r-- | distrib/sparc64/ramdiskB/Makefile | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/distrib/sparc64/miniroot/Makefile b/distrib/sparc64/miniroot/Makefile index 5000ce43f74..3713f5247de 100644 --- a/distrib/sparc64/miniroot/Makefile +++ b/distrib/sparc64/miniroot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2019/04/30 23:25:19 deraadt Exp $ +# $OpenBSD: Makefile,v 1.17 2019/04/30 23:37:32 deraadt Exp $ FS= miniroot${OSrev}.fs FSSIZE= 5760 @@ -83,9 +83,6 @@ mr.fs: instbin rm $@.d/instbin makefs ${MRMAKEFSARGS} $@ $@.d -instbin.conf: ${LISTS} - awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf - instbin.mk instbin.cache instbin.c: instbin.conf crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib \ -c instbin.c -e instbin -m instbin.mk instbin.conf @@ -93,6 +90,9 @@ instbin.mk instbin.cache instbin.c: instbin.conf instbin: instbin.mk instbin.cache instbin.c ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all +instbin.conf: ${LISTS} + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf + unconfig: -umount -f ${MOUNT_POINT} -[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile index 4be57d5aa0a..02e68244f05 100644 --- a/distrib/sparc64/ramdisk/Makefile +++ b/distrib/sparc64/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.47 2019/04/30 21:15:00 deraadt Exp $ +# $OpenBSD: Makefile,v 1.48 2019/04/30 23:37:32 deraadt Exp $ FS= floppy${OSrev}.fs FSSIZE= 2880 @@ -57,9 +57,6 @@ bsd: su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' cp -p ${.CURDIR}/../../../sys/arch/sparc64/compile/RAMDISKU1/obj/bsd bsd -instbin.conf: ${LISTS} - awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf - instbin.mk instbin.cache instbin.c: instbin.conf crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib \ -c instbin.c -e instbin -m instbin.mk instbin.conf @@ -67,6 +64,9 @@ instbin.mk instbin.cache instbin.c: instbin.conf instbin: instbin.mk instbin.cache instbin.c ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all +instbin.conf: ${LISTS} + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf + unconfig: -umount -f ${MOUNT_POINT} -[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile index 0b1b78e083e..0f7353ab98d 100644 --- a/distrib/sparc64/ramdiskB/Makefile +++ b/distrib/sparc64/ramdiskB/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.42 2019/04/30 23:25:19 deraadt Exp $ +# $OpenBSD: Makefile,v 1.43 2019/04/30 23:37:32 deraadt Exp $ FS= floppyB${OSrev}.fs FSDISKTYPE= floppy @@ -53,9 +53,6 @@ bsd: su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' cp -p ${.CURDIR}/../../../sys/arch/sparc64/compile/RAMDISKU5/obj/bsd bsd -instbin.conf: ${LISTS} - awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf - instbin.mk instbin.cache instbin.c: instbin.conf crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib \ -c instbin.c -e instbin -m instbin.mk instbin.conf @@ -63,6 +60,9 @@ instbin.mk instbin.cache instbin.c: instbin.conf instbin: instbin.mk instbin.cache instbin.c ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all +instbin.conf: ${LISTS} + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf + unconfig: -umount -f ${MOUNT_POINT} -[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd |