diff options
-rw-r--r-- | distrib/arm64/ramdisk/Makefile | 11 | ||||
-rw-r--r-- | distrib/armv7/ramdisk/Makefile | 11 | ||||
-rw-r--r-- | distrib/landisk/miniroot/Makefile | 1 | ||||
-rw-r--r-- | distrib/landisk/ramdisk/Makefile | 15 | ||||
-rw-r--r-- | distrib/loongson/miniroot/Makefile | 1 | ||||
-rw-r--r-- | distrib/loongson/ramdisk/Makefile | 15 | ||||
-rw-r--r-- | distrib/luna88k/ramdisk/Makefile | 15 | ||||
-rw-r--r-- | distrib/macppc/ramdisk/Makefile | 17 | ||||
-rw-r--r-- | distrib/octeon/miniroot/Makefile | 1 | ||||
-rw-r--r-- | distrib/octeon/ramdisk/Makefile | 15 | ||||
-rw-r--r-- | distrib/sgi/ramdisk/Makefile | 11 | ||||
-rw-r--r-- | distrib/socppc/miniroot/Makefile | 1 | ||||
-rw-r--r-- | distrib/socppc/ramdisk/Makefile | 19 | ||||
-rw-r--r-- | distrib/sparc64/ramdisk/Makefile | 15 | ||||
-rw-r--r-- | distrib/sparc64/ramdiskB/Makefile | 15 |
15 files changed, 74 insertions, 89 deletions
diff --git a/distrib/arm64/ramdisk/Makefile b/distrib/arm64/ramdisk/Makefile index fa6cc53222e..e92c4357a39 100644 --- a/distrib/arm64/ramdisk/Makefile +++ b/distrib/arm64/ramdisk/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.5 2019/04/05 21:08:00 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 2019/04/28 15:15:39 deraadt Exp $ REV= ${OSrev} TOP= ${.CURDIR}/.. -BSD_RD= bsd.rd IMAGE= mr.fs CBIN?= instbin CRUNCHCONF?= ${CBIN}.conf @@ -28,7 +27,7 @@ all ${IMAGE}: .else ALLBSD= bsd -ALLBSDRD= ${BSD_RD} +ALLBSDRD= bsd.rd all: ${ALLBSDRD} bsd: @@ -36,9 +35,9 @@ bsd: su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' cp -p ${TOP}/../../sys/arch/arm64/compile/RAMDISK/obj/bsd bsd -${BSD_RD}: ${IMAGE} bsd - cp bsd ${BSD_RD} - rdsetroot ${BSD_RD} ${IMAGE} +bsd.rd: ${IMAGE} bsd + cp bsd bsd.rd + rdsetroot bsd.rd ${IMAGE} ${IMAGE}: ${CBIN} rm -rf $@.d diff --git a/distrib/armv7/ramdisk/Makefile b/distrib/armv7/ramdisk/Makefile index eacb92f7170..58c31af1817 100644 --- a/distrib/armv7/ramdisk/Makefile +++ b/distrib/armv7/ramdisk/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.19 2019/04/05 21:08:00 deraadt Exp $ +# $OpenBSD: Makefile,v 1.20 2019/04/28 15:15:39 deraadt Exp $ REV= ${OSrev} TOP= ${.CURDIR}/.. -BSD_RD= bsd.rd IMAGE= mr.fs CBIN?= instbin CRUNCHCONF?= ${CBIN}.conf @@ -32,7 +31,7 @@ all ${IMAGE}: .else ALLBSD= bsd -ALLBSDRD= ${BSD_RD} +ALLBSDRD= bsd.rd all: ${ALLBSDRD} bsd: @@ -40,9 +39,9 @@ bsd: su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' cp -p ${TOP}/../../sys/arch/armv7/compile/RAMDISK/obj/bsd bsd -${BSD_RD}: ${IMAGE} bsd - cp bsd ${BSD_RD} - rdsetroot ${BSD_RD} ${IMAGE} +bsd.rd: ${IMAGE} bsd + cp bsd bsd.rd + rdsetroot bsd.rd ${IMAGE} ${IMAGE}: ${CBIN} rm -rf $@.d diff --git a/distrib/landisk/miniroot/Makefile b/distrib/landisk/miniroot/Makefile index 7884a7f7df3..4b37bb9ed6b 100644 --- a/distrib/landisk/miniroot/Makefile +++ b/distrib/landisk/miniroot/Makefile @@ -1,6 +1,5 @@ REV= ${OSrev} -BSD_RD= bsd.rd IMAGE= miniroot${REV}.fs diff --git a/distrib/landisk/ramdisk/Makefile b/distrib/landisk/ramdisk/Makefile index ef257130c32..9b4b45ee962 100644 --- a/distrib/landisk/ramdisk/Makefile +++ b/distrib/landisk/ramdisk/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.21 2019/04/05 21:08:00 deraadt Exp $ +# $OpenBSD: Makefile,v 1.22 2019/04/28 15:15:39 deraadt Exp $ REV= ${OSrev} TOP= ${.CURDIR}/.. -BSD_RD= bsd.rd IMAGE= mr.fs CBIN?= instbin CRUNCHCONF?= ${CBIN}.conf @@ -24,11 +23,11 @@ all ${IMAGE}: .else # mix config is not needed. -all: ${BSD_RD} +all: bsd.rd -${BSD_RD}: ${IMAGE} bsd - cp bsd ${BSD_RD} - rdsetroot ${BSD_RD} ${IMAGE} +bsd.rd: ${IMAGE} bsd + cp bsd bsd.rd + rdsetroot bsd.rd ${IMAGE} ${IMAGE}: ${CBIN} rm -rf $@.d @@ -49,7 +48,7 @@ bsd: .ifdef RELEASEDIR install: - cp ${BSD_RD} ${RELEASEDIR} + cp bsd.rd ${RELEASEDIR} .endif ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} @@ -63,7 +62,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} + lib*.a lib*.olist ${CBIN}.map *.o *.lo *.c bsd bsd.rd rm -f instbin.conf rm -rf cd-dir ${IMAGE}.d diff --git a/distrib/loongson/miniroot/Makefile b/distrib/loongson/miniroot/Makefile index cf655941d3e..8a6e4942b5d 100644 --- a/distrib/loongson/miniroot/Makefile +++ b/distrib/loongson/miniroot/Makefile @@ -1,6 +1,5 @@ REV= ${OSrev} -BSD_RD= bsd.rd IMAGE= miniroot${REV}.fs diff --git a/distrib/loongson/ramdisk/Makefile b/distrib/loongson/ramdisk/Makefile index b5942266a35..175fb178233 100644 --- a/distrib/loongson/ramdisk/Makefile +++ b/distrib/loongson/ramdisk/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.13 2019/04/05 21:08:00 deraadt Exp $ +# $OpenBSD: Makefile,v 1.14 2019/04/28 15:15:39 deraadt Exp $ REV= ${OSrev} TOP= ${.CURDIR}/.. -BSD_RD= bsd.rd IMAGE= mr.fs CBIN?= instbin CRUNCHCONF?= ${CBIN}.conf @@ -24,11 +23,11 @@ all ${IMAGE}: .else # mix config is not needed. -all: ${BSD_RD} +all: bsd.rd -${BSD_RD}: ${IMAGE} bsd - cp bsd ${BSD_RD} - rdsetroot ${BSD_RD} ${IMAGE} +bsd.rd: ${IMAGE} bsd + cp bsd bsd.rd + rdsetroot bsd.rd ${IMAGE} ${IMAGE}: ${CBIN} rm -rf $@.d @@ -58,12 +57,12 @@ ${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} cd${REV}.iso + lib*.a lib*.olist ${CBIN}.map *.o *.lo *.c bsd bsd.rd cd${REV}.iso rm -rf cd-dir ${IMAGE}.d .ifdef RELEASEDIR install: - cp ${BSD_RD} ${RELEASEDIR} + cp bsd.rd ${RELEASEDIR} .endif .include <bsd.obj.mk> diff --git a/distrib/luna88k/ramdisk/Makefile b/distrib/luna88k/ramdisk/Makefile index 9e2e1ed05ff..ecbd6691920 100644 --- a/distrib/luna88k/ramdisk/Makefile +++ b/distrib/luna88k/ramdisk/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.20 2019/04/05 21:08:00 deraadt Exp $ +# $OpenBSD: Makefile,v 1.21 2019/04/28 15:15:39 deraadt Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" -BSD_RD= bsd.rd IMAGE= mr.fs CBIN?= instbin LISTS= ${.CURDIR}/list @@ -13,11 +12,11 @@ MTREE= ${UTILS}/mtree.conf DISKTYPE= rdroot MAKEFSARGS_RD= -o disklabel=${DISKTYPE},minfree=0 -all: ${BSD_RD} +all: bsd.rd -${BSD_RD}: ${IMAGE} bsd - cp bsd ${BSD_RD} - rdsetroot ${BSD_RD} ${IMAGE} +bsd.rd: ${IMAGE} bsd + cp bsd bsd.rd + rdsetroot bsd.rd ${IMAGE} ${IMAGE}: ${CBIN} rm -rf $@.d @@ -38,7 +37,7 @@ bsd: .ifdef RELEASEDIR install: - cp ${BSD_RD} ${RELEASEDIR} + cp bsd.rd ${RELEASEDIR} .endif ${CBIN}.conf: ${LISTS} @@ -52,7 +51,7 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c clean cleandir: /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.conf ${CBIN}.mk ${CBIN}.cache \ - lib*.a lib*.olist ${CBIN}.map *.o *.lo *.c bsd ${BSD_RD} + lib*.a lib*.olist ${CBIN}.map *.o *.lo *.c bsd bsd.rd /bin/rm -rf ${IMAGE}.d .include <bsd.obj.mk> diff --git a/distrib/macppc/ramdisk/Makefile b/distrib/macppc/ramdisk/Makefile index f26ee2a31f4..38e1579ff43 100644 --- a/distrib/macppc/ramdisk/Makefile +++ b/distrib/macppc/ramdisk/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.36 2019/04/28 14:48:10 deraadt Exp $ +# $OpenBSD: Makefile,v 1.37 2019/04/28 15:15:39 deraadt Exp $ REV= ${OSrev} TOP= ${.CURDIR}/.. -BSD_RD= bsd.rd IMAGE= mr.fs CBIN?= instbin CRUNCHCONF?= ${CBIN}.conf @@ -24,13 +23,13 @@ all ${IMAGE}: .else # mix config is not needed. -all: ${BSD_RD} cd +all: bsd.rd cd -${BSD_RD}: ${IMAGE} bsd - cp bsd ${BSD_RD} - rdsetroot ${BSD_RD} ${IMAGE} +bsd.rd: ${IMAGE} bsd + cp bsd bsd.rd + rdsetroot bsd.rd ${IMAGE} -cd: ${BSD_RD} +cd: bsd.rd -rm -rf ${.OBJDIR}/cd-dir/ -@mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/macppc/ cp bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/macppc/bsd.rd @@ -85,12 +84,12 @@ ${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} cd${REV}.iso + lib*.a lib*.olist ${CBIN}.map *.o *.lo *.c bsd bsd.rd cd${REV}.iso rm -rf cd-dir ${IMAGE}.d .ifdef RELEASEDIR install: - cp ${BSD_RD} cd${REV}.iso ${RELEASEDIR} + cp bsd.rd cd${REV}.iso ${RELEASEDIR} .endif .include <bsd.obj.mk> diff --git a/distrib/octeon/miniroot/Makefile b/distrib/octeon/miniroot/Makefile index d649e7b2aa2..ede809efdf1 100644 --- a/distrib/octeon/miniroot/Makefile +++ b/distrib/octeon/miniroot/Makefile @@ -1,6 +1,5 @@ REV= ${OSrev} -BSD_RD= bsd.rd IMAGE= miniroot${REV}.fs diff --git a/distrib/octeon/ramdisk/Makefile b/distrib/octeon/ramdisk/Makefile index 26b6b1b95f5..e5d1361ef7c 100644 --- a/distrib/octeon/ramdisk/Makefile +++ b/distrib/octeon/ramdisk/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.6 2019/04/05 21:08:00 deraadt Exp $ +# $OpenBSD: Makefile,v 1.7 2019/04/28 15:15:39 deraadt Exp $ REV= ${OSrev} TOP= ${.CURDIR}/.. -BSD_RD= bsd.rd IMAGE= mr.fs CBIN?= instbin CRUNCHCONF?= ${CBIN}.conf @@ -18,11 +17,11 @@ DISKTYPE= rdroot MAKEFSARGS_RD= -o disklabel=${DISKTYPE},minfree=0,density=4096 # mix config is not needed. -all: ${BSD_RD} +all: bsd.rd -${BSD_RD}: ${IMAGE} bsd - cp bsd ${BSD_RD} - rdsetroot ${BSD_RD} ${IMAGE} +bsd.rd: ${IMAGE} bsd + cp bsd bsd.rd + rdsetroot bsd.rd ${IMAGE} ${IMAGE}: ${CBIN} rm -rf $@.d @@ -50,12 +49,12 @@ ${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} + lib*.a lib*.olist ${CBIN}.map *.o *.lo *.c bsd bsd.rd rm -rf cd-dir ${IMAGE}.d .ifdef RELEASEDIR install: - cp ${BSD_RD} ${RELEASEDIR} + cp bsd.rd ${RELEASEDIR} .endif .include <bsd.obj.mk> diff --git a/distrib/sgi/ramdisk/Makefile b/distrib/sgi/ramdisk/Makefile index a1d91543e08..1c9b9ab0e1d 100644 --- a/distrib/sgi/ramdisk/Makefile +++ b/distrib/sgi/ramdisk/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.24 2019/04/05 21:08:01 deraadt Exp $ +# $OpenBSD: Makefile,v 1.25 2019/04/28 15:15:39 deraadt Exp $ REV= ${OSrev} TOP= ${.CURDIR}/.. -BSD_RD= bsd.rd IMAGE= mr.fs CBIN?= instbin CRUNCHCONF?= ${CBIN}.conf @@ -28,7 +27,7 @@ ALLBSD= ALLBSDRD= .for IP in ${ALLIP} ALLBSD+= bsd.IP${IP} -ALLBSDRD+= ${BSD_RD}.IP${IP} +ALLBSDRD+= bsd.rd.IP${IP} all: ${ALLBSDRD} .endfor @@ -40,9 +39,9 @@ bsd.IP${IP}: .endif cp -p ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP${IP}/obj/bsd bsd.IP${IP} -${BSD_RD}.IP${IP}: ${IMAGE} bsd.IP${IP} - cp bsd.IP${IP} ${BSD_RD}.IP${IP} - rdsetroot ${BSD_RD}.IP${IP} ${IMAGE} +bsd.rd.IP${IP}: ${IMAGE} bsd.IP${IP} + cp bsd.IP${IP} bsd.rd.IP${IP} + rdsetroot bsd.rd.IP${IP} ${IMAGE} .endfor ${IMAGE}: ${CBIN} diff --git a/distrib/socppc/miniroot/Makefile b/distrib/socppc/miniroot/Makefile index effe24b0382..dfd0304a282 100644 --- a/distrib/socppc/miniroot/Makefile +++ b/distrib/socppc/miniroot/Makefile @@ -1,6 +1,5 @@ REV= ${OSrev} -BSD_RD= bsd.rd IMAGE= miniroot${REV}.fs diff --git a/distrib/socppc/ramdisk/Makefile b/distrib/socppc/ramdisk/Makefile index 9bf155b267e..fdd4489b0f6 100644 --- a/distrib/socppc/ramdisk/Makefile +++ b/distrib/socppc/ramdisk/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.19 2019/04/14 14:07:08 deraadt Exp $ +# $OpenBSD: Makefile,v 1.20 2019/04/28 15:15:40 deraadt Exp $ REV= ${OSrev} TOP= ${.CURDIR}/.. -BSD_RD= bsd.rd BSD_BIN= bsd.bin IMAGE= mr.fs CBIN?= instbin @@ -25,14 +24,14 @@ all ${IMAGE}: .else # mix config is not needed. -all: ${BSD_RD} ${BSD_BIN} +all: bsd.rd ${BSD_BIN} -${BSD_RD}: ${IMAGE} bsd - cp bsd ${BSD_RD} - rdsetroot ${BSD_RD} ${IMAGE} +bsd.rd: ${IMAGE} bsd + cp bsd bsd.rd + rdsetroot bsd.rd ${IMAGE} -${BSD_BIN}: ${BSD_RD} - objcopy -O binary ${BSD_RD} ${BSD_BIN} +${BSD_BIN}: bsd.rd + objcopy -O binary bsd.rd ${BSD_BIN} ${IMAGE}: ${CBIN} rm -rf $@.d @@ -62,12 +61,12 @@ ${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} cd${REV}.iso + lib*.a lib*.olist ${CBIN}.map *.o *.lo *.c bsd bsd.rd cd${REV}.iso rm -rf cd-dir ${IMAGE}.d .ifdef RELEASEDIR install: - cp ${BSD_RD} ${BSD_BIN} ${RELEASEDIR} + cp bsd.rd ${BSD_BIN} ${RELEASEDIR} .endif .include <bsd.obj.mk> diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile index 6943e44da99..1f3ba7625ab 100644 --- a/distrib/sparc64/ramdisk/Makefile +++ b/distrib/sparc64/ramdisk/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.39 2019/04/28 14:48:11 deraadt Exp $ +# $OpenBSD: Makefile,v 1.40 2019/04/28 15:15:40 deraadt Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" -BSD_RD= bsd.rd IMAGE= mr.fs CBIN?= instbin LISTS= ${.CURDIR}/list @@ -28,7 +27,7 @@ all ${IMAGE}: .else # mix config is not needed. -all: ${FLOPPY} ${BSD_RD} +all: ${FLOPPY} bsd.rd bsd.gz: bsd.rd gzip ${GZIPFLAGS} < bsd.rd > bsd.gz @@ -49,10 +48,10 @@ ${FLOPPY}: bsd.gz ${BOOT} /usr/ vnconfig -u `cat vnd` rm -f vnd -${BSD_RD}: ${CBIN} ${IMAGE} bsd - cp bsd ${BSD_RD} - rdsetroot ${BSD_RD} ${IMAGE} - strip -R .SUNW_ctf ${BSD_RD} +bsd.rd: ${CBIN} ${IMAGE} bsd + cp bsd bsd.rd + rdsetroot bsd.rd ${IMAGE} + strip -R .SUNW_ctf bsd.rd ${IMAGE}: ${CBIN} rm -rf $@.d @@ -87,7 +86,7 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c clean cleandir: /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ lib*.a lib*.olist ${CBIN}.map \ - *.o *.lo *.c bsd ${BSD_RD} bsd.gz ${FLOPPY} + *.o *.lo *.c bsd bsd.rd bsd.gz ${FLOPPY} /bin/rm -rf ${IMAGE}.d .ifdef RELEASEDIR diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile index f287ec53016..8a0a6532b7c 100644 --- a/distrib/sparc64/ramdiskB/Makefile +++ b/distrib/sparc64/ramdiskB/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.33 2019/04/28 14:48:11 deraadt Exp $ +# $OpenBSD: Makefile,v 1.34 2019/04/28 15:15:40 deraadt Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" -BSD_RD= bsd.rd IMAGE= mr.fs CBIN?= instbin LISTS= ${.CURDIR}/list @@ -28,7 +27,7 @@ all ${IMAGE}: .else # mix config is not needed. -all: ${FLOPPY} ${BSD_RD} +all: ${FLOPPY} bsd.rd bsd.gz: bsd.rd gzip ${GZIPFLAGS} < bsd.rd > bsd.gz @@ -49,10 +48,10 @@ ${FLOPPY}: bsd.gz ${BOOT} /usr/ vnconfig -u `cat vnd` rm -f vnd -${BSD_RD}: ${CBIN} ${IMAGE} bsd - cp bsd ${BSD_RD} - rdsetroot ${BSD_RD} ${IMAGE} - strip -R .SUNW_ctf ${BSD_RD} +bsd.rd: ${CBIN} ${IMAGE} bsd + cp bsd bsd.rd + rdsetroot bsd.rd ${IMAGE} + strip -R .SUNW_ctf bsd.rd ${IMAGE}: ${CBIN} rm -rf $@.d @@ -87,7 +86,7 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c clean cleandir: /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ lib*.a lib*.olist ${CBIN}.map \ - *.o *.lo *.c bsd ${BSD_RD} bsd.gz ${FLOPPY} + *.o *.lo *.c bsd bsd.rd bsd.gz ${FLOPPY} /bin/rm -rf ${IMAGE}.d .ifdef RELEASEDIR |