Date: Thu, 05 Sep 2002 11:22:43 -0600 (MDT) From: "M. Warner Losh" <imp@bsdimp.com> To: arch@freebsd.org Subject: Make more things honor NOFSCHG Message-ID: <20020905.112243.88255915.imp@bsdimp.com>
next in thread | raw e-mail | index | archive | help
Right now only libraries will honor NOFSCHG. Laying aside for the
moment the whole !@#$!$#@^$#^ NOFOO vs NO_FOO bikeshed, I'd like to
commit the following patch to make other places where -fschg are added
to installflags. This allows one to more things over a mix of local
file systems and NFS and have them work (right now if you build on a
local fs, then try to delete it via nfs, it fails because one can't
unset file flags over nfs).
Comments?
Warner
Index: bin/rcp/Makefile
===================================================================
RCS file: /cache/ncvs/src/bin/rcp/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- bin/rcp/Makefile 18 Apr 2002 07:01:34 -0000 1.20
+++ bin/rcp/Makefile 5 Sep 2002 17:14:09 -0000
@@ -23,6 +23,8 @@
BINOWN= root
BINMODE=4555
+.if !defined(NOFSCHG)
INSTALLFLAGS=-fschg
+.endif
.include <bsd.prog.mk>
Index: libexec/rtld-aout/Makefile
===================================================================
RCS file: /cache/ncvs/src/libexec/rtld-aout/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- libexec/rtld-aout/Makefile 12 Sep 2001 10:04:41 -0000 1.31
+++ libexec/rtld-aout/Makefile 5 Sep 2002 17:14:57 -0000
@@ -9,7 +9,10 @@
ASFLAGS+=-k
DPADD+= ${LIBC:S/c.a/c_pic.a/} ${LIBC:S/c.a/gcc_pic.a/}
LDADD+= -lc_pic -lgcc_pic
-INSTALLFLAGS= -fschg -C # -C to install as atomically as possible
+.if !defined(NOFSCHG)
+INSTALLFLAGS= -fschg
+.endif
+INSTALLFLAGS+= -C # -C to install as atomically as possible
MLINKS= rtld.1aout ld.so.1aout
.PATH: ${.CURDIR}/${MACHINE_ARCH}
Index: libexec/rtld-elf/Makefile
===================================================================
RCS file: /cache/ncvs/src/libexec/rtld-elf/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- libexec/rtld-elf/Makefile 10 Jun 2002 21:51:16 -0000 1.16
+++ libexec/rtld-elf/Makefile 5 Sep 2002 17:15:20 -0000
@@ -6,7 +6,10 @@
MAN= rtld.1
CFLAGS+= -Wall -DFREEBSD_ELF -I${.CURDIR}/${MACHINE_ARCH} -I${.CURDIR}
LDFLAGS+= -nostdlib -e .rtld_start
-INSTALLFLAGS= -fschg -C -b
+.if !defined(NOFSCHG)
+INSTALLFLAGS= -fschg
+.endif
+INSTALLFLAGS+= -C -b
MLINKS= rtld.1 ld-elf.so.1.1
.if exists(${.CURDIR}/${MACHINE_ARCH}/Makefile.inc)
Index: sbin/init/Makefile
===================================================================
RCS file: /cache/ncvs/src/sbin/init/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- sbin/init/Makefile 4 Dec 2001 02:19:48 -0000 1.27
+++ sbin/init/Makefile 5 Sep 2002 17:15:52 -0000
@@ -5,7 +5,10 @@
MAN= init.8
MLINKS= init.8 securelevel.8
BINMODE=500
-INSTALLFLAGS=-fschg -b -B.bak
+.if !defined(NOFSCHG)
+INSTALLFLAGS=-fschg
+.endif
+INSTALLFLAGS+=-b -B.bak
CFLAGS+=-DDEBUGSHELL -DSECURE -DLOGIN_CAP -DCOMPAT_SYSV_INIT
WARNS= 0
DPADD= ${LIBUTIL} ${LIBCRYPT}
Index: usr.bin/login/Makefile
===================================================================
RCS file: /cache/ncvs/src/usr.bin/login/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- usr.bin/login/Makefile 21 Apr 2002 12:43:14 -0000 1.42
+++ usr.bin/login/Makefile 5 Sep 2002 17:16:17 -0000
@@ -9,7 +9,9 @@
MAN= login.1 login.access.5
BINOWN= root
BINMODE=4555
+.if !defined(NOFSCHG)
INSTALLFLAGS=-fschg
+.endif
NEED_LIBNAMES= yes
.include <bsd.prog.mk>
Index: usr.bin/rlogin/Makefile
===================================================================
RCS file: /cache/ncvs/src/usr.bin/rlogin/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- usr.bin/rlogin/Makefile 8 May 2002 00:44:34 -0000 1.25
+++ usr.bin/rlogin/Makefile 5 Sep 2002 17:16:35 -0000
@@ -6,7 +6,9 @@
BINOWN= root
BINMODE=4555
+.if !defined(NOFSCHG)
INSTALLFLAGS=-fschg
+.endif
.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
SRCS+= krcmd.c kcmd.c rcmd_util.c
Index: usr.bin/rsh/Makefile
===================================================================
RCS file: /cache/ncvs/src/usr.bin/rsh/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- usr.bin/rsh/Makefile 8 May 2002 00:47:01 -0000 1.21
+++ usr.bin/rsh/Makefile 5 Sep 2002 17:16:56 -0000
@@ -20,6 +20,8 @@
BINOWN= root
BINMODE=4555
+.if !defined(NOFSCHG)
INSTALLFLAGS=-fschg
+.endif
.include <bsd.prog.mk>
Index: usr.bin/su/Makefile
===================================================================
RCS file: /cache/ncvs/src/usr.bin/su/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- usr.bin/su/Makefile 12 Dec 2001 23:29:13 -0000 1.38
+++ usr.bin/su/Makefile 5 Sep 2002 17:17:06 -0000
@@ -8,6 +8,8 @@
BINOWN= root
BINMODE=4555
+.if !defined(NOFSCHG)
INSTALLFLAGS=-fschg
+.endif
.include <bsd.prog.mk>
Index: usr.sbin/sliplogin/Makefile
===================================================================
RCS file: /cache/ncvs/src/usr.sbin/sliplogin/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- usr.sbin/sliplogin/Makefile 13 Sep 2001 06:48:16 -0000 1.7
+++ usr.sbin/sliplogin/Makefile 5 Sep 2002 17:17:27 -0000
@@ -6,6 +6,8 @@
BINOWN= root
BINGRP= network
BINMODE=4550
+.if !defined(NOFSCHG)
INSTALLFLAGS=-fschg
+.endif
.include <bsd.prog.mk>
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-arch" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020905.112243.88255915.imp>