diff options
35 files changed, 136 insertions, 194 deletions
diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile index e486cbb4fd7..7c24cf4bf7c 100644 --- a/distrib/alpha/bsd.rd/Makefile +++ b/distrib/alpha/bsd.rd/Makefile @@ -1,13 +1,13 @@ -# $OpenBSD: Makefile,v 1.36 2019/04/29 01:48:39 deraadt Exp $ +# $OpenBSD: Makefile,v 1.37 2019/04/29 15:56:23 deraadt Exp $ -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" IMAGE= ramdisk${OSrev}.fs STRIPOPTS?= -R .SUNW_ctf -R .shstrtab -.include "${TOP}/inst-common/Makefile.inc" +UTILS= ${.CURDIR}/../../miniroot +LISTS?= ${.CURDIR}/../common/list +MTREE= ${UTILS}/mtree.conf +STRIPOPTS?= -R .eh_frame -R .SUNW_ctf -R .shstrtab LISTS+= ${.CURDIR}/list.local @@ -35,12 +35,31 @@ ${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} rm $@.d/instbin makefs ${MAKEFSARGS_RD} $@ $@.d +instbin.conf: ${LISTS} + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf + +instbin.mk instbin.cache instbin.c: instbin.conf + crunchgen -E -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib instbin.conf + +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} instbin instbin.mk instbin.cache \ + *.o *.lo *.c \ + lib*.a lib*.olist instbin.map ${CLEANFILES} + /bin/rm -rf ${IMAGE}.d + +.include <bsd.obj.mk> +.include <bsd.subdir.mk> + .ifdef RELEASEDIR beforeinstall: cp bsd.rd ${RELEASEDIR} diff --git a/distrib/alpha/cdfs/Makefile b/distrib/alpha/cdfs/Makefile index 73e7bba8f0b..1707a992a9c 100644 --- a/distrib/alpha/cdfs/Makefile +++ b/distrib/alpha/cdfs/Makefile @@ -1,8 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2019/04/28 14:48:09 deraadt Exp $ - -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" +# $OpenBSD: Makefile,v 1.10 2019/04/29 15:56:24 deraadt Exp $ CDROM= cd${OSrev}.iso MOUNT_POINT= /mnt diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc index 2b2c934edd2..eb01bb24454 100644 --- a/distrib/alpha/common/Makefile.inc +++ b/distrib/alpha/common/Makefile.inc @@ -1,8 +1,5 @@ -# $OpenBSD: Makefile.inc,v 1.42 2019/04/29 01:48:39 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.43 2019/04/29 15:56:25 deraadt Exp $ -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" IMAGE= ramdisk${OSrev}.fs MOUNT_POINT= /mnt @@ -17,7 +14,22 @@ FLOPPYTYPE?= floppy BOOT?= /usr/mdec/boot BOOTXX?= /usr/mdec/bootxx -.include "${TOP}/inst-common/Makefile.inc" +UTILS= ${.CURDIR}/../../miniroot + +LISTS?= ${.CURDIR}/../common/list +CRUNCHCONF?= instbin.conf +MTREE= ${UTILS}/mtree.conf +STRIPOPTS?= -R .eh_frame -R .SUNW_ctf -R .shstrtab + +instbin.conf: ${LISTS} + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf + +instbin.mk instbin.cache instbin.c: instbin.conf + crunchgen -E -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib instbin.conf + +instbin: instbin.mk instbin.cache instbin.c + ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all + strip ${STRIPOPTS} instbin all: ${FLOPPY} @@ -62,7 +74,7 @@ ${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} rm $@.d/instbin @@ -76,3 +88,12 @@ unconfig: beforeinstall: cp ${FLOPPY} ${RELEASEDIR} .endif + +clean cleandir: + /bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \ + *.o *.lo *.c \ + lib*.a lib*.olist instbin.map ${CLEANFILES} + /bin/rm -rf ${IMAGE}.d + +.include <bsd.obj.mk> +.include <bsd.subdir.mk> diff --git a/distrib/alpha/iso/Makefile b/distrib/alpha/iso/Makefile index 4baa75824d9..3e607fd8e1b 100644 --- a/distrib/alpha/iso/Makefile +++ b/distrib/alpha/iso/Makefile @@ -1,8 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2019/04/28 14:48:09 deraadt Exp $ - -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" +# $OpenBSD: Makefile,v 1.17 2019/04/29 15:56:25 deraadt Exp $ CDROM= install${OSrev}.iso RELXDIR?= /home/relx-${MACHINE} diff --git a/distrib/alpha/miniroot/Makefile b/distrib/alpha/miniroot/Makefile index ea17f254d22..97bdcd45087 100644 --- a/distrib/alpha/miniroot/Makefile +++ b/distrib/alpha/miniroot/Makefile @@ -1,8 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2019/04/29 01:48:39 deraadt Exp $ - -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" +# $OpenBSD: Makefile,v 1.7 2019/04/29 15:56:25 deraadt Exp $ FS= miniroot${OSrev}.fs MOUNT_POINT= /mnt diff --git a/distrib/amd64/cdfs/Makefile b/distrib/amd64/cdfs/Makefile index a278ff8a916..1b93032bccb 100644 --- a/distrib/amd64/cdfs/Makefile +++ b/distrib/amd64/cdfs/Makefile @@ -1,8 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2019/04/29 01:48:39 deraadt Exp $ - -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" +# $OpenBSD: Makefile,v 1.11 2019/04/29 15:56:25 deraadt Exp $ CDROM= cd${OSrev}.iso diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile index 672c5196a00..ea7fe63616a 100644 --- a/distrib/amd64/iso/Makefile +++ b/distrib/amd64/iso/Makefile @@ -1,8 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2019/04/29 01:48:39 deraadt Exp $ - -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" +# $OpenBSD: Makefile,v 1.28 2019/04/29 15:56:25 deraadt Exp $ CDROM= install${OSrev}.iso diff --git a/distrib/amd64/ramdiskA/Makefile.inc b/distrib/amd64/ramdiskA/Makefile.inc index 989eb3dcf11..585ec450a8e 100644 --- a/distrib/amd64/ramdiskA/Makefile.inc +++ b/distrib/amd64/ramdiskA/Makefile.inc @@ -1,8 +1,5 @@ -# $OpenBSD: Makefile.inc,v 1.13 2019/04/29 01:48:39 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.14 2019/04/29 15:56:25 deraadt Exp $ -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" LISTS?= ${.CURDIR}/../common/list UTILS?= ${.CURDIR}/../../miniroot @@ -69,7 +66,7 @@ mr.fs: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} rm $@.d/instbin diff --git a/distrib/amd64/ramdisk_cd/Makefile.inc b/distrib/amd64/ramdisk_cd/Makefile.inc index 4cf459413c7..271212e5fa5 100644 --- a/distrib/amd64/ramdisk_cd/Makefile.inc +++ b/distrib/amd64/ramdisk_cd/Makefile.inc @@ -1,8 +1,5 @@ -# $OpenBSD: Makefile.inc,v 1.13 2019/04/29 01:48:39 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.14 2019/04/29 15:56:25 deraadt Exp $ -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" LISTS?= ${.CURDIR}/../common/list UTILS?= ${.CURDIR}/../../miniroot @@ -72,7 +69,7 @@ mr.fs: 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} \ + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} rm $@.d/instbin diff --git a/distrib/arm64/ramdisk/Makefile b/distrib/arm64/ramdisk/Makefile index 98f5950075b..871187e4a97 100644 --- a/distrib/arm64/ramdisk/Makefile +++ b/distrib/arm64/ramdisk/Makefile @@ -1,6 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2019/04/29 01:48:39 deraadt Exp $ - -TOP= ${.CURDIR}/.. +# $OpenBSD: Makefile,v 1.10 2019/04/29 15:56:25 deraadt Exp $ IMAGE= mr.fs CRUNCHCONF?= instbin.conf @@ -26,9 +24,9 @@ all ${IMAGE}: all: bsd.rd bsd: - cd ${TOP}/../../sys/arch/arm64/compile/RAMDISK && \ + cd ${.CURDIR}/../../../sys/arch/arm64/compile/RAMDISK && \ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' - cp -p ${TOP}/../../sys/arch/arm64/compile/RAMDISK/obj/bsd bsd + cp -p ${.CURDIR}/../../../sys/arch/arm64/compile/RAMDISK/obj/bsd bsd bsd.rd: ${IMAGE} bsd cp bsd bsd.rd @@ -41,7 +39,7 @@ ${IMAGE}: instbin mkdir -p $@.d/usr/mdec/${DIR} .endfor mtree -def ${MTREE} -p $@.d -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} rm $@.d/instbin diff --git a/distrib/armv7/ramdisk/Makefile b/distrib/armv7/ramdisk/Makefile index 9950cdf7c8c..9a20809c130 100644 --- a/distrib/armv7/ramdisk/Makefile +++ b/distrib/armv7/ramdisk/Makefile @@ -1,6 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2019/04/29 01:48:39 deraadt Exp $ - -TOP= ${.CURDIR}/.. +# $OpenBSD: Makefile,v 1.23 2019/04/29 15:56:25 deraadt Exp $ IMAGE= mr.fs CRUNCHCONF?= instbin.conf @@ -32,9 +30,9 @@ ALLBSDRD= bsd.rd all: ${ALLBSDRD} bsd: - cd ${TOP}/../../sys/arch/armv7/compile/RAMDISK && \ + cd ${.CURDIR}/../../../sys/arch/armv7/compile/RAMDISK && \ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' - cp -p ${TOP}/../../sys/arch/armv7/compile/RAMDISK/obj/bsd bsd + cp -p ${.CURDIR}/../../../sys/arch/armv7/compile/RAMDISK/obj/bsd bsd bsd.rd: ${IMAGE} bsd cp bsd bsd.rd @@ -47,7 +45,7 @@ ${IMAGE}: instbin mkdir -p $@.d/usr/mdec/${DIR} .endfor mtree -def ${MTREE} -p $@.d -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} rm $@.d/instbin diff --git a/distrib/hppa/iso/Makefile b/distrib/hppa/iso/Makefile index 971bb584691..ab79cdf4f68 100644 --- a/distrib/hppa/iso/Makefile +++ b/distrib/hppa/iso/Makefile @@ -1,8 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2019/04/29 01:48:40 deraadt Exp $ - -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" +# $OpenBSD: Makefile,v 1.17 2019/04/29 15:56:25 deraadt Exp $ CDROM= install${OSrev}.iso RELXDIR?= /home/relx-${MACHINE} diff --git a/distrib/i386/cdfs/Makefile b/distrib/i386/cdfs/Makefile index fddfa78003b..0b67607c5af 100644 --- a/distrib/i386/cdfs/Makefile +++ b/distrib/i386/cdfs/Makefile @@ -1,8 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2019/04/29 01:48:40 deraadt Exp $ - -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" +# $OpenBSD: Makefile,v 1.12 2019/04/29 15:56:25 deraadt Exp $ CDROM= cd${OSrev}.iso diff --git a/distrib/i386/common/Makefile.inc b/distrib/i386/common/Makefile.inc index d854eee0b47..1db3ed2d51d 100644 --- a/distrib/i386/common/Makefile.inc +++ b/distrib/i386/common/Makefile.inc @@ -1,8 +1,5 @@ -# $OpenBSD: Makefile.inc,v 1.50 2019/04/29 01:48:40 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.51 2019/04/29 15:56:25 deraadt Exp $ -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" IMAGE= mr.fs CRUNCHCONF?= instbin.conf LISTS?= ${.CURDIR}/../common/list @@ -66,7 +63,7 @@ ${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} rm $@.d/instbin diff --git a/distrib/i386/iso/Makefile b/distrib/i386/iso/Makefile index 1d35802e861..88927786765 100644 --- a/distrib/i386/iso/Makefile +++ b/distrib/i386/iso/Makefile @@ -1,8 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2019/04/29 01:48:40 deraadt Exp $ - -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" +# $OpenBSD: Makefile,v 1.21 2019/04/29 15:56:25 deraadt Exp $ CDROM= install${OSrev}.iso diff --git a/distrib/landisk/ramdisk/Makefile b/distrib/landisk/ramdisk/Makefile index 94873a81954..901978cb147 100644 --- a/distrib/landisk/ramdisk/Makefile +++ b/distrib/landisk/ramdisk/Makefile @@ -1,6 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2019/04/29 01:48:40 deraadt Exp $ - -TOP= ${.CURDIR}/.. +# $OpenBSD: Makefile,v 1.25 2019/04/29 15:56:25 deraadt Exp $ IMAGE= mr.fs CRUNCHCONF?= instbin.conf @@ -30,7 +28,7 @@ ${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} rm $@.d/instbin @@ -39,9 +37,9 @@ ${IMAGE}: instbin .endif bsd: - cd ${TOP}/../../sys/arch/landisk/compile/RAMDISK && \ + cd ${.CURDIR}/../../../sys/arch/landisk/compile/RAMDISK && \ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' - cp -p ${TOP}/../../sys/arch/landisk/compile/RAMDISK/obj/bsd bsd + cp -p ${.CURDIR}/../../../sys/arch/landisk/compile/RAMDISK/obj/bsd bsd .ifdef RELEASEDIR install: diff --git a/distrib/loongson/cdfs/Makefile b/distrib/loongson/cdfs/Makefile index d2bc5da23e3..873bc75e79d 100644 --- a/distrib/loongson/cdfs/Makefile +++ b/distrib/loongson/cdfs/Makefile @@ -1,8 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2019/04/29 01:48:40 deraadt Exp $ - -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" +# $OpenBSD: Makefile,v 1.4 2019/04/29 15:56:25 deraadt Exp $ CDROM= cd${OSrev}.iso diff --git a/distrib/loongson/ramdisk/Makefile b/distrib/loongson/ramdisk/Makefile index 89c53e6585d..0481210acba 100644 --- a/distrib/loongson/ramdisk/Makefile +++ b/distrib/loongson/ramdisk/Makefile @@ -1,6 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2019/04/29 01:48:40 deraadt Exp $ - -TOP= ${.CURDIR}/.. +# $OpenBSD: Makefile,v 1.17 2019/04/29 15:56:25 deraadt Exp $ IMAGE= mr.fs CRUNCHCONF?= instbin.conf @@ -30,7 +28,7 @@ ${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} rm $@.d/instbin @@ -39,9 +37,9 @@ ${IMAGE}: instbin .endif bsd: - cd ${TOP}/../../sys/arch/loongson/compile/RAMDISK && \ + cd ${.CURDIR}/../../../sys/arch/loongson/compile/RAMDISK && \ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' - cp -p ${TOP}/../../sys/arch/loongson/compile/RAMDISK/obj/bsd bsd + cp -p ${.CURDIR}/../../../sys/arch/loongson/compile/RAMDISK/obj/bsd bsd instbin.mk instbin.cache instbin.c: ${CRUNCHCONF} crunchgen -EM -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} diff --git a/distrib/luna88k/miniroot/Makefile b/distrib/luna88k/miniroot/Makefile index 4c4103c2c77..cf761f2edbe 100644 --- a/distrib/luna88k/miniroot/Makefile +++ b/distrib/luna88k/miniroot/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.5 2019/04/29 01:48:40 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 2019/04/29 15:56:25 deraadt Exp $ -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" +LDSTATIC=-static +# Hack needed to find kernel images... +BSDSRCDIR?=/usr/src +SRCSYSDIR?=${BSDSRCDIR}/sys TARGET= miniroot${OSrev}.fs MOUNT_POINT= /mnt diff --git a/distrib/luna88k/ramdisk/Makefile b/distrib/luna88k/ramdisk/Makefile index b1b0277b3fb..1afcce07c16 100644 --- a/distrib/luna88k/ramdisk/Makefile +++ b/distrib/luna88k/ramdisk/Makefile @@ -1,8 +1,10 @@ -# $OpenBSD: Makefile,v 1.23 2019/04/29 01:48:40 deraadt Exp $ +# $OpenBSD: Makefile,v 1.24 2019/04/29 15:56:26 deraadt Exp $ -TOP= ${.CURDIR}/.. +LDSTATIC=-static +# Hack needed to find kernel images... +BSDSRCDIR?=/usr/src +SRCSYSDIR?=${BSDSRCDIR}/sys -.include "${TOP}/Makefile.inc" IMAGE= mr.fs LISTS= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot @@ -21,7 +23,7 @@ ${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} rm $@.d/instbin diff --git a/distrib/luna88k/ramdisk/Makefile.inc b/distrib/luna88k/ramdisk/Makefile.inc index 53e1cd825a4..f717b57e14b 100644 --- a/distrib/luna88k/ramdisk/Makefile.inc +++ b/distrib/luna88k/ramdisk/Makefile.inc @@ -1,14 +1,10 @@ -# -# $OpenBSD: Makefile.inc,v 1.9 2019/04/29 01:48:40 deraadt Exp $ -# - -# TOP is assumed to be defined by Makefile including this one. +# $OpenBSD: Makefile.inc,v 1.10 2019/04/29 15:56:26 deraadt Exp $ LISTS= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot -COMMONDIR= ${TOP}/ramdisk -MOUNT_POINT?= ${TOP}/${BASE}/fs +COMMONDIR= ${.CURDIR}/../ramdisk +MOUNT_POINT?= ${.CURDIR}/../${BASE}/fs CRUNCHCONF?= ${COMMONDIR}/instbin.conf MTREE= ${UTILS}/mtree.conf @@ -27,7 +23,7 @@ instbin: instbin.mk instbin.cache instbin.c do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ OSrev=${OSrev} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/instbin diff --git a/distrib/macppc/iso/Makefile b/distrib/macppc/iso/Makefile index 812f504e486..66395bf890a 100644 --- a/distrib/macppc/iso/Makefile +++ b/distrib/macppc/iso/Makefile @@ -1,8 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2015/08/18 16:28:00 deraadt Exp $ - -TOP= ${.CURDIR}/.. - -#.include "${TOP}/Makefile.inc" +# $OpenBSD: Makefile,v 1.15 2019/04/29 15:56:26 deraadt Exp $ CDROM= install${OSrev}.iso RELXDIR?= /home/relx-${MACHINE} diff --git a/distrib/macppc/ramdisk/Makefile b/distrib/macppc/ramdisk/Makefile index f2f5aa1e764..738c6e1d154 100644 --- a/distrib/macppc/ramdisk/Makefile +++ b/distrib/macppc/ramdisk/Makefile @@ -1,6 +1,4 @@ -# $OpenBSD: Makefile,v 1.39 2019/04/29 01:48:40 deraadt Exp $ - -TOP= ${.CURDIR}/.. +# $OpenBSD: Makefile,v 1.40 2019/04/29 15:56:26 deraadt Exp $ IMAGE= mr.fs CRUNCHCONF?= instbin.conf @@ -53,7 +51,7 @@ ${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} rm $@.d/instbin @@ -66,9 +64,9 @@ ${IMAGE}: instbin .endif bsd: - cd ${TOP}/../../sys/arch/macppc/compile/RAMDISK && \ + cd ${.CURDIR}/../../../sys/arch/macppc/compile/RAMDISK && \ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' - cp -p ${TOP}/../../sys/arch/macppc/compile/RAMDISK/obj/bsd bsd + cp -p ${.CURDIR}/../../../sys/arch/macppc/compile/RAMDISK/obj/bsd bsd instbin.mk instbin.cache instbin.c: ${CRUNCHCONF} crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} diff --git a/distrib/octeon/ramdisk/Makefile b/distrib/octeon/ramdisk/Makefile index ed386b35575..bc634f36545 100644 --- a/distrib/octeon/ramdisk/Makefile +++ b/distrib/octeon/ramdisk/Makefile @@ -1,6 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2019/04/29 01:48:40 deraadt Exp $ - -TOP= ${.CURDIR}/.. +# $OpenBSD: Makefile,v 1.10 2019/04/29 15:56:26 deraadt Exp $ IMAGE= mr.fs CRUNCHCONF?= instbin.conf @@ -24,16 +22,16 @@ ${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} rm $@.d/instbin makefs ${MAKEFSARGS_RD} $@ $@.d bsd: - cd ${TOP}/../../sys/arch/octeon/compile/RAMDISK && \ + cd ${.CURDIR}/../../../sys/arch/octeon/compile/RAMDISK && \ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' - cp -p ${TOP}/../../sys/arch/octeon/compile/RAMDISK/obj/bsd bsd + cp -p ${.CURDIR}/../../../sys/arch/octeon/compile/RAMDISK/obj/bsd bsd instbin.mk instbin.cache instbin.c: ${CRUNCHCONF} crunchgen -M -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} diff --git a/distrib/sgi/cdfs/Makefile b/distrib/sgi/cdfs/Makefile index d20afff6b97..be597a32ad7 100644 --- a/distrib/sgi/cdfs/Makefile +++ b/distrib/sgi/cdfs/Makefile @@ -1,8 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2019/04/29 01:48:41 deraadt Exp $ - -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" +# $OpenBSD: Makefile,v 1.21 2019/04/29 15:56:26 deraadt Exp $ CDROM= cd${OSrev}.iso FFS= ffs.img diff --git a/distrib/sgi/iso/Makefile b/distrib/sgi/iso/Makefile index eea445eb0b8..619ccf30d24 100644 --- a/distrib/sgi/iso/Makefile +++ b/distrib/sgi/iso/Makefile @@ -1,8 +1,4 @@ -# $OpenBSD: Makefile,v 1.32 2019/04/29 01:48:41 deraadt Exp $ - -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" +# $OpenBSD: Makefile,v 1.33 2019/04/29 15:56:26 deraadt Exp $ CDROM= install${OSrev}.iso RELXDIR?= /home/relx-${MACHINE} diff --git a/distrib/sgi/ramdisk/Makefile b/distrib/sgi/ramdisk/Makefile index 4522b2ad6d1..b66ea66882e 100644 --- a/distrib/sgi/ramdisk/Makefile +++ b/distrib/sgi/ramdisk/Makefile @@ -1,6 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2019/04/29 01:48:41 deraadt Exp $ - -TOP= ${.CURDIR}/.. +# $OpenBSD: Makefile,v 1.28 2019/04/29 15:56:26 deraadt Exp $ IMAGE= mr.fs CRUNCHCONF?= instbin.conf @@ -31,10 +29,10 @@ all: ${ALLBSDRD} .for IP in ${ALLIP} bsd.IP${IP}: .ifndef NOBUILD - cd ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP${IP} && \ + cd ${.CURDIR}/../../../sys/arch/sgi/compile/RAMDISK-IP${IP} && \ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' .endif - cp -p ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP${IP}/obj/bsd bsd.IP${IP} + cp -p ${.CURDIR}/../../../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} @@ -45,7 +43,7 @@ ${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} rm $@.d/instbin diff --git a/distrib/socppc/ramdisk/Makefile b/distrib/socppc/ramdisk/Makefile index d090c6e6244..b92e4438156 100644 --- a/distrib/socppc/ramdisk/Makefile +++ b/distrib/socppc/ramdisk/Makefile @@ -1,6 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2019/04/29 01:48:41 deraadt Exp $ - -TOP= ${.CURDIR}/.. +# $OpenBSD: Makefile,v 1.23 2019/04/29 15:56:26 deraadt Exp $ BSD_BIN= bsd.bin IMAGE= mr.fs @@ -34,7 +32,7 @@ ${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} rm $@.d/instbin @@ -43,9 +41,9 @@ ${IMAGE}: instbin .endif bsd: - cd ${TOP}/../../sys/arch/socppc/compile/RAMDISK && \ + cd ${.CURDIR}/../../../sys/arch/socppc/compile/RAMDISK && \ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}' - cp -p ${TOP}/../../sys/arch/socppc/compile/RAMDISK/obj/bsd bsd + cp -p ${.CURDIR}/../../../sys/arch/socppc/compile/RAMDISK/obj/bsd bsd instbin.mk instbin.cache instbin.c: ${CRUNCHCONF} crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile index 43ddbf3831a..dc273a23f87 100644 --- a/distrib/sparc64/bsd.rd/Makefile +++ b/distrib/sparc64/bsd.rd/Makefile @@ -1,11 +1,8 @@ -# $OpenBSD: Makefile,v 1.41 2019/04/29 01:48:41 deraadt Exp $ +# $OpenBSD: Makefile,v 1.42 2019/04/29 15:56:26 deraadt Exp $ -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" IMAGE= ramdisk${OSrev}.fs LISTS?= ${.CURDIR}/list -UTILS?= ${TOP}/../miniroot +UTILS?= ${.CURDIR}/../../miniroot STRIPOPTS?= -R .SUNW_ctf MTREE= ${UTILS}/mtree.conf @@ -33,7 +30,7 @@ ${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} rm $@.d/instbin diff --git a/distrib/sparc64/cdfs/Makefile b/distrib/sparc64/cdfs/Makefile index 6bee54bbb06..ce6ed00fb66 100644 --- a/distrib/sparc64/cdfs/Makefile +++ b/distrib/sparc64/cdfs/Makefile @@ -1,8 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2019/04/29 01:48:41 deraadt Exp $ - -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" +# $OpenBSD: Makefile,v 1.19 2019/04/29 15:56:26 deraadt Exp $ CDROM= cd${OSrev}.iso diff --git a/distrib/sparc64/common/Makefile.inc b/distrib/sparc64/common/Makefile.inc index 87479a77ccc..7737793abdc 100644 --- a/distrib/sparc64/common/Makefile.inc +++ b/distrib/sparc64/common/Makefile.inc @@ -1,8 +1,5 @@ -# $OpenBSD: Makefile.inc,v 1.22 2019/04/29 01:48:41 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.23 2019/04/29 15:56:26 deraadt Exp $ -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" IMAGE= mr.fs CRUNCHCONF?= ${.CURDIR}/../common/instbin.conf LISTS?= ${.CURDIR}/list @@ -26,7 +23,7 @@ ${FS}: bsd.rd disklabel -w `cat vnd` ${FLOPPYTYPE} newfs -m 0 -o space -i 524288 -c ${FLOPPYSIZE} /dev/r`cat vnd`a mount /dev/`cat vnd`a ${MOUNT_POINT} - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTFLOPPY} installboot -v `cat vnd` @@ -78,9 +75,9 @@ instbin: instbin.mk instbin.cache instbin.c do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ - OSrev=${OSrev} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ + TARGDIR=${MOUNT_POINT} UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ + sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/instbin clean cleandir: diff --git a/distrib/sparc64/iso/Makefile b/distrib/sparc64/iso/Makefile index 59ef6aeacb4..55945ebd099 100644 --- a/distrib/sparc64/iso/Makefile +++ b/distrib/sparc64/iso/Makefile @@ -1,8 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2019/04/29 01:48:41 deraadt Exp $ - -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" +# $OpenBSD: Makefile,v 1.19 2019/04/29 15:56:26 deraadt Exp $ CDROM= install${OSrev}.iso RELXDIR?= /home/relx-${MACHINE} diff --git a/distrib/sparc64/miniroot/Makefile b/distrib/sparc64/miniroot/Makefile index 234254a0dae..047d61d77f4 100644 --- a/distrib/sparc64/miniroot/Makefile +++ b/distrib/sparc64/miniroot/Makefile @@ -1,8 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2019/04/29 01:48:41 deraadt Exp $ - -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" +# $OpenBSD: Makefile,v 1.12 2019/04/29 15:56:26 deraadt Exp $ TARGET= miniroot${OSrev}.fs MOUNT_POINT= /mnt diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile index ffb76ae02be..2e8558445dd 100644 --- a/distrib/sparc64/ramdisk/Makefile +++ b/distrib/sparc64/ramdisk/Makefile @@ -1,8 +1,5 @@ -# $OpenBSD: Makefile,v 1.44 2019/04/29 01:48:41 deraadt Exp $ +# $OpenBSD: Makefile,v 1.45 2019/04/29 15:56:26 deraadt Exp $ -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" IMAGE= mr.fs LISTS= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot @@ -52,7 +49,7 @@ ${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} rm $@.d/instbin @@ -61,9 +58,9 @@ ${IMAGE}: instbin .endif bsd: - cd ${TOP}/../../sys/arch/sparc64/compile/RAMDISKU1 && \ + cd ${.CURDIR}/../../../sys/arch/sparc64/compile/RAMDISKU1 && \ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env ${MAKE}' - cp -p ${TOP}/../../sys/arch/sparc64/compile/RAMDISKU1/obj/bsd bsd + cp -p ${.CURDIR}/../../../sys/arch/sparc64/compile/RAMDISKU1/obj/bsd bsd unconfig: -umount -f ${MOUNT_POINT} diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile index 656d3303f86..27bb571f5c3 100644 --- a/distrib/sparc64/ramdiskB/Makefile +++ b/distrib/sparc64/ramdiskB/Makefile @@ -1,8 +1,5 @@ -# $OpenBSD: Makefile,v 1.38 2019/04/29 01:48:41 deraadt Exp $ +# $OpenBSD: Makefile,v 1.39 2019/04/29 15:56:26 deraadt Exp $ -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" IMAGE= mr.fs LISTS= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot @@ -52,7 +49,7 @@ ${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} rm $@.d/instbin @@ -61,9 +58,9 @@ ${IMAGE}: instbin .endif bsd: - cd ${TOP}/../../sys/arch/sparc64/compile/RAMDISKU5 && \ + cd ${.CURDIR}/../../../sys/arch/sparc64/compile/RAMDISKU5 && \ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}' - cp -p ${TOP}/../../sys/arch/sparc64/compile/RAMDISKU5/obj/bsd bsd + cp -p ${.CURDIR}/../../../sys/arch/sparc64/compile/RAMDISKU5/obj/bsd bsd unconfig: -umount -f ${MOUNT_POINT} |