Changeset 9f812cd in freewrt

Timestamp:

Jul 16, 2006, 9:18:19 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

a5748d2

Parents:

eeb6f72

Message:

fix ipkg for real: GNU tar uses non-standard -X as alias for --exclude,
that's why I didn't see it. move stuff around instead

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@234 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

tools/ipkg-utils/patches

Files:

• 030-paxmirabilis.patch (modified) (2 diffs)
• ipkg-utils-1.7-ipkg_build_tar.patch (deleted)

tools/ipkg-utils/patches/030-paxmirabilis.patch

@@ -4 +4 @@
         we just assume they always pass -o 0 -g 0
 
---- ipkg-utils-1.7/ipkg-build   Sun Jul 16 15:47:51 2006
-+++ ipkg-utils-1.7/ipkg-build.new       Sun Jul 16 19:03:02 2006
+--- ipkg-utils-1.7/ipkg-build   Sun Jul 16 19:11:46 2006
++++ ipkg-utils-1.7/ipkg-build.new       Sun Jul 16 19:16:09 2006
 @@ -169,10 +169,12 @@ usage="Usage: $0 [-c] [-C] [-o owner] [-
  while getopts "cg:ho:v" opt; do
@@ -21 +21 @@
          c ) outer=tar
              ;;
+@@ -232,10 +234,12 @@ fi
+ tmp_dir=$dest_dir/IPKG_BUILD.$$
+ mkdir $tmp_dir
+ 
+-echo $CONTROL > $tmp_dir/tarX
+-( cd $pkg_dir && tar $ogargs -czf $tmp_dir/data.tar.gz . -X $tmp_dir/tarX )
++( cd $pkg_dir && pax -rw -pe $CONTROL $tmp_dir/ )
++rm -rf $CONTROL
++( cd $pkg_dir && tar $ogargs -czf $tmp_dir/data.tar.gz . )
++( cd $tmp_dir && pax -rw -pe $CONTROL $pkg_dir/ )
+ ( cd $pkg_dir/$CONTROL && tar $ogargs -czf $tmp_dir/control.tar.gz . )
+-rm $tmp_dir/tarX
++rm -rf $tmp_dir/$CONTROL
+ 
+ echo "2.0" > $tmp_dir/debian-binary
+