diff options
23 files changed, 204 insertions, 222 deletions
diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile index 13d32e1a730..ba516961022 100644 --- a/distrib/alpha/bsd.rd/Makefile +++ b/distrib/alpha/bsd.rd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.33 2019/04/28 14:48:08 deraadt Exp $ +# $OpenBSD: Makefile,v 1.34 2019/04/28 15:21:49 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -32,14 +32,14 @@ bsd: su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}' cp -p ${.CURDIR}/../../../sys/arch/alpha/compile/RAMDISKBIG/obj/bsd bsd -${IMAGE}: ${CBIN} +${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} - rm $@.d/${CBIN} + rm $@.d/instbin makefs ${MAKEFSARGS_RD} $@ $@.d .ifdef RELEASEDIR diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc index 99c4ed06e7b..f71c02954e4 100644 --- a/distrib/alpha/common/Makefile.inc +++ b/distrib/alpha/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.38 2019/04/28 14:48:09 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.39 2019/04/28 15:21:49 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -61,14 +61,14 @@ bsd: su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}' cp -p ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK}/obj/bsd bsd -${IMAGE}: ${CBIN} +${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} - rm $@.d/${CBIN} + rm $@.d/instbin makefs ${MAKEFSARGS_RD} $@ $@.d unconfig: diff --git a/distrib/alpha/inst-common/Makefile.inc b/distrib/alpha/inst-common/Makefile.inc index a4802d0aa98..12b96fbb51e 100644 --- a/distrib/alpha/inst-common/Makefile.inc +++ b/distrib/alpha/inst-common/Makefile.inc @@ -1,31 +1,30 @@ # -# $OpenBSD: Makefile.inc,v 1.16 2017/09/18 20:09:34 jasper Exp $ +# $OpenBSD: Makefile.inc,v 1.17 2019/04/28 15:21:49 deraadt Exp $ # # TOP is assumed to be defined by Makefile including this one. -CBIN?= instbin UTILS= ${TOP}/../miniroot LISTS?= ${.CURDIR}/../common/list -CRUNCHCONF?= ${CBIN}.conf +CRUNCHCONF?= instbin.conf MTREE= ${UTILS}/mtree.conf STRIPOPTS?= -R .eh_frame -R .SUNW_ctf -R .shstrtab ${CRUNCHCONF}: ${LISTS} - awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} +instbin.mk instbin.cache instbin.c: ${CRUNCHCONF} crunchgen -E -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CRUNCHCONF} -${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all - strip ${STRIPOPTS} ${CBIN} +instbin: instbin.mk instbin.cache instbin.c + ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all + strip ${STRIPOPTS} instbin clean cleandir: - /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ + /bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \ *.o *.lo *.c \ - lib*.a lib*.olist ${CBIN}.map ${CLEANFILES} + lib*.a lib*.olist instbin.map ${CLEANFILES} /bin/rm -rf ${IMAGE}.d .include <bsd.obj.mk> diff --git a/distrib/amd64/ramdiskA/Makefile.inc b/distrib/amd64/ramdiskA/Makefile.inc index 282d9122f83..4f388396828 100644 --- a/distrib/amd64/ramdiskA/Makefile.inc +++ b/distrib/amd64/ramdiskA/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.10 2019/04/28 14:48:10 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.11 2019/04/28 15:21:49 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -97,7 +97,7 @@ instbin: instbin.mk instbin.cache instbin.c strip -R .comment -R .SUNW_ctf instbin instbin.conf: ${LISTS} - awk -f ${UTILS}/makeconf.awk CBIN=instbin ${LISTS} > instbin.conf + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf clean cleandir: /bin/rm -f *.core mr.fs instbin instbin.mk instbin*.cache \ diff --git a/distrib/amd64/ramdisk_cd/Makefile.inc b/distrib/amd64/ramdisk_cd/Makefile.inc index d2d6b0be6b5..98977948414 100644 --- a/distrib/amd64/ramdisk_cd/Makefile.inc +++ b/distrib/amd64/ramdisk_cd/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.10 2019/04/28 14:48:10 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.11 2019/04/28 15:21:49 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -104,7 +104,7 @@ instbin: instbin.mk instbin.cache instbin.c strip -R .comment -R .SUNW_ctf instbin instbin.conf: ${LISTS} - awk -f ${UTILS}/makeconf.awk CBIN=instbin ${LISTS} > instbin.conf + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf clean cleandir: /bin/rm -f *.core mr.fs instbin instbin.mk instbin*.cache \ diff --git a/distrib/arm64/ramdisk/Makefile b/distrib/arm64/ramdisk/Makefile index e92c4357a39..49ab3f920e0 100644 --- a/distrib/arm64/ramdisk/Makefile +++ b/distrib/arm64/ramdisk/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.6 2019/04/28 15:15:39 deraadt Exp $ +# $OpenBSD: Makefile,v 1.7 2019/04/28 15:21:49 deraadt Exp $ REV= ${OSrev} TOP= ${.CURDIR}/.. IMAGE= mr.fs -CBIN?= instbin -CRUNCHCONF?= ${CBIN}.conf +CRUNCHCONF?= instbin.conf CRUNCHCONFS?= ${.CURDIR}/../common/crunch.conf LISTS= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot @@ -39,7 +38,7 @@ bsd.rd: ${IMAGE} bsd cp bsd bsd.rd rdsetroot bsd.rd ${IMAGE} -${IMAGE}: ${CBIN} +${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d .for DIR in ${DIRS} @@ -49,23 +48,23 @@ ${IMAGE}: ${CBIN} TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} - rm $@.d/${CBIN} + rm $@.d/instbin makefs ${MAKEFSARGS_RD} $@ $@.d .endif -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} +instbin.mk instbin.cache instbin.c: ${CRUNCHCONF} crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} -${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all +instbin: instbin.mk instbin.cache instbin.c + ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all ${CRUNCHCONF}: ${LISTS} - awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf clean cleandir: - /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ - lib*.a lib*.olist ${CBIN}.map *.o *.lo *.c ${ALLBSD} ${ALLBSDRD} + /bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \ + lib*.a lib*.olist instbin.map *.o *.lo *.c ${ALLBSD} ${ALLBSDRD} rm -f instbin.conf rm -rf cd-dir ${IMAGE}.d diff --git a/distrib/armv7/ramdisk/Makefile b/distrib/armv7/ramdisk/Makefile index 58c31af1817..d61e6432947 100644 --- a/distrib/armv7/ramdisk/Makefile +++ b/distrib/armv7/ramdisk/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.20 2019/04/28 15:15:39 deraadt Exp $ +# $OpenBSD: Makefile,v 1.21 2019/04/28 15:21:49 deraadt Exp $ REV= ${OSrev} TOP= ${.CURDIR}/.. IMAGE= mr.fs -CBIN?= instbin -CRUNCHCONF?= ${CBIN}.conf +CRUNCHCONF?= instbin.conf CRUNCHCONFS?= ${.CURDIR}/../common/crunch.conf LISTS= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot @@ -43,7 +42,7 @@ bsd.rd: ${IMAGE} bsd cp bsd bsd.rd rdsetroot bsd.rd ${IMAGE} -${IMAGE}: ${CBIN} +${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d .for DIR in ${DIRS} @@ -53,23 +52,23 @@ ${IMAGE}: ${CBIN} TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} - rm $@.d/${CBIN} + rm $@.d/instbin makefs ${MAKEFSARGS_RD} $@ $@.d .endif -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} +instbin.mk instbin.cache instbin.c: ${CRUNCHCONF} crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} -${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all +instbin: instbin.mk instbin.cache instbin.c + ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all ${CRUNCHCONF}: ${LISTS} - awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf clean cleandir: - /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ - lib*.a lib*.olist ${CBIN}.map *.o *.lo *.c ${ALLBSD} ${ALLBSDRD} + /bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \ + lib*.a lib*.olist instbin.map *.o *.lo *.c ${ALLBSD} ${ALLBSDRD} rm -f instbin.conf rm -rf cd-dir ${IMAGE}.d diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile index 3a338a53b0f..e48fd8fb8c2 100644 --- a/distrib/hppa/ramdisk/Makefile +++ b/distrib/hppa/ramdisk/Makefile @@ -1,6 +1,5 @@ -# $OpenBSD: Makefile,v 1.37 2019/04/28 14:48:10 deraadt Exp $ +# $OpenBSD: Makefile,v 1.38 2019/04/28 15:21:49 deraadt Exp $ -CBIN= instbin ARCHDIR= ${.CURDIR}/.. SRCDIR= ${.CURDIR}/../../.. @@ -60,34 +59,34 @@ bsd.rd: obsd ${IMAGE} bsd: bsd.rd (cat bsd.rd ; dd if=/dev/zero count=1) | gzip ${GZIPFLAGS} > bsd -${IMAGE}: ${CBIN} +${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} ARCHDIR=${ARCHDIR} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} - rm $@.d/${CBIN} + rm $@.d/instbin makefs ${MAKEFSARGS_RD} $@ $@.d vnconfig -v ${IMAGE} > vnd df -i /dev/`cat vnd`a vnconfig -u `cat vnd` rm -f vnd -${CBIN}.conf: ${LISTS} - awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf +instbin.conf: ${LISTS} + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf +instbin.mk instbin.cache instbin.c: instbin.conf crunchgen ${CRUNCHGENOPTS} -D ${SRCDIR} -L ${DESTDIR}/usr/lib \ - ${CBIN}.conf + instbin.conf -${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all +instbin: instbin.mk instbin.cache instbin.c + ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all clean cleandir: - /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ - lib*.a lib*.olist ${CBIN}.map \ - ${CBIN}.conf *.o *.lo *.c obsd bsd bsd.* ${LIF} ${CDROM} + /bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \ + lib*.a lib*.olist instbin.map \ + instbin.conf *.o *.lo *.c obsd bsd bsd.* ${LIF} ${CDROM} /bin/rm -rf ${IMAGE}.d .ifdef RELEASEDIR diff --git a/distrib/i386/common/Makefile.inc b/distrib/i386/common/Makefile.inc index cac41e8abbb..398530a5da5 100644 --- a/distrib/i386/common/Makefile.inc +++ b/distrib/i386/common/Makefile.inc @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile.inc,v 1.47 2019/04/28 14:48:10 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.48 2019/04/28 15:21:49 deraadt Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" IMAGE= mr.fs -CBIN?= instbin -CRUNCHCONF?= ${CBIN}.conf +CRUNCHCONF?= instbin.conf LISTS?= ${.CURDIR}/../common/list UTILS?= ${.CURDIR}/../../miniroot @@ -65,14 +64,14 @@ bsd: su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}' cp -p ${.CURDIR}/../../../sys/arch/i386/compile/${RAMDISK}/obj/bsd bsd -${IMAGE}: ${CBIN} +${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} - rm $@.d/${CBIN} + rm $@.d/instbin makefs ${MAKEFSARGS_RD} $@ $@.d vnconfig -v mr.fs > vnd df -i /dev/`cat vnd`a @@ -90,21 +89,21 @@ install: .endif .endif # RELEASEDIR -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} +instbin.mk instbin.cache instbin.c: ${CRUNCHCONF} crunchgen -E -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib \ - -c ${CBIN}.c -e ${CBIN} -m ${CBIN}.mk ${CRUNCHCONF} + -c instbin.c -e instbin -m instbin.mk ${CRUNCHCONF} -${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all - strip -R .comment -R .SUNW_ctf ${CBIN} +instbin: instbin.mk instbin.cache instbin.c + ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all + strip -R .comment -R .SUNW_ctf instbin ${CRUNCHCONF}: ${LISTS} - awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CRUNCHCONF} + awk -f ${UTILS}/makeconf.awk ${LISTS} > ${CRUNCHCONF} clean cleandir: - /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}*.cache \ + /bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin*.cache \ *.o *.lo *.c bsd bsd.rd bsd.gz bsd.strip floppy*.fs \ - lib*.a lib*.olist ${CBIN}.map boot ${CRUNCHCONF} ${FS} + lib*.a lib*.olist instbin.map boot ${CRUNCHCONF} ${FS} /bin/rm -rf ${IMAGE}.d .include <bsd.obj.mk> diff --git a/distrib/landisk/ramdisk/Makefile b/distrib/landisk/ramdisk/Makefile index 9b4b45ee962..a8540d22338 100644 --- a/distrib/landisk/ramdisk/Makefile +++ b/distrib/landisk/ramdisk/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.22 2019/04/28 15:15:39 deraadt Exp $ +# $OpenBSD: Makefile,v 1.23 2019/04/28 15:21:49 deraadt Exp $ REV= ${OSrev} TOP= ${.CURDIR}/.. IMAGE= mr.fs -CBIN?= instbin -CRUNCHCONF?= ${CBIN}.conf +CRUNCHCONF?= instbin.conf CRUNCHCONFS?= ${.CURDIR}/../common/crunch.conf LISTS= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot @@ -29,14 +28,14 @@ bsd.rd: ${IMAGE} bsd cp bsd bsd.rd rdsetroot bsd.rd ${IMAGE} -${IMAGE}: ${CBIN} +${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} - rm $@.d/${CBIN} + rm $@.d/instbin makefs ${MAKEFSARGS_RD} $@ $@.d .endif @@ -51,18 +50,18 @@ install: cp bsd.rd ${RELEASEDIR} .endif -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} +instbin.mk instbin.cache instbin.c: ${CRUNCHCONF} crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} -${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all +instbin: instbin.mk instbin.cache instbin.c + ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all ${CRUNCHCONF}: ${LISTS} - awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf clean cleandir: - /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ - lib*.a lib*.olist ${CBIN}.map *.o *.lo *.c bsd bsd.rd + /bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \ + lib*.a lib*.olist instbin.map *.o *.lo *.c bsd bsd.rd rm -f instbin.conf rm -rf cd-dir ${IMAGE}.d diff --git a/distrib/loongson/ramdisk/Makefile b/distrib/loongson/ramdisk/Makefile index 175fb178233..98a763629e8 100644 --- a/distrib/loongson/ramdisk/Makefile +++ b/distrib/loongson/ramdisk/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.14 2019/04/28 15:15:39 deraadt Exp $ +# $OpenBSD: Makefile,v 1.15 2019/04/28 15:21:49 deraadt Exp $ REV= ${OSrev} TOP= ${.CURDIR}/.. IMAGE= mr.fs -CBIN?= instbin -CRUNCHCONF?= ${CBIN}.conf +CRUNCHCONF?= instbin.conf CRUNCHCONFS?= ${.CURDIR}/../common/crunch.conf LISTS= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot @@ -29,14 +28,14 @@ bsd.rd: ${IMAGE} bsd cp bsd bsd.rd rdsetroot bsd.rd ${IMAGE} -${IMAGE}: ${CBIN} +${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} - rm $@.d/${CBIN} + rm $@.d/instbin makefs ${MAKEFSARGS_RD} $@ $@.d .endif @@ -46,18 +45,18 @@ bsd: su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' cp -p ${TOP}/../../sys/arch/loongson/compile/RAMDISK/obj/bsd bsd -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} +instbin.mk instbin.cache instbin.c: ${CRUNCHCONF} crunchgen -EM -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} -${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all +instbin: instbin.mk instbin.cache instbin.c + ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all ${CRUNCHCONF}: ${LISTS} - awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf 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 + /bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \ + lib*.a lib*.olist instbin.map *.o *.lo *.c bsd bsd.rd cd${REV}.iso rm -rf cd-dir ${IMAGE}.d .ifdef RELEASEDIR diff --git a/distrib/luna88k/ramdisk/Makefile b/distrib/luna88k/ramdisk/Makefile index ecbd6691920..45a4bc11243 100644 --- a/distrib/luna88k/ramdisk/Makefile +++ b/distrib/luna88k/ramdisk/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.21 2019/04/28 15:15:39 deraadt Exp $ +# $OpenBSD: Makefile,v 1.22 2019/04/28 15:21:49 deraadt Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" IMAGE= mr.fs -CBIN?= instbin LISTS= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot MTREE= ${UTILS}/mtree.conf @@ -18,14 +17,14 @@ bsd.rd: ${IMAGE} bsd cp bsd bsd.rd rdsetroot bsd.rd ${IMAGE} -${IMAGE}: ${CBIN} +${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} - rm $@.d/${CBIN} + rm $@.d/instbin makefs ${MAKEFSARGS_RD} $@ $@.d bsd: @@ -40,18 +39,18 @@ install: cp bsd.rd ${RELEASEDIR} .endif -${CBIN}.conf: ${LISTS} - awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf +instbin.conf: ${LISTS} + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf - crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${CBIN}.conf +instbin.mk instbin.cache instbin.c: instbin.conf + crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib instbin.conf -${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk all +instbin: instbin.mk instbin.cache instbin.c + ${MAKE} -f instbin.mk all 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 + /bin/rm -f *.core ${IMAGE} instbin instbin.conf instbin.mk instbin.cache \ + lib*.a lib*.olist instbin.map *.o *.lo *.c bsd bsd.rd /bin/rm -rf ${IMAGE}.d .include <bsd.obj.mk> diff --git a/distrib/luna88k/ramdisk/Makefile.inc b/distrib/luna88k/ramdisk/Makefile.inc index 7b1e6062e8d..bff487c1bca 100644 --- a/distrib/luna88k/ramdisk/Makefile.inc +++ b/distrib/luna88k/ramdisk/Makefile.inc @@ -1,42 +1,41 @@ # -# $OpenBSD: Makefile.inc,v 1.7 2013/11/29 12:35:47 aoyama Exp $ +# $OpenBSD: Makefile.inc,v 1.8 2019/04/28 15:21:49 deraadt Exp $ # # TOP is assumed to be defined by Makefile including this one. -CBIN?= instbin LISTS= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot COMMONDIR= ${TOP}/ramdisk MOUNT_POINT?= ${TOP}/${BASE}/fs -CRUNCHCONF?= ${COMMONDIR}/${CBIN}.conf +CRUNCHCONF?= ${COMMONDIR}/instbin.conf MTREE= ${UTILS}/mtree.conf -${CBIN}.conf: ${LISTS} - awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf +instbin.conf: ${LISTS} + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf - crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CBIN}.conf +instbin.mk instbin.cache instbin.c: instbin.conf + crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib instbin.conf -${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk all +instbin: instbin.mk instbin.cache instbin.c + ${MAKE} -f instbin.mk all -#${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c -# ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all +#instbin: instbin.mk instbin.cache instbin.c +# ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} - rm ${MOUNT_POINT}/${CBIN} + rm ${MOUNT_POINT}/instbin clean cleandir: - /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ + /bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \ *.o *.lo *.c \ - lib*.a lib*.olist ${CBIN}.map + lib*.a lib*.olist instbin.map .include <bsd.obj.mk> .include <bsd.subdir.mk> diff --git a/distrib/macppc/ramdisk/Makefile b/distrib/macppc/ramdisk/Makefile index 38e1579ff43..9698cc27ff6 100644 --- a/distrib/macppc/ramdisk/Makefile +++ b/distrib/macppc/ramdisk/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.37 2019/04/28 15:15:39 deraadt Exp $ +# $OpenBSD: Makefile,v 1.38 2019/04/28 15:21:49 deraadt Exp $ REV= ${OSrev} TOP= ${.CURDIR}/.. IMAGE= mr.fs -CBIN?= instbin -CRUNCHCONF?= ${CBIN}.conf +CRUNCHCONF?= instbin.conf CRUNCHCONFS?= ${.CURDIR}/../common/crunch.conf LISTS= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot @@ -52,14 +51,14 @@ cd: bsd.rd -V "OpenBSD/macppc ${OSREV} boot-only CD" \ -o ${.OBJDIR}/cd${OSrev}.iso ${.OBJDIR}/cd-dir -${IMAGE}: ${CBIN} +${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} - rm $@.d/${CBIN} + rm $@.d/instbin makefs ${MAKEFSARGS_RD} $@ $@.d vnconfig -v mr.fs > vnd df -i /dev/`cat vnd`a @@ -73,18 +72,18 @@ bsd: su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' cp -p ${TOP}/../../sys/arch/macppc/compile/RAMDISK/obj/bsd bsd -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} +instbin.mk instbin.cache instbin.c: ${CRUNCHCONF} crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} -${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all +instbin: instbin.mk instbin.cache instbin.c + ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all ${CRUNCHCONF}: ${LISTS} - awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf 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 + /bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \ + lib*.a lib*.olist instbin.map *.o *.lo *.c bsd bsd.rd cd${REV}.iso rm -rf cd-dir ${IMAGE}.d .ifdef RELEASEDIR diff --git a/distrib/miniroot/makeconf.awk b/distrib/miniroot/makeconf.awk index 24252b55ef2..8d6a1f6db60 100644 --- a/distrib/miniroot/makeconf.awk +++ b/distrib/miniroot/makeconf.awk @@ -1,4 +1,4 @@ -# $OpenBSD: makeconf.awk,v 1.25 2017/07/08 15:40:29 florian Exp $ +# $OpenBSD: makeconf.awk,v 1.26 2019/04/28 15:21:50 deraadt Exp $ # # generate crunchgen(1) configuration file from `list' spec. @@ -19,7 +19,7 @@ $1 == "SRCDIRS" { print; } -($1 == "LINK" || $1 == "SYMLINK") && index($2,CBIN) { +($1 == "LINK" || $1 == "SYMLINK") && index($2,instbin) { # find basenames for inclusion in crunchgen's `prog' and `ln' directives n = split($3, x, "/"); p = x[n]; diff --git a/distrib/octeon/ramdisk/Makefile b/distrib/octeon/ramdisk/Makefile index e5d1361ef7c..94fe30aaffe 100644 --- a/distrib/octeon/ramdisk/Makefile +++ b/distrib/octeon/ramdisk/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.7 2019/04/28 15:15:39 deraadt Exp $ +# $OpenBSD: Makefile,v 1.8 2019/04/28 15:21:50 deraadt Exp $ REV= ${OSrev} TOP= ${.CURDIR}/.. IMAGE= mr.fs -CBIN?= instbin -CRUNCHCONF?= ${CBIN}.conf +CRUNCHCONF?= instbin.conf CRUNCHCONFS?= ${.CURDIR}/../common/crunch.conf LISTS= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot @@ -23,14 +22,14 @@ bsd.rd: ${IMAGE} bsd cp bsd bsd.rd rdsetroot bsd.rd ${IMAGE} -${IMAGE}: ${CBIN} +${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} - rm $@.d/${CBIN} + rm $@.d/instbin makefs ${MAKEFSARGS_RD} $@ $@.d bsd: @@ -38,18 +37,18 @@ bsd: su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' cp -p ${TOP}/../../sys/arch/octeon/compile/RAMDISK/obj/bsd bsd -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} +instbin.mk instbin.cache instbin.c: ${CRUNCHCONF} crunchgen -M -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} -${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all +instbin: instbin.mk instbin.cache instbin.c + ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all ${CRUNCHCONF}: ${LISTS} - awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf clean cleandir: - /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ - lib*.a lib*.olist ${CBIN}.map *.o *.lo *.c bsd bsd.rd + /bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \ + lib*.a lib*.olist instbin.map *.o *.lo *.c bsd bsd.rd rm -rf cd-dir ${IMAGE}.d .ifdef RELEASEDIR diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile index 4fdb0b92dc2..194776b536b 100644 --- a/distrib/ramdisk/Makefile +++ b/distrib/ramdisk/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.55 2019/04/28 14:48:10 deraadt Exp $ +# $OpenBSD: Makefile,v 1.56 2019/04/28 15:21:50 deraadt Exp $ REV= ${OSrev} -CBIN= instbin ARCHDIR= ${.CURDIR}/../${MACHINE}/ramdisk .include <bsd.own.mk> @@ -76,7 +75,7 @@ bsd.rd: bsd ${IMAGE} bsd.gz: bsd.rd gzip ${GZIPFLAGS} < bsd.rd > bsd.gz -${IMAGE}: ${CBIN} +${IMAGE}: instbin dd if=/dev/zero of=${IMAGE} count=${IMAGESIZE} vnconfig -v ${IMAGE} > vnd disklabel -w $(cat vnd) ${DISKTYPE} @@ -86,26 +85,26 @@ ${IMAGE}: ${CBIN} REV=${REV} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ ARCHDIR=${ARCHDIR} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} - rm ${MOUNT_POINT}/${CBIN} + rm ${MOUNT_POINT}/instbin @echo "" @df -i ${MOUNT_POINT} @echo "" umount ${MOUNT_POINT} vnconfig -u `cat vnd` -${CBIN}.conf: ${LISTS} - awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf +instbin.conf: ${LISTS} + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf +instbin.mk instbin.cache instbin.c: instbin.conf crunchgen ${CRUNCHGENOPTS} -D ${.CURDIR}/../.. -L ${DESTDIR}/usr/lib \ - ${CBIN}.conf + instbin.conf -${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all +instbin: instbin.mk instbin.cache instbin.c + ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all clean cleandir: - /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ - lib*.a lib*.olist ${CBIN}.map ${CBIN}.conf *.o *.lo *.c bsd bsd.* + /bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \ + lib*.a lib*.olist instbin.map instbin.conf *.o *.lo *.c bsd bsd.* .endif # DESTDIR check diff --git a/distrib/sgi/ramdisk/Makefile b/distrib/sgi/ramdisk/Makefile index 1c9b9ab0e1d..d86423a8a97 100644 --- a/distrib/sgi/ramdisk/Makefile +++ b/distrib/sgi/ramdisk/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.25 2019/04/28 15:15:39 deraadt Exp $ +# $OpenBSD: Makefile,v 1.26 2019/04/28 15:21:50 deraadt Exp $ REV= ${OSrev} TOP= ${.CURDIR}/.. IMAGE= mr.fs -CBIN?= instbin -CRUNCHCONF?= ${CBIN}.conf +CRUNCHCONF?= instbin.conf CRUNCHCONFS?= ${.CURDIR}/../common/crunch.conf LISTS= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot @@ -44,30 +43,30 @@ bsd.rd.IP${IP}: ${IMAGE} bsd.IP${IP} rdsetroot bsd.rd.IP${IP} ${IMAGE} .endfor -${IMAGE}: ${CBIN} +${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} - rm $@.d/${CBIN} + rm $@.d/instbin makefs ${MAKEFSARGS_RD} $@ $@.d .endif -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} +instbin.mk instbin.cache instbin.c: ${CRUNCHCONF} crunchgen -M -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} -${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all +instbin: instbin.mk instbin.cache instbin.c + ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all ${CRUNCHCONF}: ${LISTS} - awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf clean cleandir: - /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ - lib*.a lib*.olist ${CBIN}.map ${ALLBSD} ${ALLBSDRD} *.o *.lo *.c + /bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \ + lib*.a lib*.olist instbin.map ${ALLBSD} ${ALLBSDRD} *.o *.lo *.c /bin/rm -rf ${IMAGE}.d .ifdef RELEASEDIR diff --git a/distrib/socppc/ramdisk/Makefile b/distrib/socppc/ramdisk/Makefile index fdd4489b0f6..7185a3167f5 100644 --- a/distrib/socppc/ramdisk/Makefile +++ b/distrib/socppc/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2019/04/28 15:15:40 deraadt Exp $ +# $OpenBSD: Makefile,v 1.21 2019/04/28 15:21:50 deraadt Exp $ REV= ${OSrev} @@ -6,8 +6,7 @@ TOP= ${.CURDIR}/.. BSD_BIN= bsd.bin IMAGE= mr.fs -CBIN?= instbin -CRUNCHCONF?= ${CBIN}.conf +CRUNCHCONF?= instbin.conf CRUNCHCONFS?= ${.CURDIR}/../common/crunch.conf LISTS= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot @@ -33,14 +32,14 @@ bsd.rd: ${IMAGE} bsd ${BSD_BIN}: bsd.rd objcopy -O binary bsd.rd ${BSD_BIN} -${IMAGE}: ${CBIN} +${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} - rm $@.d/${CBIN} + rm $@.d/instbin makefs ${MAKEFSARGS_RD} $@ $@.d .endif @@ -50,18 +49,18 @@ bsd: su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}' cp -p ${TOP}/../../sys/arch/socppc/compile/RAMDISK/obj/bsd bsd -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} +instbin.mk instbin.cache instbin.c: ${CRUNCHCONF} crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} -${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all +instbin: instbin.mk instbin.cache instbin.c + ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all ${CRUNCHCONF}: ${LISTS} - awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf 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 + /bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \ + lib*.a lib*.olist instbin.map *.o *.lo *.c bsd bsd.rd cd${REV}.iso rm -rf cd-dir ${IMAGE}.d .ifdef RELEASEDIR diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile index 71ef035d764..660432ce948 100644 --- a/distrib/sparc64/bsd.rd/Makefile +++ b/distrib/sparc64/bsd.rd/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.38 2019/04/28 14:48:11 deraadt Exp $ +# $OpenBSD: Makefile,v 1.39 2019/04/28 15:21:50 deraadt Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" IMAGE= ramdisk${REV}.fs -CBIN?= instbin LISTS?= ${.CURDIR}/list UTILS?= ${TOP}/../miniroot @@ -31,14 +30,14 @@ bsd: su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}' cp -p ${.CURDIR}/../../../sys/arch/sparc64/compile/RAMDISK/obj/bsd bsd -${IMAGE}: ${CBIN} +${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} - rm $@.d/${CBIN} + rm $@.d/instbin makefs ${MAKEFSARGS_RD} $@ $@.d .ifdef RELEASEDIR @@ -49,19 +48,19 @@ install: .endif .endif -${CBIN}.conf: ${LISTS} - awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf +instbin.conf: ${LISTS} + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf +instbin.mk instbin.cache instbin.c: instbin.conf crunchgen -E -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib \ - -c ${CBIN}.c -e ${CBIN} -m ${CBIN}.mk ${CBIN}.conf + -c instbin.c -e instbin -m instbin.mk instbin.conf -${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all +instbin: instbin.mk instbin.cache instbin.c + ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all clean cleandir: - /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}*.cache \ - lib*.a lib*.olist ${CBIN}.map \ + /bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin*.cache \ + lib*.a lib*.olist instbin.map \ *.o *.lo *.c bsd bsd.rd{,_unz} bsd.gz bsd.strip floppy*.fs /bin/rm -rf ${IMAGE}.d diff --git a/distrib/sparc64/common/Makefile.inc b/distrib/sparc64/common/Makefile.inc index df8eda300b0..e93fe9c15b5 100644 --- a/distrib/sparc64/common/Makefile.inc +++ b/distrib/sparc64/common/Makefile.inc @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile.inc,v 1.19 2019/04/28 14:48:11 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.20 2019/04/28 15:21:50 deraadt Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" IMAGE= mr.fs -CBIN?= instbin -CRUNCHCONF?= ${.CURDIR}/../common/${CBIN}.conf +CRUNCHCONF?= ${.CURDIR}/../common/instbin.conf LISTS?= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot @@ -43,9 +42,9 @@ NBLKS?= 3510 # minfree, opt, b/i trks, sects, cpg NEWFSARGS= -m 0 -o space -i 4096 -${IMAGE}: ${CBIN} rd_setup do_files rd_teardown +${IMAGE}: instbin rd_setup do_files rd_teardown -rd_setup: ${CBIN} +rd_setup: instbin dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS} vnconfig -v ${IMAGE} > vnd disklabel -w `cat vnd` ${DISKTYPE} @@ -72,23 +71,23 @@ install: cp ${FS} ${RELEASEDIR} .endif -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} +instbin.mk instbin.cache instbin.c: ${CRUNCHCONF} crunchgen -E -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib \ - -c ${CBIN}.c -e ${CBIN} -m ${CBIN}.mk ${CRUNCHCONF} + -c instbin.c -e instbin -m instbin.mk ${CRUNCHCONF} -${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all +instbin: instbin.mk instbin.cache instbin.c + ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} - rm ${MOUNT_POINT}/${CBIN} + rm ${MOUNT_POINT}/instbin clean cleandir: - /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}*.cache \ - lib*.a lib*.olist ${CBIN}.map \ + /bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin*.cache \ + lib*.a lib*.olist instbin.map \ *.o *.lo *.c bsd bsd.rd bsd.gz bsd.strip floppy*.fs .include <bsd.subdir.mk> diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile index 1f3ba7625ab..ca11ca0efae 100644 --- a/distrib/sparc64/ramdisk/Makefile +++ b/distrib/sparc64/ramdisk/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.40 2019/04/28 15:15:40 deraadt Exp $ +# $OpenBSD: Makefile,v 1.41 2019/04/28 15:21:50 deraadt Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" IMAGE= mr.fs -CBIN?= instbin LISTS= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot @@ -48,19 +47,19 @@ ${FLOPPY}: bsd.gz ${BOOT} /usr/ vnconfig -u `cat vnd` rm -f vnd -bsd.rd: ${CBIN} ${IMAGE} bsd +bsd.rd: instbin ${IMAGE} bsd cp bsd bsd.rd rdsetroot bsd.rd ${IMAGE} strip -R .SUNW_ctf bsd.rd -${IMAGE}: ${CBIN} +${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} - rm $@.d/${CBIN} + rm $@.d/instbin makefs ${MAKEFSARGS_RD} $@ $@.d .endif @@ -74,18 +73,18 @@ unconfig: -umount -f ${MOUNT_POINT} -[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd -${CBIN}.conf: ${LISTS} - awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf +instbin.conf: ${LISTS} + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf +instbin.mk instbin.cache instbin.c: instbin.conf crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} -${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all +instbin: instbin.mk instbin.cache instbin.c + ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all clean cleandir: - /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ - lib*.a lib*.olist ${CBIN}.map \ + /bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \ + lib*.a lib*.olist instbin.map \ *.o *.lo *.c bsd bsd.rd bsd.gz ${FLOPPY} /bin/rm -rf ${IMAGE}.d diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile index 8a0a6532b7c..c31056d51bb 100644 --- a/distrib/sparc64/ramdiskB/Makefile +++ b/distrib/sparc64/ramdiskB/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.34 2019/04/28 15:15:40 deraadt Exp $ +# $OpenBSD: Makefile,v 1.35 2019/04/28 15:21:50 deraadt Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" IMAGE= mr.fs -CBIN?= instbin LISTS= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot @@ -48,19 +47,19 @@ ${FLOPPY}: bsd.gz ${BOOT} /usr/ vnconfig -u `cat vnd` rm -f vnd -bsd.rd: ${CBIN} ${IMAGE} bsd +bsd.rd: instbin ${IMAGE} bsd cp bsd bsd.rd rdsetroot bsd.rd ${IMAGE} strip -R .SUNW_ctf bsd.rd -${IMAGE}: ${CBIN} +${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} - rm $@.d/${CBIN} + rm $@.d/instbin makefs ${MAKEFSARGS_RD} $@ $@.d .endif @@ -74,18 +73,18 @@ unconfig: -umount -f ${MOUNT_POINT} -[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd -${CBIN}.conf: ${LISTS} - awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf +instbin.conf: ${LISTS} + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf +instbin.mk instbin.cache instbin.c: instbin.conf crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} -${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all +instbin: instbin.mk instbin.cache instbin.c + ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all clean cleandir: - /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ - lib*.a lib*.olist ${CBIN}.map \ + /bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \ + lib*.a lib*.olist instbin.map \ *.o *.lo *.c bsd bsd.rd bsd.gz ${FLOPPY} /bin/rm -rf ${IMAGE}.d |