On 2012-02-19 12:13 PM, Luka Perkov wrote: > quilt upgrade to version 0.51. > > Signed-off-by: Luka Perkov <[email protected]> > --- > > Index: tools/quilt/patches/100-patch_2.6.1_version.patch > =================================================================== > --- tools/quilt/patches/100-patch_2.6.1_version.patch (revision 30634) > +++ tools/quilt/patches/100-patch_2.6.1_version.patch (working copy) > @@ -1,15 +0,0 @@ > ---- a/configure.ac > -+++ b/configure.ac > -@@ -274,7 +274,11 @@ fi > - AC_MSG_CHECKING([the version of $PATCH]) > - if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then > - set -- `$PATCH --version 2> /dev/null` > -- patch_version=$2 > -+ if test x$1 = xGNU ; then > -+ patch_version=$3 > -+ else > -+ patch_version=$2 > -+ fi > - AC_MSG_RESULT($patch_version) > - saved_IFS=$IFS; IFS='.' > - set -- $patch_version > Index: tools/quilt/patches/000-relocatable.patch > =================================================================== > --- tools/quilt/patches/000-relocatable.patch (revision 30634) > +++ tools/quilt/patches/000-relocatable.patch (working copy) > @@ -44,20 +44,9 @@ > > if ! [ -r $QUILT_DIR/scripts/patchfns ] > then > ---- a/quilt/scripts/parse-patch.in > -+++ b/quilt/scripts/parse-patch.in > -@@ -34,7 +34,7 @@ BEGIN { > - } > - > - setlocale(LC_MESSAGES, ""); > --bindtextdomain("quilt", "@LOCALEDIR@"); > -+bindtextdomain("quilt", $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . > '/../host/share/locale' : "@LOCALEDIR@"); > - textdomain("quilt"); > - > - sub _($) { > --- a/quilt/scripts/patchfns.in > +++ b/quilt/scripts/patchfns.in > -@@ -10,7 +10,11 @@ > +@@ -8,7 +8,11 @@ > # See the COPYING and AUTHORS files for more details. > > export TEXTDOMAIN=quilt Are you sure that the changes that you dropped without replacement are no longer necessary?
- Felix _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
