From 811d644d8f869c304c66bfbd5e42d8c88ad64c4d Mon Sep 17 00:00:00 2001 From: lukem Date: Sat, 9 Feb 2002 13:56:48 +0000 Subject: [PATCH] don't set the owner or group when installing into $RELEASEDIR --- distrib/acorn32/Makefile | 5 ++--- distrib/alpha/Makefile | 5 ++--- distrib/arm32/Makefile | 5 ++--- distrib/hpcmips/Makefile | 5 ++--- distrib/mac68k/instkernel/instkernel/Makefile | 7 +++---- distrib/macppc/Makefile | 5 ++--- distrib/miniroot/Makefile | 5 ++--- distrib/mipsco/instkernel/Makefile | 15 +++++++-------- distrib/mipsco/ramdisk/Makefile | 6 +++--- distrib/notes/Makefile.inc | 5 ++--- distrib/playstation2/Makefile | 5 ++--- distrib/pmax/instkernel/Makefile | 15 +++++++-------- distrib/pmax/ramdisk/Makefile | 6 +++--- distrib/vax/Makefile | 5 ++--- 14 files changed, 41 insertions(+), 53 deletions(-) diff --git a/distrib/acorn32/Makefile b/distrib/acorn32/Makefile index 7e0d0420417f..2ae18017da11 100644 --- a/distrib/acorn32/Makefile +++ b/distrib/acorn32/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2002/01/25 15:28:41 reinoud Exp $ +# $NetBSD: Makefile,v 1.2 2002/02/09 13:56:48 lukem Exp $ ITARGET= ${RELEASEDIR}/installation -IINST= ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} \ - -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} +IINST= ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE} KERNELS= INSTALL SUBDIR= ramdisk kernels diff --git a/distrib/alpha/Makefile b/distrib/alpha/Makefile index 64a8e66d2633..95cf4285aed8 100644 --- a/distrib/alpha/Makefile +++ b/distrib/alpha/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.11 2001/11/14 00:44:13 tv Exp $ +# $NetBSD: Makefile,v 1.12 2002/02/09 13:56:49 lukem Exp $ .include # Use /etc/mk.conf. SUBDIR= instkernel #floppy-GENERIC ITARGET= ${RELEASEDIR}/installation -IINST= ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} \ - -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} +IINST= ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE} .ifndef RELEASEDIR release: diff --git a/distrib/arm32/Makefile b/distrib/arm32/Makefile index fd4d731fe6ad..082fc4854405 100644 --- a/distrib/arm32/Makefile +++ b/distrib/arm32/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2002/01/19 11:16:20 reinoud Exp $ +# $NetBSD: Makefile,v 1.6 2002/02/09 13:56:49 lukem Exp $ ITARGET= ${RELEASEDIR}/installation -IINST= ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} \ - -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} +IINST= ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE} KERNELS= A7INST CATSINST RPCINST SHARKINST SUBDIR= ramdisk kernels diff --git a/distrib/hpcmips/Makefile b/distrib/hpcmips/Makefile index f960b5e8c284..53878f680a66 100644 --- a/distrib/hpcmips/Makefile +++ b/distrib/hpcmips/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/11/14 00:48:38 tv Exp $ +# $NetBSD: Makefile,v 1.7 2002/02/09 13:56:50 lukem Exp $ .include "../Makefile.inc" @@ -8,8 +8,7 @@ SUBDIR= ITARGET= ${RELEASEDIR}/installation -IINST= ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} \ - -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} +IINST= ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE} PBSDBOOTDIR = ${KERNSRCDIR}/arch/${MACHINE}/stand/pbsdboot PBSDBOOT = ${PBSDBOOTDIR}/pbsdboot.exe diff --git a/distrib/mac68k/instkernel/instkernel/Makefile b/distrib/mac68k/instkernel/instkernel/Makefile index 1fb49a2ad97b..7b94bb5d16c6 100644 --- a/distrib/mac68k/instkernel/instkernel/Makefile +++ b/distrib/mac68k/instkernel/instkernel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/02/03 19:59:30 wormey Exp $ +# $NetBSD: Makefile,v 1.7 2002/02/09 13:56:50 lukem Exp $ .include "../../../Makefile.inc" @@ -23,9 +23,8 @@ clean cleandir distclean: rm -f netbsd* release: all - ${INSTALL} -d -o root -g wheel -m 755 \ - ${RELEASEDIR}/installation/instkernel/ - ${INSTALL} ${COPY} -o root -g wheel -m 644 netbsd-${INSTALL_KERNEL}.gz \ + ${INSTALL} -d -m 755 ${RELEASEDIR}/installation/instkernel/ + ${INSTALL} ${COPY} -m 644 netbsd-${INSTALL_KERNEL}.gz \ ${RELEASEDIR}/installation/instkernel/ .include diff --git a/distrib/macppc/Makefile b/distrib/macppc/Makefile index dd16b35769eb..14594e552083 100644 --- a/distrib/macppc/Makefile +++ b/distrib/macppc/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2001/11/14 00:58:49 tv Exp $ +# $NetBSD: Makefile,v 1.9 2002/02/09 13:56:50 lukem Exp $ .include # Use /etc/mk.conf. ITARGET= ${RELEASEDIR}/installation -IINST= ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} \ - -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} +IINST= ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE} SUBDIR= floppies diff --git a/distrib/miniroot/Makefile b/distrib/miniroot/Makefile index ecb902761d66..90d3cece2053 100644 --- a/distrib/miniroot/Makefile +++ b/distrib/miniroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2002/01/15 17:45:36 pk Exp $ +# $NetBSD: Makefile,v 1.46 2002/02/09 13:56:51 lukem Exp $ .include "../../Makefile.inc" .include @@ -31,8 +31,7 @@ DISKTYPEARG= -t ${DISKTYPE} LISTS= ${.CURDIR}/list ${ARCHDIR}/list CRUNCHCONF= ${CBIN}.conf MTREECONF= ${.CURDIR}/mtree.conf -ICMD= ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} \ - -o root -g wheel -m ${NONBINMODE} +ICMD= ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE} CRUNCHGEN?= crunchgen MTREE?= mtree diff --git a/distrib/mipsco/instkernel/Makefile b/distrib/mipsco/instkernel/Makefile index 795e5c6807b9..db960c39d637 100644 --- a/distrib/mipsco/instkernel/Makefile +++ b/distrib/mipsco/instkernel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/11/04 06:18:26 wdk Exp $ +# $NetBSD: Makefile,v 1.6 2002/02/09 13:56:51 lukem Exp $ .include "../../../Makefile.inc" .include @@ -73,14 +73,13 @@ release: .USE .else release: ${IMAGE}.gz -mkdir -p ${DISKBINDIR} ${KERNBINDIR} - ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -o root -g wheel \ - -m ${NONBINMODE} ${IMAGE}.gz ${DISKBINDIR} - ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -o root -g wheel \ - -m ${BINMODE} netbsd.gz ${KERNBINDIR}/install.gz + ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE} \ + ${IMAGE}.gz ${DISKBINDIR} + ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE} \ + netbsd.gz ${KERNBINDIR}/install.gz .if defined(ECOFF_KERNEL) - ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -o root -g wheel \ - -m ${BINMODE} netbsd.ecoff.gz \ - ${KERNBINDIR}/install.ecoff.gz + ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE} \ + netbsd.ecoff.gz ${KERNBINDIR}/install.ecoff.gz .endif # ECOFF_KERNEL .endif # RELEASEDIR diff --git a/distrib/mipsco/ramdisk/Makefile b/distrib/mipsco/ramdisk/Makefile index fa49f6e71b56..2eb31fc43539 100644 --- a/distrib/mipsco/ramdisk/Makefile +++ b/distrib/mipsco/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/11/04 06:18:26 wdk Exp $ +# $NetBSD: Makefile,v 1.8 2002/02/09 13:56:51 lukem Exp $ TOP?= ${.CURDIR}/.. ARCHDIR?= ${.CURDIR}/../miniroot @@ -71,8 +71,8 @@ release: .USE .else release: ${DISKIMAGE} -mkdir -p ${NETBOOTDIR} - ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -o root -g wheel \ - -m ${NONBINMODE} ${DISKIMAGE} ${NETBOOTDIR} + ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE} \ + ${DISKIMAGE} ${NETBOOTDIR} .endif # !defined(RELEASEDIR) realinstall: release diff --git a/distrib/notes/Makefile.inc b/distrib/notes/Makefile.inc index a6bedd9687d8..73d0e7677d1c 100644 --- a/distrib/notes/Makefile.inc +++ b/distrib/notes/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.22 2001/12/10 05:27:59 jmc Exp $ +# $NetBSD: Makefile.inc,v 1.23 2002/02/09 13:56:52 lukem Exp $ # # Ross Harvey @@ -20,8 +20,7 @@ TOCS= ${TARG}.PostScript.toc ${TARG}.ASCII.toc ${TARG}.HTML.toc \ SRCS= ${MAIN} whatis contents hardware xfer prep install\ upgrade donations legal.common legal postinstall ../Makefile.inc\ ${MERGED_SRCS} -ICMD= ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} \ - -o root -g wheel -m ${NONBINMODE} +ICMD= ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE} PRESET= ${GFLAGS} -dM=${M} -dV=${V} -d.CURDIR=${.CURDIR} -r${M}=1 diff --git a/distrib/playstation2/Makefile b/distrib/playstation2/Makefile index 31a27f95c7d7..4de614c2b2ab 100644 --- a/distrib/playstation2/Makefile +++ b/distrib/playstation2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/11/14 00:58:49 tv Exp $ +# $NetBSD: Makefile,v 1.4 2002/02/09 13:56:52 lukem Exp $ .include "../Makefile.inc" @@ -8,8 +8,7 @@ SUBDIR= ITARGET= ${RELEASEDIR}/installation -IINST= ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} \ - -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} +IINST= ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE} .ifndef RELEASEDIR release: diff --git a/distrib/pmax/instkernel/Makefile b/distrib/pmax/instkernel/Makefile index 76d919f64bd5..c1ebb2af2894 100644 --- a/distrib/pmax/instkernel/Makefile +++ b/distrib/pmax/instkernel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/10/21 23:23:22 jmc Exp $ +# $NetBSD: Makefile,v 1.21 2002/02/09 13:56:52 lukem Exp $ .include "../../../Makefile.inc" .include @@ -59,13 +59,12 @@ unconfig: -/bin/rm -f ${IMAGE} ${IMAGE}.gz realinstall: - ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -o root -g wheel \ - -m ${NONBINMODE} ${IMAGE}.gz ${RELEASEDIR}${DISKBINDIR} - ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -o root -g wheel \ - -m ${BINMODE} netbsd.gz ${RELEASEDIR}${KERNBINDIR}/install.gz - ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -o root -g wheel \ - -m ${BINMODE} netbsd.ecoff.gz \ - ${RELEASEDIR}${KERNBINDIR}/install.ecoff.gz + ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE} \ + ${IMAGE}.gz ${RELEASEDIR}${DISKBINDIR} + ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE} \ + netbsd.gz ${RELEASEDIR}${KERNBINDIR}/install.gz + ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE} \ + netbsd.ecoff.gz ${RELEASEDIR}${KERNBINDIR}/install.ecoff.gz clean cleandir distclean: rm -f ${CLEANFILES} diff --git a/distrib/pmax/ramdisk/Makefile b/distrib/pmax/ramdisk/Makefile index 5b4a96675eac..239def7781d6 100644 --- a/distrib/pmax/ramdisk/Makefile +++ b/distrib/pmax/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/10/13 06:15:19 jmc Exp $ +# $NetBSD: Makefile,v 1.18 2002/02/09 13:56:53 lukem Exp $ BINDIR= /installation/netboot @@ -64,8 +64,8 @@ echoimage: @echo ${.OBJDIR}/${IMAGE} realinstall: - ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -o root -g wheel \ - -m ${NONBINMODE} ${DISKIMAGE} ${RELEASEDIR}${BINDIR} + ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE} \ + ${DISKIMAGE} ${RELEASEDIR}${BINDIR} clean cleandir distclean: /bin/rm -f *.core ${CLEANFILES} *.o *.cro *.c diff --git a/distrib/vax/Makefile b/distrib/vax/Makefile index 75d7b0f8986f..13e67e616c7c 100644 --- a/distrib/vax/Makefile +++ b/distrib/vax/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2001/03/04 20:33:03 matt Exp $ +# $NetBSD: Makefile,v 1.9 2002/02/09 13:56:53 lukem Exp $ .include # Use /etc/mk.conf. ITARGET= ${RELEASEDIR}/installation -IINST= ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} \ - -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} +IINST= ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE} SUBDIR= ramdisk ramdisk-kernel floppy #inst tk50 rx50 rx33