don't pack CVS directories into IPKs

1 files changed, 3 insertions, 0 deletions

diff --git a/scripts/mkipkg b/scripts/mkipkg
index 9c5e184..43bd3a3 100755
--- a/scripts/mkipkg
+++ b/scripts/mkipkg
@@ -330,48 +330,51 @@ fi
 
 createFileList $ctrldir/control.new ipkgFileList
 
 if [ "$?" != "0" ]; then
     echo "$self: ERROR: missing files, not building $control"
     rm -rf $tempDir
     exit 1
 fi
 
 
 cat $ctrldir/control.new | egrep -v '^(Files|FileExcludeMask|FileIncludeMask):' > $ctrldir/control
 rm -f $ctrldir/control.new
 
 ( cd $destdir && tar -cf - $ipkgFileList 2>/dev/null ) | ( cd $tempDir && tar -xf - 2>/dev/null )
 
 if [ -z "$filesubst" ]; then
     ( cd $tempDir && stripFiles "$ipkgFileList" )
 else
     if ! (echo $filesubst|grep -q '^/'); then
         filesubst="$oldpwd/$filesubst"
     fi
     ( cd $tempDir && substAndStripFiles "$ipkgFileList" $filesubst )
 fi
 
+# removing CVS directories
+find $tempDir -name CVS -a -type d -print0 | xargs -0 rm -rf
+
 path="`echo "$PATH" | sed -e "s/\:/ /g"`"
 if [ -z "$mkfsjffs2" ]; then
     for i in $path; do
       if [ -x "$i/mkfs.jffs2" ]; then
         mkfsjffs2="$i/mkfs.jffs2"
         break
       fi
     done
 fi
 
 if [ -z "$mkfsjffs2" ]; then
     echo "$self: WARNING: no mkjfs.jffs2 found in path. Falling back to using du"
     echo "for size calculation. mkfs.jffs2 is recommended for size calculation"
     echo "as it calculates the real package size on the compressed file system,"
     echo "in contrast to du calculating the uncompressed size!"
     buildsize=`du -h -s $tempDir | awk '{print $1}'`
 else
     buildsize=`$mkfsjffs2 -r $tempDir | wc -c`
 fi
 
 if [ "$buildsize" != "0" ]; then
     echo "Installed-Size: $buildsize" >> $ctrldir/control
 fi