summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>1999-02-14 13:56:15 +0000
committerdes <des@FreeBSD.org>1999-02-14 13:56:15 +0000
commite158dd910e85016b8e7804f839754e22e78dea7c (patch)
tree3254bcf2b23c268bd2576e23425d81e7889d9792
parent61e9418dd2bf9555cd37719ccbc0996bd5c4565a (diff)
downloadFreeBSD-src-e158dd910e85016b8e7804f839754e22e78dea7c.zip
FreeBSD-src-e158dd910e85016b8e7804f839754e22e78dea7c.tar.gz
Ignore errors from chflags. This makes it possible to make installworld
with DESTDIR set to an NFS-mounted file system.
-rw-r--r--Makefile.inc14
-rw-r--r--release/Makefile4
-rw-r--r--sys/alpha/conf/Makefile.alpha4
-rw-r--r--sys/conf/Makefile.alpha4
-rw-r--r--sys/conf/Makefile.i3864
-rw-r--r--sys/conf/Makefile.pc984
-rw-r--r--sys/conf/Makefile.powerpc4
-rw-r--r--sys/i386/conf/Makefile.i3864
-rw-r--r--sys/pc98/conf/Makefile.pc984
-rw-r--r--usr.bin/chpass/Makefile4
-rw-r--r--usr.bin/passwd/Makefile6
11 files changed, 23 insertions, 23 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 82c1deb..dbaa3e0 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.inc1,v 1.61 1999/01/23 08:44:17 markm Exp $
+# $Id: Makefile.inc1,v 1.62 1999/01/27 15:08:05 jkh Exp $
#
# Make command line options:
# -DCLOBBER will remove /usr/include
@@ -226,7 +226,7 @@ buildworld: check-objformat
@echo ">>> Cleaning up the temporary ${OBJFORMAT} build tree"
@echo "--------------------------------------------------------------"
mkdir -p ${WORLDTMP}
- chflags -R noschg ${WORLDTMP}/
+ -chflags -R noschg ${WORLDTMP}/
rm -rf ${WORLDTMP}
.endif
.if !defined(NOTOOLS)
diff --git a/release/Makefile b/release/Makefile
index 7fdafb9..71d964a 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.470 1999/02/10 01:57:38 msmith Exp $
+# $Id: Makefile,v 1.471 1999/02/10 09:15:27 jkh Exp $
#
# make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ]
#
@@ -516,7 +516,7 @@ cdrom.1:
@for i in ${DISTRIBUTIONS} ; \
do \
if [ -d ${RD}/trees/$${i} ] ; then \
- chflags -R noschg ${RD}/trees/$${i} ; \
+ chflags -R noschg ${RD}/trees/$${i} || true ; \
( cd ${RD}/trees/$${i} && \
find . -depth -print | cpio -dumpl ${CD_DISC2} ) ; \
fi \
diff --git a/sys/alpha/conf/Makefile.alpha b/sys/alpha/conf/Makefile.alpha
index 6ffa507..e2ccd56 100644
--- a/sys/alpha/conf/Makefile.alpha
+++ b/sys/alpha/conf/Makefile.alpha
@@ -1,7 +1,7 @@
# Makefile.alpha -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.alpha 7.1 5/10/91
-# $Id: Makefile.alpha,v 1.16 1999/01/09 21:50:59 jdp Exp $
+# $Id: Makefile.alpha,v 1.17 1999/02/02 18:34:23 dfr Exp $
#
# Makefile for FreeBSD
#
@@ -251,7 +251,7 @@ install:
exit 1 ; \
fi
.if exists(${DESTDIR}/kernel)
- chflags noschg ${DESTDIR}/kernel
+ -chflags noschg ${DESTDIR}/kernel
mv ${DESTDIR}/kernel ${DESTDIR}/kernel.old
.endif
PATH=$${PATH}:/sbin:/usr/sbin; \
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index 6ffa507..e2ccd56 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -1,7 +1,7 @@
# Makefile.alpha -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.alpha 7.1 5/10/91
-# $Id: Makefile.alpha,v 1.16 1999/01/09 21:50:59 jdp Exp $
+# $Id: Makefile.alpha,v 1.17 1999/02/02 18:34:23 dfr Exp $
#
# Makefile for FreeBSD
#
@@ -251,7 +251,7 @@ install:
exit 1 ; \
fi
.if exists(${DESTDIR}/kernel)
- chflags noschg ${DESTDIR}/kernel
+ -chflags noschg ${DESTDIR}/kernel
mv ${DESTDIR}/kernel ${DESTDIR}/kernel.old
.endif
PATH=$${PATH}:/sbin:/usr/sbin; \
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 77f2e3e..70251b0 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -1,7 +1,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $Id: Makefile.i386,v 1.137 1999/01/25 04:08:28 peter Exp $
+# $Id: Makefile.i386,v 1.138 1999/01/26 02:49:51 julian Exp $
#
# Makefile for FreeBSD
#
@@ -220,7 +220,7 @@ install:
fi
.endif
.if exists(${DESTDIR}/kernel)
- chflags noschg ${DESTDIR}/kernel
+ -chflags noschg ${DESTDIR}/kernel
mv ${DESTDIR}/kernel ${DESTDIR}/kernel.old
.endif
PATH=$${PATH}:/sbin:/usr/sbin; \
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 8381656..d46464d 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -3,7 +3,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $Id: Makefile.pc98,v 1.53 1999/01/25 12:12:01 kato Exp $
+# $Id: Makefile.pc98,v 1.54 1999/01/27 08:25:19 kato Exp $
#
# Makefile for FreeBSD
#
@@ -224,7 +224,7 @@ install:
fi
.endif
.if exists(${DESTDIR}/kernel)
- chflags noschg ${DESTDIR}/kernel
+ -chflags noschg ${DESTDIR}/kernel
mv ${DESTDIR}/kernel ${DESTDIR}/kernel.old
.endif
PATH=$${PATH}:/sbin:/usr/sbin; \
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 77f2e3e..70251b0 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -1,7 +1,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $Id: Makefile.i386,v 1.137 1999/01/25 04:08:28 peter Exp $
+# $Id: Makefile.i386,v 1.138 1999/01/26 02:49:51 julian Exp $
#
# Makefile for FreeBSD
#
@@ -220,7 +220,7 @@ install:
fi
.endif
.if exists(${DESTDIR}/kernel)
- chflags noschg ${DESTDIR}/kernel
+ -chflags noschg ${DESTDIR}/kernel
mv ${DESTDIR}/kernel ${DESTDIR}/kernel.old
.endif
PATH=$${PATH}:/sbin:/usr/sbin; \
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index 77f2e3e..70251b0 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -1,7 +1,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $Id: Makefile.i386,v 1.137 1999/01/25 04:08:28 peter Exp $
+# $Id: Makefile.i386,v 1.138 1999/01/26 02:49:51 julian Exp $
#
# Makefile for FreeBSD
#
@@ -220,7 +220,7 @@ install:
fi
.endif
.if exists(${DESTDIR}/kernel)
- chflags noschg ${DESTDIR}/kernel
+ -chflags noschg ${DESTDIR}/kernel
mv ${DESTDIR}/kernel ${DESTDIR}/kernel.old
.endif
PATH=$${PATH}:/sbin:/usr/sbin; \
diff --git a/sys/pc98/conf/Makefile.pc98 b/sys/pc98/conf/Makefile.pc98
index 8381656..d46464d 100644
--- a/sys/pc98/conf/Makefile.pc98
+++ b/sys/pc98/conf/Makefile.pc98
@@ -3,7 +3,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $Id: Makefile.pc98,v 1.53 1999/01/25 12:12:01 kato Exp $
+# $Id: Makefile.pc98,v 1.54 1999/01/27 08:25:19 kato Exp $
#
# Makefile for FreeBSD
#
@@ -224,7 +224,7 @@ install:
fi
.endif
.if exists(${DESTDIR}/kernel)
- chflags noschg ${DESTDIR}/kernel
+ -chflags noschg ${DESTDIR}/kernel
mv ${DESTDIR}/kernel ${DESTDIR}/kernel.old
.endif
PATH=$${PATH}:/sbin:/usr/sbin; \
diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
index 3abed82..c17a4ce 100644
--- a/usr.bin/chpass/Makefile
+++ b/usr.bin/chpass/Makefile
@@ -60,10 +60,10 @@ yppasswd_private_clnt.c: ${RPCSRC_PRIV}
beforeinstall:
.for i in chpass chfn chsh ypchpass ypchfn ypchsh
[ ! -e ${DESTDIR}${BINDIR}/$i ] || \
- chflags noschg ${DESTDIR}${BINDIR}/$i
+ chflags noschg ${DESTDIR}${BINDIR}/$i || true
.endfor
afterinstall:
- chflags schg ${DESTDIR}${BINDIR}/chpass
+ -chflags schg ${DESTDIR}${BINDIR}/chpass
.include <bsd.prog.mk>
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index cfa98db..f01fe6d 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.3 (Berkeley) 4/2/94
-# $Id: Makefile,v 1.29 1998/08/06 21:37:51 markm Exp $
+# $Id: Makefile,v 1.30 1998/09/19 22:42:04 obrien Exp $
PROG= passwd
SRCS= local_passwd.c passwd.c pw_copy.c pw_util.c pw_yp.c \
@@ -70,10 +70,10 @@ DISTRIBUTION= krb
beforeinstall:
.for i in passwd yppasswd
[ ! -e ${DESTDIR}${BINDIR}/$i ] || \
- chflags noschg ${DESTDIR}${BINDIR}/$i
+ chflags noschg ${DESTDIR}${BINDIR}/$i || true
.endfor
afterinstall:
- chflags schg ${DESTDIR}${BINDIR}/passwd
+ -chflags schg ${DESTDIR}${BINDIR}/passwd
.include <bsd.prog.mk>
OpenPOWER on IntegriCloud