Page MenuHomeFreeBSD
Files F176532408

D60866.diff
No OneTemporary
Actions

D60866.diff
View Options

diff --git a/sbin/ipf/ipsend/Makefile b/sbin/ipf/ipsend/Makefile
--- a/sbin/ipf/ipsend/Makefile
+++ b/sbin/ipf/ipsend/Makefile
@@ -177,7 +177,3 @@
rm -rf *.o *core a.out ipsend ipresend iptest
if [ -d iplang ]; then (cd iplang; $(MAKE) $(MFLAGS) clean); fi
if [ -d $(TOP)/iplang ]; then (cd $(TOP)/iplang; $(MAKE) $(MFLAGS) clean); fi
-
-do-cvs:
- find . -type d -name CVS -print | xargs /bin/rm -rf
- find . -type f -name .cvsignore -print | xargs /bin/rm -f
diff --git a/share/sendmail/Makefile b/share/sendmail/Makefile
--- a/share/sendmail/Makefile
+++ b/share/sendmail/Makefile
@@ -6,8 +6,8 @@
SENDMAIL_DIR= ${SRCTOP}/contrib/sendmail
CFDIR= cf
CFPACKAGE= sendmail
-CFDIRS!= (cd ${SENDMAIL_DIR}; find -s -L ${CFDIR} \( \( -name CVS -o -name .svn \) -prune \) -o -type d -print)
-CFFILES!= (cd ${SENDMAIL_DIR}; find -s -L ${CFDIR} \( \( -name CVS -o -name .svn \) -prune \) -o -type f -print)
+CFDIRS!= (cd ${SENDMAIL_DIR}; find -s -L ${CFDIR} \( -name .svn -prune \) -o -type d -print)
+CFFILES!= (cd ${SENDMAIL_DIR}; find -s -L ${CFDIR} \( -name .svn -prune \) -o -type f -print)
SMFILES= ${CFFILES}
SMFILESDIR= ${DDIR}
diff --git a/tools/tools/commitsdb/make_commit_db b/tools/tools/commitsdb/make_commit_db
--- a/tools/tools/commitsdb/make_commit_db
+++ b/tools/tools/commitsdb/make_commit_db
@@ -25,7 +25,6 @@
$logs{$filename} = {%loghash};
} elsif (-d $filename) {
- next if $filename =~ /\/CVS$/;
push @dirs, $filename;
}
}
diff --git a/tools/tools/kerninclude/kerninclude.sh b/tools/tools/kerninclude/kerninclude.sh
--- a/tools/tools/kerninclude/kerninclude.sh
+++ b/tools/tools/kerninclude/kerninclude.sh
@@ -39,7 +39,7 @@
(
echo "Cleaning compile"
cd compile
- ls | grep -v CVS | xargs rm -rf
+ ls | xargs rm -rf
)
fi
@@ -88,7 +88,7 @@
cd modules
for i in *
do
- if [ -d $i -a $i != CVS ] ; then
+ if [ -d $i ] ; then
( cd $i ; ls *.o 2>/dev/null || true)
fi
done
diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh
--- a/tools/tools/nanobsd/defaults.sh
+++ b/tools/tools/nanobsd/defaults.sh
@@ -739,7 +739,7 @@
if [ -n "${dir}" -a -d "${dir}" ]; then
echo "Populating ${lbl} from ${dir}"
cd "${dir}"
- find . -print | grep -Ev '/(CVS|\.svn|\.hg|\.git)/' | cpio ${CPIO_SYMLINK} -dumpv ${mnt}
+ find . -print | grep -Ev '/(\.svn|\.hg|\.git)/' | cpio ${CPIO_SYMLINK} -dumpv ${mnt}
fi
df -i ${mnt}
nano_umount ${mnt}
@@ -899,7 +899,7 @@
cust_install_files() (
cd "${NANO_TOOLS}/Files"
- find . -print | grep -Ev '/(CVS|\.svn|\.hg|\.git)/' | cpio ${CPIO_SYMLINK} -Ldumpv ${NANO_WORLDDIR}
+ find . -print | grep -Ev '/(\.svn|\.hg|\.git)/' | cpio ${CPIO_SYMLINK} -Ldumpv ${NANO_WORLDDIR}
if [ -n "${NANO_CUST_FILES_MTREE}" -a -f ${NANO_CUST_FILES_MTREE} ]; then
CR "mtree -eiU -p /" <${NANO_CUST_FILES_MTREE}
diff --git a/tools/tools/nanobsd/dhcpd/common b/tools/tools/nanobsd/dhcpd/common
--- a/tools/tools/nanobsd/dhcpd/common
+++ b/tools/tools/nanobsd/dhcpd/common
@@ -82,7 +82,7 @@
{
echo "cd ${NANO_CFG_BASE}/Files"
cd ${NANO_CFG_BASE}/Files
- find . -print | grep -Ev '/(CVS|\.git|\.hg|\.svn)' | cpio -dumpv ${NANO_WORLDDIR}
+ find . -print | grep -Ev '/(\.git|\.hg|\.svn)' | cpio -dumpv ${NANO_WORLDDIR}
}
customize_cmd cust_install_files
customize_cmd cust_install_machine_files
diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common
--- a/tools/tools/nanobsd/embedded/common
+++ b/tools/tools/nanobsd/embedded/common
@@ -118,7 +118,7 @@
cust_install_machine_files() (
echo "cd ${NANO_CFG_BASE}/Files"
cd ${NANO_CFG_BASE}/Files
- find . -print | grep -Ev '/(CVS|\.svn|\.hg|\.git)' | cpio -dumpv ${NANO_WORLDDIR}
+ find . -print | grep -Ev '/(\.svn|\.hg|\.git)' | cpio -dumpv ${NANO_WORLDDIR}
)
customize_cmd cust_install_files
customize_cmd cust_install_machine_files
diff --git a/tools/tools/nanobsd/pcengines/common.conf b/tools/tools/nanobsd/pcengines/common.conf
--- a/tools/tools/nanobsd/pcengines/common.conf
+++ b/tools/tools/nanobsd/pcengines/common.conf
@@ -37,7 +37,7 @@
MACHINE_DIR="${NANO_TOOLS}/Files.${NANO_NAME}"
if [ -d "${MACHINE_DIR}" ]; then
cd ${MACHINE_DIR}
- find . -print | grep -Ev '/(CVS|\.git|\.hg|\.svn)' | cpio -dumpv ${NANO_WORLDDIR}
+ find . -print | grep -Ev '/(\.git|\.hg|\.svn)' | cpio -dumpv ${NANO_WORLDDIR}
else
echo "${MACHINE_DIR} not found, skipping step"
fi

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 20, 3:02 PM (16 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41114856
Default Alt Text
D60866.diff (4 KB)

Event Timeline