summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rwxr-xr-xscripts/mkipkg3
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
@@ -342,24 +342,27 @@ rm -f $ctrldir/control.new
342 342
343( cd $destdir && tar -cf - $ipkgFileList 2>/dev/null ) | ( cd $tempDir && tar -xf - 2>/dev/null ) 343( cd $destdir && tar -cf - $ipkgFileList 2>/dev/null ) | ( cd $tempDir && tar -xf - 2>/dev/null )
344 344
345if [ -z "$filesubst" ]; then 345if [ -z "$filesubst" ]; then
346 ( cd $tempDir && stripFiles "$ipkgFileList" ) 346 ( cd $tempDir && stripFiles "$ipkgFileList" )
347else 347else
348 if ! (echo $filesubst|grep -q '^/'); then 348 if ! (echo $filesubst|grep -q '^/'); then
349 filesubst="$oldpwd/$filesubst" 349 filesubst="$oldpwd/$filesubst"
350 fi 350 fi
351 ( cd $tempDir && substAndStripFiles "$ipkgFileList" $filesubst ) 351 ( cd $tempDir && substAndStripFiles "$ipkgFileList" $filesubst )
352fi 352fi
353 353
354# removing CVS directories
355find $tempDir -name CVS -a -type d -print0 | xargs -0 rm -rf
356
354path="`echo "$PATH" | sed -e "s/\:/ /g"`" 357path="`echo "$PATH" | sed -e "s/\:/ /g"`"
355if [ -z "$mkfsjffs2" ]; then 358if [ -z "$mkfsjffs2" ]; then
356 for i in $path; do 359 for i in $path; do
357 if [ -x "$i/mkfs.jffs2" ]; then 360 if [ -x "$i/mkfs.jffs2" ]; then
358 mkfsjffs2="$i/mkfs.jffs2" 361 mkfsjffs2="$i/mkfs.jffs2"
359 break 362 break
360 fi 363 fi
361 done 364 done
362fi 365fi
363 366
364if [ -z "$mkfsjffs2" ]; then 367if [ -z "$mkfsjffs2" ]; then
365 echo "$self: WARNING: no mkjfs.jffs2 found in path. Falling back to using du" 368 echo "$self: WARNING: no mkjfs.jffs2 found in path. Falling back to using du"