diff options
Diffstat (limited to 'distrib')
-rw-r--r-- | distrib/alpha/bsd.rd/Makefile | 7 | ||||
-rw-r--r-- | distrib/alpha/common/Makefile.inc | 7 | ||||
-rw-r--r-- | distrib/amd64/common/Makefile.inc | 7 | ||||
-rw-r--r-- | distrib/armv7/ramdisk/Makefile | 7 | ||||
-rw-r--r-- | distrib/hppa/ramdisk/Makefile | 7 | ||||
-rw-r--r-- | distrib/i386/common/Makefile.inc | 7 | ||||
-rw-r--r-- | distrib/landisk/ramdisk/Makefile | 7 | ||||
-rw-r--r-- | distrib/loongson/ramdisk/Makefile | 7 | ||||
-rw-r--r-- | distrib/luna88k/ramdisk/Makefile | 7 | ||||
-rw-r--r-- | distrib/macppc/ramdisk/Makefile | 7 | ||||
-rw-r--r-- | distrib/octeon/ramdisk/Makefile | 7 | ||||
-rw-r--r-- | distrib/ramdisk/Makefile | 7 | ||||
-rw-r--r-- | distrib/sgi/ramdisk/Makefile | 7 | ||||
-rw-r--r-- | distrib/socppc/ramdisk/Makefile | 7 | ||||
-rw-r--r-- | distrib/sparc64/bsd.rd/Makefile | 7 | ||||
-rw-r--r-- | distrib/sparc64/ramdisk/Makefile | 7 | ||||
-rw-r--r-- | distrib/sparc64/ramdiskB/Makefile | 7 |
17 files changed, 51 insertions, 68 deletions
diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile index 543ada2e35b..684c7d41f61 100644 --- a/distrib/alpha/bsd.rd/Makefile +++ b/distrib/alpha/bsd.rd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2013/10/20 08:27:17 miod Exp $ +# $OpenBSD: Makefile,v 1.22 2016/10/14 18:44:19 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -47,10 +47,9 @@ bsd.rd_unz: bsd ${IMAGE} rdsetroot ${.OBJDIR}/rdsetroot bsd.rd_unz ${IMAGE} bsd: - cd ${.CURDIR}/../../../sys/arch/alpha/conf && config ${RAMDISK} cd ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK} && \ - ${MAKE} clean && COPTS=-Os exec ${MAKE} - cp ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK}/bsd bsd + su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Os ${MAKE}' + cp -p ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK}/obj/bsd bsd ${IMAGE}: do_prep do_mount do_files do_umount mv -f ${REALIMAGE} ${IMAGE} diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc index 03854769180..f6dbf7a7a32 100644 --- a/distrib/alpha/common/Makefile.inc +++ b/distrib/alpha/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.27 2015/09/19 10:44:01 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.28 2016/10/14 18:44:19 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -73,10 +73,9 @@ bsd.rd: bsd ${IMAGE} rdsetroot ${.OBJDIR}/rdsetroot bsd.rd ${IMAGE} bsd: - cd ${.CURDIR}/../../../sys/arch/alpha/conf && config ${RAMDISK} cd ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK} && \ - ${MAKE} clean && COPTS=-Os exec ${MAKE} - cp ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK}/bsd bsd + su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Os ${MAKE}' + cp -p ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK}/obj/bsd bsd ${IMAGE}: do_prep do_mount do_files do_umount mv -f ${REALIMAGE} ${IMAGE} diff --git a/distrib/amd64/common/Makefile.inc b/distrib/amd64/common/Makefile.inc index 8a2bfea4d86..5317cf02803 100644 --- a/distrib/amd64/common/Makefile.inc +++ b/distrib/amd64/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.28 2015/09/07 01:41:35 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.29 2016/10/14 18:44:19 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -78,10 +78,9 @@ bsd.rd: ${IMAGE} bsd rdsetroot bsd: - cd ${.CURDIR}/../../../sys/arch/amd64/conf && config ${RAMDISK} cd ${.CURDIR}/../../../sys/arch/amd64/compile/${RAMDISK} && \ - ${MAKE} clean && COPTS=-Os exec ${MAKE} - cp ${.CURDIR}/../../../sys/arch/amd64/compile/${RAMDISK}/bsd bsd + su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Os ${MAKE}' + cp -p ${.CURDIR}/../../../sys/arch/amd64/compile/${RAMDISK}/obj/bsd bsd ${IMAGE}: ${CBIN} rd_setup do_files rd_teardown diff --git a/distrib/armv7/ramdisk/Makefile b/distrib/armv7/ramdisk/Makefile index eda91e23793..fae4c651ad9 100644 --- a/distrib/armv7/ramdisk/Makefile +++ b/distrib/armv7/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2016/06/05 15:12:56 jsg Exp $ +# $OpenBSD: Makefile,v 1.15 2016/10/14 18:44:19 deraadt Exp $ REV= ${OSrev} @@ -46,10 +46,9 @@ ALLBSDRD= ${BSD_RD} all: ${ALLBSDRD} bsd: - cd ${TOP}/../../sys/arch/armv7/conf && config RAMDISK cd ${TOP}/../../sys/arch/armv7/compile/RAMDISK && \ - ${MAKE} clean && exec ${MAKE} - cp ${TOP}/../../sys/arch/armv7/compile/RAMDISK/bsd bsd + su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' + cp -p ${TOP}/../../sys/arch/armv7/compile/RAMDISK/obj/bsd bsd ${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot cp bsd ${BSD_RD} diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile index 1a8de8262b1..34f532b6344 100644 --- a/distrib/hppa/ramdisk/Makefile +++ b/distrib/hppa/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2014/10/26 10:42:59 miod Exp $ +# $OpenBSD: Makefile,v 1.29 2016/10/14 18:44:19 deraadt Exp $ CBIN= instbin ARCHDIR= ${.CURDIR}/.. @@ -59,10 +59,9 @@ ${CDROM}: bsd ${CDBOOT} dd if=/dev/zero bs=64k count=1 >> ${.OBJDIR}/${CDROM} obsd: - cd ${SRCDIR}/sys/arch/${MACHINE}/conf && config ${KERNEL} cd ${SRCDIR}/sys/arch/${MACHINE}/compile/${KERNEL} && \ - ${MAKE} clean && exec ${MAKE} - cp ${SRCDIR}/sys/arch/${MACHINE}/compile/${KERNEL}/bsd obsd + su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' + cp -p ${SRCDIR}/sys/arch/${MACHINE}/compile/${KERNEL}/obj/bsd obsd bsd.rd: obsd ${IMAGE} rdsetroot cp obsd bsd.rd diff --git a/distrib/i386/common/Makefile.inc b/distrib/i386/common/Makefile.inc index 8a611ed6453..486538eef43 100644 --- a/distrib/i386/common/Makefile.inc +++ b/distrib/i386/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.38 2016/09/18 15:23:42 jsing Exp $ +# $OpenBSD: Makefile.inc,v 1.39 2016/10/14 18:44:19 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -68,10 +68,9 @@ bsd.rd: ${IMAGE} bsd rdsetroot bsd: - cd ${.CURDIR}/../../../sys/arch/i386/conf && config ${RAMDISK} cd ${.CURDIR}/../../../sys/arch/i386/compile/${RAMDISK} && \ - ${MAKE} clean && COPTS="${COPTS}" exec ${MAKE} - cp ${.CURDIR}/../../../sys/arch/i386/compile/${RAMDISK}/bsd bsd + su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS="${COPTS}" ${MAKE}' + cp -p ${.CURDIR}/../../../sys/arch/i386/compile/${RAMDISK}/obj/bsd bsd ${IMAGE}: ${CBIN} rd_setup do_files rd_teardown diff --git a/distrib/landisk/ramdisk/Makefile b/distrib/landisk/ramdisk/Makefile index 4464ec17cb3..09b447b2c90 100644 --- a/distrib/landisk/ramdisk/Makefile +++ b/distrib/landisk/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2013/10/15 22:46:50 deraadt Exp $ +# $OpenBSD: Makefile,v 1.19 2016/10/14 18:44:19 deraadt Exp $ REV= ${OSrev} @@ -45,10 +45,9 @@ ${IMAGE}: rd_setup do_files rd_teardown .endif bsd: - cd ${TOP}/../../sys/arch/landisk/conf && config RAMDISK cd ${TOP}/../../sys/arch/landisk/compile/RAMDISK && \ - ${MAKE} clean && exec ${MAKE} - cp ${TOP}/../../sys/arch/landisk/compile/RAMDISK/bsd bsd + su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' + cp -p ${TOP}/../../sys/arch/landisk/compile/RAMDISK/obj/bsd bsd rd_setup: dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS} diff --git a/distrib/loongson/ramdisk/Makefile b/distrib/loongson/ramdisk/Makefile index 680df09893b..976b4dbeceb 100644 --- a/distrib/loongson/ramdisk/Makefile +++ b/distrib/loongson/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2013/10/15 22:46:51 deraadt Exp $ +# $OpenBSD: Makefile,v 1.11 2016/10/14 18:44:19 deraadt Exp $ REV= ${OSrev} @@ -44,10 +44,9 @@ ${IMAGE}: rd_setup do_files rd_teardown .endif bsd: - cd ${TOP}/../../sys/arch/loongson/conf && config RAMDISK cd ${TOP}/../../sys/arch/loongson/compile/RAMDISK && \ - ${MAKE} clean && exec ${MAKE} - cp ${TOP}/../../sys/arch/loongson/compile/RAMDISK/bsd bsd + su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' + cp -p ${TOP}/../../sys/arch/loongson/compile/RAMDISK/obj/bsd bsd rd_setup: dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS} diff --git a/distrib/luna88k/ramdisk/Makefile b/distrib/luna88k/ramdisk/Makefile index 32849f6f6a8..4b15e0b95ac 100644 --- a/distrib/luna88k/ramdisk/Makefile +++ b/distrib/luna88k/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2013/11/29 12:35:47 aoyama Exp $ +# $OpenBSD: Makefile,v 1.18 2016/10/14 18:44:19 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -34,11 +34,10 @@ ${IMAGE}: rd_setup do_files rd_teardown bsd: .ifndef(NOBUILD) - cd ${.CURDIR}/../../../sys/arch/luna88k/conf && config RAMDISK cd ${.CURDIR}/../../../sys/arch/luna88k/compile/RAMDISK && \ - ${MAKE} clean && exec ${MAKE} + su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' .endif - cp ${.CURDIR}/../../../sys/arch/luna88k/compile/RAMDISK/bsd bsd + cp -p ${.CURDIR}/../../../sys/arch/luna88k/compile/RAMDISK/obj/bsd bsd rd_test: rd_setup rd_teardown diff --git a/distrib/macppc/ramdisk/Makefile b/distrib/macppc/ramdisk/Makefile index 0da0188ea1d..893e90a9605 100644 --- a/distrib/macppc/ramdisk/Makefile +++ b/distrib/macppc/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2013/10/15 22:46:51 deraadt Exp $ +# $OpenBSD: Makefile,v 1.31 2016/10/14 18:44:20 deraadt Exp $ REV= ${OSrev} @@ -68,10 +68,9 @@ ${IMAGE}: rd_setup do_files rd_teardown .endif bsd: - cd ${TOP}/../../sys/arch/macppc/conf && config RAMDISK cd ${TOP}/../../sys/arch/macppc/compile/RAMDISK && \ - ${MAKE} clean && exec ${MAKE} - cp ${TOP}/../../sys/arch/macppc/compile/RAMDISK/bsd bsd + su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' + cp -p ${TOP}/../../sys/arch/macppc/compile/RAMDISK/obj/bsd bsd rd_setup: dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS} diff --git a/distrib/octeon/ramdisk/Makefile b/distrib/octeon/ramdisk/Makefile index 839be02403f..467c639406a 100644 --- a/distrib/octeon/ramdisk/Makefile +++ b/distrib/octeon/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2013/10/15 22:46:53 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 2016/10/14 18:44:20 deraadt Exp $ REV= ${OSrev} @@ -36,10 +36,9 @@ ${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot ${IMAGE}: rd_setup do_files rd_teardown bsd: - cd ${TOP}/../../sys/arch/octeon/conf && config RAMDISK cd ${TOP}/../../sys/arch/octeon/compile/RAMDISK && \ - ${MAKE} clean && exec ${MAKE} - cp ${TOP}/../../sys/arch/octeon/compile/RAMDISK/bsd bsd + su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' + cp -p ${TOP}/../../sys/arch/octeon/compile/RAMDISK/obj/bsd bsd rd_setup: dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS} diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile index 433d68bbdec..28600c57b3b 100644 --- a/distrib/ramdisk/Makefile +++ b/distrib/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.46 2016/09/01 10:08:29 deraadt Exp $ +# $OpenBSD: Makefile,v 1.47 2016/10/14 18:44:20 deraadt Exp $ REV= ${OSrev} @@ -73,10 +73,9 @@ ${FLOPPY}: bsd.gz ${BOOT} ${BOOTXX} rm -f ${REALIMAGE} bsd: - cd ${.CURDIR}/../../sys/arch/${MACHINE}/conf && config ${KERNEL} cd ${.CURDIR}/../../sys/arch/${MACHINE}/compile/${KERNEL} && \ - ${MAKE} clean && ${MAKE} depend && COPTS=-Os ${MAKE} - cp ${.CURDIR}/../../sys/arch/${MACHINE}/compile/${KERNEL}/bsd bsd + su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Os ${MAKE}' + cp -p ${.CURDIR}/../../sys/arch/${MACHINE}/compile/${KERNEL}/obj/bsd bsd bsd.rd: bsd ${IMAGE} rdsetroot cp bsd bsd.rd diff --git a/distrib/sgi/ramdisk/Makefile b/distrib/sgi/ramdisk/Makefile index 7dba86198a0..ac3c9c8cd67 100644 --- a/distrib/sgi/ramdisk/Makefile +++ b/distrib/sgi/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2015/09/20 12:55:11 miod Exp $ +# $OpenBSD: Makefile,v 1.22 2016/10/14 18:44:20 deraadt Exp $ REV= ${OSrev} @@ -45,11 +45,10 @@ all: ${ALLBSDRD} .for IP in ${ALLIP} bsd.IP${IP}: .ifndef NOBUILD - cd ${.TOP}/../../sys/arch/sgi/conf && config RAMDISK-IP${IP} cd ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP${IP} && \ - ${MAKE} clean && exec ${MAKE} + su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' .endif - cp ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP${IP}/bsd bsd.IP${IP} + cp -p ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP${IP}/obj/bsd bsd.IP${IP} ${BSD_RD}.IP${IP}: ${CBIN} ${IMAGE} bsd.IP${IP} rdsetroot cp bsd.IP${IP} ${BSD_RD}.IP${IP} diff --git a/distrib/socppc/ramdisk/Makefile b/distrib/socppc/ramdisk/Makefile index 9581e602832..230bcace977 100644 --- a/distrib/socppc/ramdisk/Makefile +++ b/distrib/socppc/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2013/10/15 22:46:53 deraadt Exp $ +# $OpenBSD: Makefile,v 1.15 2016/10/14 18:44:20 deraadt Exp $ REV= ${OSrev} @@ -48,10 +48,9 @@ ${IMAGE}: rd_setup do_files rd_teardown .endif bsd: - cd ${TOP}/../../sys/arch/socppc/conf && config RAMDISK cd ${TOP}/../../sys/arch/socppc/compile/RAMDISK && \ - ${MAKE} clean && exec ${MAKE} - cp ${TOP}/../../sys/arch/socppc/compile/RAMDISK/bsd bsd + su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Os ${MAKE}' + cp -p ${TOP}/../../sys/arch/socppc/compile/RAMDISK/obj/bsd bsd rd_setup: dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS} diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile index 07af017d921..a0966ebc941 100644 --- a/distrib/sparc64/bsd.rd/Makefile +++ b/distrib/sparc64/bsd.rd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2014/11/22 15:02:27 deraadt Exp $ +# $OpenBSD: Makefile,v 1.29 2016/10/14 18:44:20 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -50,10 +50,9 @@ bsd.rd_unz: bsd ${IMAGE} rdsetroot ${.OBJDIR}/rdsetroot bsd.rd_unz ${IMAGE} bsd: - cd ${.CURDIR}/../../../sys/arch/sparc64/conf && config ${RAMDISK} cd ${.CURDIR}/../../../sys/arch/sparc64/compile/${RAMDISK} && \ - ${MAKE} clean && COPTS=-Os exec ${MAKE} - cp ${.CURDIR}/../../../sys/arch/sparc64/compile/${RAMDISK}/bsd bsd + su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Os ${MAKE}' + cp -p ${.CURDIR}/../../../sys/arch/sparc64/compile/${RAMDISK}/obj/bsd bsd ${IMAGE}: do_prep do_mount do_files do_umount mv -f ${REALIMAGE} ${IMAGE} diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile index 7ceaa079106..31418601b39 100644 --- a/distrib/sparc64/ramdisk/Makefile +++ b/distrib/sparc64/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2014/11/26 08:18:18 stsp Exp $ +# $OpenBSD: Makefile,v 1.31 2016/10/14 18:44:20 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -81,10 +81,9 @@ ${IMAGE}: rd_setup do_files rd_teardown .endif bsd: - cd ${TOP}/../../sys/arch/sparc64/conf && config ${KERNEL} cd ${TOP}/../../sys/arch/sparc64/compile/${KERNEL} && \ - ${MAKE} clean && COPTS=-Os exec ${MAKE} - cp ${TOP}/../../sys/arch/sparc64/compile/${KERNEL}/bsd bsd + su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Os ${MAKE}' + cp -p ${TOP}/../../sys/arch/sparc64/compile/${KERNEL}/obj/bsd bsd rd_setup: dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS} diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile index d8786462b9a..4cad08127a0 100644 --- a/distrib/sparc64/ramdiskB/Makefile +++ b/distrib/sparc64/ramdiskB/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2014/11/26 08:18:25 stsp Exp $ +# $OpenBSD: Makefile,v 1.24 2016/10/14 18:44:20 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -81,10 +81,9 @@ ${IMAGE}: rd_setup do_files rd_teardown .endif bsd: - cd ${TOP}/../../sys/arch/sparc64/conf && config ${KERNEL} cd ${TOP}/../../sys/arch/sparc64/compile/${KERNEL} && \ - ${MAKE} clean && COPTS=-Os exec ${MAKE} - cp ${TOP}/../../sys/arch/sparc64/compile/${KERNEL}/bsd bsd + su ${BUILDUSER} '${MAKE} config && ${MAKE} clean && env COPTS=-Os ${MAKE}' + cp -p ${TOP}/../../sys/arch/sparc64/compile/${KERNEL}/obj/bsd bsd rd_setup: dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS} |