author | schurig <schurig> | 2003-06-06 14:42:22 (UTC) |
---|---|---|
committer | schurig <schurig> | 2003-06-06 14:42:22 (UTC) |
commit | 923ca7f364bbbece39bcc99d2e5e6a5716bd835b (patch) (unidiff) | |
tree | 6f6c820e132d796bc6404c3d8bba2d1062384cc3 | |
parent | 802e9457b1bc158c61849755215fe2a5bad6231d (diff) | |
download | opie-923ca7f364bbbece39bcc99d2e5e6a5716bd835b.zip opie-923ca7f364bbbece39bcc99d2e5e6a5716bd835b.tar.gz opie-923ca7f364bbbece39bcc99d2e5e6a5716bd835b.tar.bz2 |
don't pack CVS directories into IPKs
-rwxr-xr-x | scripts/mkipkg | 3 |
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 | ||
345 | if [ -z "$filesubst" ]; then | 345 | if [ -z "$filesubst" ]; then |
346 | ( cd $tempDir && stripFiles "$ipkgFileList" ) | 346 | ( cd $tempDir && stripFiles "$ipkgFileList" ) |
347 | else | 347 | else |
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 ) |
352 | fi | 352 | fi |
353 | 353 | ||
354 | # removing CVS directories | ||
355 | find $tempDir -name CVS -a -type d -print0 | xargs -0 rm -rf | ||
356 | |||
354 | path="`echo "$PATH" | sed -e "s/\:/ /g"`" | 357 | path="`echo "$PATH" | sed -e "s/\:/ /g"`" |
355 | if [ -z "$mkfsjffs2" ]; then | 358 | if [ -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 |
362 | fi | 365 | fi |
363 | 366 | ||
364 | if [ -z "$mkfsjffs2" ]; then | 367 | if [ -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" |