Changeset 7794


Ignore:
Timestamp:
2007-06-30T15:23:18+02:00 (11 years ago)
Author:
nbd
Message:

fix accidentally committed broken patch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/ipkg-utils/patches/140-portability.patch

    r5042 r7794  
    1 diff -ur ipkg.old/ipkg-build ipkg.dev/ipkg-build 
    2 --- ipkg.old/ipkg-build Tue Oct 10 22:52:58 2006 
    3 +++ ipkg.dev/ipkg-build Tue Oct 10 22:56:32 2006 
     1Index: ipkg-utils-1.7/ipkg-build 
     2=================================================================== 
     3--- ipkg-utils-1.7.orig/ipkg-build      2007-06-30 15:21:37.621213250 +0200 
     4+++ ipkg-utils-1.7/ipkg-build   2007-06-30 15:21:51.862103250 +0200 
    45@@ -11,6 +11,8 @@ 
    56  
     
    1112        sed -e "s/^[^:]*:[[:space:]]*//" 
    1213 } 
    13 @@ -184,7 +186,7 @@ 
    14         g ) group=$OPTARG 
    15             ogargs="$ogargs --group=$group" 
    16             ;; 
    17 -        c ) outer=tar 
    18 +        c ) outer=$TAR 
    19              ;; 
    20          C ) noclean=1 
    21              ;; 
    22 @@ -243,8 +245,8 @@ 
    23  mkdir $tmp_dir 
    24   
    25  echo $CONTROL > $tmp_dir/tarX 
    26 -( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -czf $tmp_dir/data.tar.gz . ) 
    27 -( cd $pkg_dir/$CONTROL && tar $ogargs -czf $tmp_dir/control.tar.gz . ) 
    28 +( cd $pkg_dir && $TAR $ogargs -X $tmp_dir/tarX -czf $tmp_dir/data.tar.gz . ) 
    29 +( cd $pkg_dir/$CONTROL && $TAR $ogargs -czf $tmp_dir/control.tar.gz . ) 
    30  rm $tmp_dir/tarX 
    31   
    32  echo "2.0" > $tmp_dir/debian-binary 
    33 @@ -254,7 +256,7 @@ 
    34  if [ "$outer" = "ar" ] ; then 
    35    ( cd $tmp_dir && ar -crf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz ) 
    36  else 
    37 -  ( cd $tmp_dir && tar -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz ) 
    38 +  ( cd $tmp_dir && $TAR -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz ) 
    39  fi 
    40   
    41  rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz 
    42 diff -ur ipkg.old/ipkg-make-index ipkg.dev/ipkg-make-index 
    43 --- ipkg.old/ipkg-make-index    Tue Oct 10 22:52:58 2006 
    44 +++ ipkg.dev/ipkg-make-index    Tue Oct 10 22:57:53 2006 
     14Index: ipkg-utils-1.7/ipkg-make-index 
     15=================================================================== 
     16--- ipkg-utils-1.7.orig/ipkg-make-index 2007-06-30 15:21:37.225188500 +0200 
     17+++ ipkg-utils-1.7/ipkg-make-index      2007-06-30 15:21:51.866103500 +0200 
    4518@@ -1,4 +1,4 @@ 
    4619-#!/usr/bin/python 
Note: See TracChangeset for help on using the changeset viewer.