[PATCH] Don't ignore -DNOFSCHG

Suleiman Souhlal ssouhlal at FreeBSD.org
Tue Nov 16 17:52:54 PST 2004


Hello,

Attached is a patch that makes everything in base that actually installs
stuff as schg follow NOFSCHG, if defined. (It's needed to be able to run
make installworld in a jail, in FreeBSD 5).

Bye,
-- 
Suleiman Souhlal    | ssouhlal at xxxxxx
The FreeBSD Project | ssouhlal at xxxxxxxxxxx
diff -urN src/bin/rcp/Makefile /home/refugee/jails/df2/usr/src/bin/rcp/Makefile
--- src/bin/rcp/Makefile	Tue Aug  5 03:45:39 2003
+++ /home/refugee/jails/df2/usr/src/bin/rcp/Makefile	Tue Nov 16 19:13:05 2004
@@ -10,6 +10,8 @@
 
 BINOWN=	root
 BINMODE=4555
+.if !defined(NOFSCHG)
 INSTALLFLAGS=-fschg
+.endif
 
 .include <bsd.prog.mk>
diff -urN src/sbin/init/Makefile /home/refugee/jails/df2/usr/src/sbin/init/Makefile
--- src/sbin/init/Makefile	Tue Jun 17 00:27:33 2003
+++ /home/refugee/jails/df2/usr/src/sbin/init/Makefile	Tue Nov 16 19:03:54 2004
@@ -6,7 +6,12 @@
 MAN=	init.8
 MLINKS=	init.8 securelevel.8
 BINMODE=500
-INSTALLFLAGS=-fschg -b -B.bak
+INSTALLFLAGS=-b -B.bak
+.if !defined(NOFSCHG)
+INSTALLFLAGS+= -fschg
+.endif
+
 CFLAGS+=-DDEBUGSHELL -DSECURE -DLOGIN_CAP -DCOMPAT_SYSV_INIT
 DPADD=	${LIBUTIL} ${LIBCRYPT}
 LDADD=	-lutil -lcrypt
diff -urN src/usr.bin/login/Makefile /home/refugee/jails/df2/usr/src/usr.bin/login/Makefile
--- src/usr.bin/login/Makefile	Tue Jun 17 00:29:28 2003
+++ /home/refugee/jails/df2/usr/src/usr.bin/login/Makefile	Tue Nov 16 19:06:49 2004
@@ -18,7 +18,9 @@
 .endif
 
 BINMODE=4555
+.if !defined(NOFSCHG)
 INSTALLFLAGS=-fschg
+.endif
 NEED_LIBNAMES= yes
 
 .include <bsd.prog.mk>
diff -urN src/usr.bin/opieinfo/Makefile /home/refugee/jails/df2/usr/src/usr.bin/opieinfo/Makefile
--- src/usr.bin/opieinfo/Makefile	Tue Jun 17 00:29:30 2003
+++ /home/refugee/jails/df2/usr/src/usr.bin/opieinfo/Makefile	Tue Nov 16 19:07:18 2004
@@ -14,7 +14,9 @@
 
 BINOWN=	root
 BINMODE=4555
+.if !defined(NOFSCHG)
 INSTALLFLAGS=-fschg
+.endif
 
 .PATH:	${OPIE_DIST}
 
diff -urN src/usr.bin/opiepasswd/Makefile /home/refugee/jails/df2/usr/src/usr.bin/opiepasswd/Makefile
--- src/usr.bin/opiepasswd/Makefile	Tue Jun 17 00:29:30 2003
+++ /home/refugee/jails/df2/usr/src/usr.bin/opiepasswd/Makefile	Tue Nov 16 19:07:47 2004
@@ -14,7 +14,9 @@
 
 BINOWN=	root
 BINMODE=4555
+.if !defined(NOFSCHG)
 INSTALLFLAGS=-fschg
+.endif
 
 .PATH:	${OPIE_DIST}
 
diff -urN src/usr.bin/rlogin/Makefile /home/refugee/jails/df2/usr/src/usr.bin/rlogin/Makefile
--- src/usr.bin/rlogin/Makefile	Tue Aug  5 03:45:43 2003
+++ /home/refugee/jails/df2/usr/src/usr.bin/rlogin/Makefile	Tue Nov 16 19:08:24 2004
@@ -7,6 +7,8 @@
 CFLAGS+=-Wall
 
 BINMODE=4555
+.if !defined(NOFSCHG)
 INSTALLFLAGS=-fschg
+.endif
 
 .include <bsd.prog.mk>
diff -urN src/usr.bin/rsh/Makefile /home/refugee/jails/df2/usr/src/usr.bin/rsh/Makefile
--- src/usr.bin/rsh/Makefile	Tue Aug  5 03:45:43 2003
+++ /home/refugee/jails/df2/usr/src/usr.bin/rsh/Makefile	Tue Nov 16 19:08:47 2004
@@ -8,6 +8,8 @@
 CFLAGS+=-I${.CURDIR}/../../libexec/rlogind
 
 BINMODE=4555
+.if !defined(NOFSCHG)
 INSTALLFLAGS=-fschg
+.endif
 
 .include <bsd.prog.mk>
diff -urN src/usr.bin/su/Makefile /home/refugee/jails/df2/usr/src/usr.bin/su/Makefile
--- src/usr.bin/su/Makefile	Tue Aug  5 03:45:44 2003
+++ /home/refugee/jails/df2/usr/src/usr.bin/su/Makefile	Tue Nov 16 19:09:08 2004
@@ -24,6 +24,8 @@
 .endif
 
 BINMODE=4555
+.if !defined(NOFSCHG)
 INSTALLFLAGS=-fschg
+.endif
 
 .include <bsd.prog.mk>
diff -urN src/usr.sbin/cron/crontab/Makefile /home/refugee/jails/df2/usr/src/usr.sbin/cron/crontab/Makefile
--- src/usr.sbin/cron/crontab/Makefile	Tue Jun 17 00:29:53 2003
+++ /home/refugee/jails/df2/usr/src/usr.sbin/cron/crontab/Makefile	Tue Nov 16 19:09:56 2004
@@ -10,6 +10,8 @@
 BINDIR=	/usr/bin
 BINOWN=	root
 BINMODE=4555
+.if !defined(NOFSCHG)
 INSTALLFLAGS=-fschg
+.endif
 
 .include <bsd.prog.mk>
diff -urN src/usr.sbin/sliplogin/Makefile /home/refugee/jails/df2/usr/src/usr.sbin/sliplogin/Makefile
--- src/usr.sbin/sliplogin/Makefile	Tue Jun 17 00:30:03 2003
+++ /home/refugee/jails/df2/usr/src/usr.sbin/sliplogin/Makefile	Tue Nov 16 19:10:22 2004
@@ -6,6 +6,8 @@
 MAN=	sliplogin.8
 BINGRP=	network
 BINMODE=4550
+.if !defined(NOFSCHG)
 INSTALLFLAGS=-fschg
+.endif
 
 .include <bsd.prog.mk>
diff -urN src/gnu/usr.bin/man/man/Makefile /home/refugee/jails/df2/usr/src/gnu/usr.bin/man/man/Makefile
--- src/gnu/usr.bin/man/man/Makefile	Tue Jun 17 00:25:46 2003
+++ /home/refugee/jails/df2/usr/src/gnu/usr.bin/man/man/Makefile	Tue Nov 16 19:11:38 2004
@@ -8,7 +8,9 @@
 SRCS=	man.c manpath.c glob.c
 BINOWN= man
 BINMODE=4555
+.if !defined(NOFSCHG)
 INSTALLFLAGS=	-fschg
+.endif
 
 CFLAGS+= -I${LIBDESTDIR}
 DPADD=	${LIBMAN}
diff -urN src/usr.bin/chpass/Makefile /home/refugee/jails/df2/usr/src/usr.bin/chpass/Makefile
--- src/usr.bin/chpass/Makefile	Tue Jun 17 00:29:25 2003
+++ /home/refugee/jails/df2/usr/src/usr.bin/chpass/Makefile	Tue Nov 16 19:42:32 2004
@@ -67,6 +67,8 @@
 .endfor
 
 afterinstall:
+.if !defined(NOFSCHG)
 	-chflags schg ${DESTDIR}${BINDIR}/chpass
+.endif
 
 .include <bsd.prog.mk>
diff -urN src/usr.bin/passwd/Makefile /home/refugee/jails/df2/usr/src/usr.bin/passwd/Makefile
--- src/usr.bin/passwd/Makefile	Tue Aug  5 03:45:43 2003
+++ /home/refugee/jails/df2/usr/src/usr.bin/passwd/Makefile	Tue Nov 16 19:42:55 2004
@@ -90,6 +90,8 @@
 .endfor
 
 afterinstall:
+.if !defined(NOFSCHG)
 	-chflags schg ${DESTDIR}${BINDIR}/passwd
+.endif
 
 .include <bsd.prog.mk>




More information about the Submit mailing list