PERFORCE change 14956 for review

Brian Feldman green at freebsd.org
Fri Jul 26 19:48:34 GMT 2002


http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14956

Change 14956 by green at green_crash2 on 2002/07/26 12:48:30

	More release build fixes: use echo(1) instead of ls(1) to list files,
	and add touch(1) to the commands preserved for the install
	environment.

Affected files ...

.. //depot/projects/trustedbsd/mac/Makefile.inc1#17 edit
.. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/Makefile#4 edit

Differences ...

==== //depot/projects/trustedbsd/mac/Makefile.inc1#17 (text+ko) ====

@@ -359,7 +359,7 @@
 	mkdir -p ${INSTALLTMP}
 	for prog in [ awk cat chflags chmod chown cpio date echo egrep find \
 	    grep ln make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
-	    test true uname wc zic; do \
+	    test touch true uname wc zic; do \
 		cp `which $$prog` ${INSTALLTMP}; \
 	done
 	cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}

==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/Makefile#4 (text+ko) ====

@@ -19,19 +19,19 @@
 POLICYFILES += rbac users constraints
 POLICYFILES += initial_sid_contexts fs_use genfs_contexts net_contexts
 
-MACROPROGRAMFILES != ls macros/program/*.te
-MACROFILES != ls macros/*.te
+MACROPROGRAMFILES != echo macros/program/*.te
+MACROFILES != echo macros/*.te
 MACROFILES += $(MACROPROGRAMFILES)
 
-PROGRAMFILES != ls domains/program/*.te
-TYPEFILES != ls types/*.te
+PROGRAMFILES != echo domains/program/*.te
+TYPEFILES != echo types/*.te
 
 FC = file_contexts/file_contexts
-FCFILES != ls file_contexts/*.fc file_contexts/program/*.fc
+FCFILES != echo file_contexts/*.fc file_contexts/program/*.fc
 
 ALLTEFILES := macros/global_macros.te attrib.te tmp/all_types.te tmp/all_program_macros.te tmp/all_domains.te assert.te 
 
-ALLDOMAINS != ls domains/*.te domains/misc/*.te domains/program/*.te
+ALLDOMAINS != echo domains/*.te domains/misc/*.te domains/program/*.te
 
 policy.11: policy.conf
 	${CHECKPOLICY} -o policy.11 policy.conf
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message



More information about the trustedbsd-cvs mailing list