[PATCH 0/6] upgrade automake/autogen-native/make/git

[PATCH 0/6] upgrade automake/autogen-native/make/git

[Robert Yang]

I have tested these upgrades on the local autobuilder.

// Robert

The following changes since commit 5c95cc221aa55df7c25e3254d30a7a4b70ff5359:

  maintainers.inc: reassign tzcode-native (2013-12-27 19:35:02 +0800)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib robert/upgrade
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/upgrade

Robert Yang (6):
  automake: upgrade to 1.14
  autoconf: remove path_prog_fixes.patch
  autogen-native: upgrade to 5.18.2
  make: remove the obsolete SCCS.patch
  make: upgrade to 4.0
  git: upgrade to 1.8.5.2

 .../autoconf/autoconf/path_prog_fixes.patch        | 128 --------------
 meta/recipes-devtools/autoconf/autoconf_2.69.bb    |   1 -
 ...n-native_5.17.4.bb => autogen-native_5.18.2.bb} |   6 +-
 .../autogen/{files => autogen}/guile.patch         |  48 +++---
 .../increase-timeout-limit.patch                   |   0
 .../automake/automake/path_prog_fixes.patch        |  41 -----
 .../prefer-cpio-over-pax-for-ustar-archives.patch  |  48 ------
 .../{automake_1.13.4.bb => automake_1.14.bb}       |  14 +-
 meta/recipes-devtools/git/git.inc                  |   1 -
 .../git/{git_1.8.4.4.bb => git_1.8.5.2.bb}         |   5 +-
 meta/recipes-devtools/make/files/SCCS.patch        |  17 --
 .../make/make-3.82/expand_MAKEFLAGS.patch          |  39 -----
 .../make-3.82/intermediate-target-bugfix.patch     |  23 ---
 .../make-savannah-bug30612-fix_white_space.patch   |  58 -------
 ...ke-savannah-bug30612-handling_of_archives.patch | 188 ---------------------
 meta/recipes-devtools/make/make.inc                |   3 +-
 .../make/{make_3.82.bb => make_4.0.bb}             |  10 +-
 17 files changed, 41 insertions(+), 589 deletions(-)
 delete mode 100644 meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch
 rename meta/recipes-devtools/autogen/{autogen-native_5.17.4.bb => autogen-native_5.18.2.bb} (88%)
 rename meta/recipes-devtools/autogen/{files => autogen}/guile.patch (89%)
 rename meta/recipes-devtools/autogen/{files => autogen}/increase-timeout-limit.patch (100%)
 delete mode 100644 meta/recipes-devtools/automake/automake/path_prog_fixes.patch
 delete mode 100644 meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch
 rename meta/recipes-devtools/automake/{automake_1.13.4.bb => automake_1.14.bb} (75%)
 rename meta/recipes-devtools/git/{git_1.8.4.4.bb => git_1.8.5.2.bb} (67%)
 delete mode 100644 meta/recipes-devtools/make/files/SCCS.patch
 delete mode 100644 meta/recipes-devtools/make/make-3.82/expand_MAKEFLAGS.patch
 delete mode 100644 meta/recipes-devtools/make/make-3.82/intermediate-target-bugfix.patch
 delete mode 100644 meta/recipes-devtools/make/make-3.82/make-savannah-bug30612-fix_white_space.patch
 delete mode 100644 meta/recipes-devtools/make/make-3.82/make-savannah-bug30612-handling_of_archives.patch
 rename meta/recipes-devtools/make/{make_3.82.bb => make_4.0.bb} (44%)

-- 
1.8.3.1

[PATCH 1/6] automake: upgrade to 1.14

[Robert Yang]

Upgrade from 1.13.4 to 1.14:
- Remove the PATHFIXPATCH variable and path_prog_fixes.patch since the
  problem can be fixed by the do_install_append().

- Remove prefer-cpio-over-pax-for-ustar-archives.patch since it have
  been fixed by the upgrade.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../automake/automake/path_prog_fixes.patch        | 41 ------------------
 .../prefer-cpio-over-pax-for-ustar-archives.patch  | 48 ----------------------
 .../{automake_1.13.4.bb => automake_1.14.bb}       | 14 ++-----
 3 files changed, 4 insertions(+), 99 deletions(-)
 delete mode 100644 meta/recipes-devtools/automake/automake/path_prog_fixes.patch
 delete mode 100644 meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch
 rename meta/recipes-devtools/automake/{automake_1.13.4.bb => automake_1.14.bb} (75%)

diff --git a/meta/recipes-devtools/automake/automake/path_prog_fixes.patch b/meta/recipes-devtools/automake/automake/path_prog_fixes.patch
deleted file mode 100644
index 9ee0672..0000000
--- a/meta/recipes-devtools/automake/automake/path_prog_fixes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
----
- Makefile.am |    3 ++-
- Makefile.in |    3 ++-
- aclocal.in  |    4 ++--
- automake.in |    6 ++++--
- 4 files changed, 10 insertions(+), 6 deletions(-)
-
-Index: automake-1.12.1/aclocal.in
-===================================================================
---- automake-1.12.1.orig/aclocal.in
-+++ automake-1.12.1/aclocal.in
-@@ -1,8 +1,8 @@
--#!@PERL@ -w
-+#!@bindir@/env perl
- # -*- perl -*-
- # @configure_input@
- 
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac'
-     if 0;
- 
- # aclocal - create aclocal.m4 by scanning configure.ac
-Index: automake-1.12.1/automake.in
-===================================================================
---- automake-1.12.1.orig/automake.in
-+++ automake-1.12.1/automake.in
-@@ -1,8 +1,10 @@
--#!@PERL@ -w
-+#!@bindir@/env perl
- # -*- perl -*-
- # @configure_input@
- 
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+use warnings;
-+
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac'
-     if 0;
- 
- # automake - create Makefile.in from Makefile.am
diff --git a/meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch b/meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch
deleted file mode 100644
index 6ffff83..0000000
--- a/meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-When the user has a UID or GID that is larger than the ustar format
-supports, pax does not error out gracefully in some cases (FC13).  In
-this case cpio does.
-
-See for more details: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8343
-
-Additionally drop tar.m4 out of that part of the Makefile or we end up in
-a fatal attempt to regen loop:
-
-CDPATH="${ZSH_VERSION+.}:" && cd . && perllibdir="automake-1.11.1/lib:./lib" "automake-1.11.1/aclocal" --acdir=m4 -I m4
-/bin/sh: automake-1.11.1/aclocal: No such file or directory
-make: *** [aclocal.m4] Error 127
-
-Upstream-Status: Pending
-
-Signed-off-by: Tom Rini <tom_rini@mentor.com>
-
-Updated for version 1.11.3:
-Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
-Date: 2011/03/14
-
-Updated for version 1.13.2:
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-
-diff -Nurd automake-1.13.2/Makefile.in automake-1.13.2/Makefile.in
---- automake-1.13.2/Makefile.in	2013-05-15 23:12:58.000000000 +0300
-+++ automake-1.13.2/Makefile.in	2013-05-23 02:13:41.364026301 +0300
-@@ -141,7 +141,7 @@
- 	$(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
- 	$(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/silent.m4 \
- 	$(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/substnot.m4 \
--	$(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac
-+	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-diff -Nurd automake-1.13.2/m4/tar.m4 automake-1.13.2/m4/tar.m4
---- automake-1.13.2/m4/tar.m4	2013-05-13 23:12:48.000000000 +0300
-+++ automake-1.13.2/m4/tar.m4	2013-05-23 02:13:26.600025805 +0300
-@@ -26,7 +26,7 @@
- AC_SUBST([AMTAR], ['$${TAR-tar}'])
-
- # We'll loop over all known methods to create a tar archive until one works.
--_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) cpio pax none'
-
- m4_if([$1], [v7],
-   [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
\ No newline at end of file
diff --git a/meta/recipes-devtools/automake/automake_1.13.4.bb b/meta/recipes-devtools/automake/automake_1.14.bb
similarity index 75%
rename from meta/recipes-devtools/automake/automake_1.13.4.bb
rename to meta/recipes-devtools/automake/automake_1.14.bb
index b114d99..ac83de1 100644
--- a/meta/recipes-devtools/automake/automake_1.13.4.bb
+++ b/meta/recipes-devtools/automake/automake_1.14.bb
@@ -1,6 +1,6 @@
 require automake.inc
 LICENSE="GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 DEPENDS_class-native = "autoconf-native"
 
 NAMEVER = "${@oe.utils.trim_version("${PV}", 2)}"
@@ -18,18 +18,12 @@ RDEPENDS_${PN} += "\
 
 RDEPENDS_${PN}_class-native = "autoconf-native perl-native-runtime"
 
-PATHFIXPATCH = "file://path_prog_fixes.patch"
-PATHFIXPATCH_class-native = ""
-PATHFIXPATCH_class-nativesdk = ""
-
-SRC_URI += "${PATHFIXPATCH} \
-	    file://prefer-cpio-over-pax-for-ustar-archives.patch \
-	    file://python-libdir.patch \
+SRC_URI += " file://python-libdir.patch \
             file://py-compile-compile-only-optimized-byte-code.patch \
             file://buildtest.patch"
 
-SRC_URI[md5sum] = "9199e266993a5bbdc914923349d51e3e"
-SRC_URI[sha256sum] = "4c93abc0bff54b296f41f92dd3aa1e73e554265a6f719df465574983ef6f878c"
+SRC_URI[md5sum] = "a3c0d9298c6112f5f2c26c639ccaaed7"
+SRC_URI[sha256sum] = "7847424d4204d1627c129e9c15b81e145836afa2a1bf9003ffe10aa26ea75755"
 
 do_install_append () {
     install -d ${D}${datadir}
-- 
1.8.3.1

[PATCH 2/6] autoconf: remove path_prog_fixes.patch

[Robert Yang]

The path_prog_fixes.patch was used for fixing the perl path, but the
do_install_append() can do it, so remove this patch.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../autoconf/autoconf/path_prog_fixes.patch        | 128 ---------------------
 meta/recipes-devtools/autoconf/autoconf_2.69.bb    |   1 -
 2 files changed, 129 deletions(-)
 delete mode 100644 meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch

diff --git a/meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch b/meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch
deleted file mode 100644
index cb57dfd..0000000
--- a/meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Index: autoconf-2.59/bin/autoheader.in
-===================================================================
---- autoconf-2.59.orig/bin/autoheader.in	2005-03-09 16:27:17.933878952 -0500
-+++ autoconf-2.59/bin/autoheader.in	2005-03-09 16:29:57.360642400 -0500
-@@ -1,8 +1,8 @@
--#! @PERL@
-+#! @bindir@/env perl
- # -*- Perl -*-
- # @configure_input@
- 
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac'
-     if 0;
- 
- # autoheader -- create `config.h.in' from `configure.ac'
-Index: autoconf-2.59/bin/autom4te.in
-===================================================================
---- autoconf-2.59.orig/bin/autom4te.in	2003-10-28 03:48:36.000000000 -0500
-+++ autoconf-2.59/bin/autom4te.in	2005-03-09 16:30:14.957967200 -0500
-@@ -1,8 +1,10 @@
--#! @PERL@ -w
-+#! @bindir@/env perl
- # -*- perl -*-
- # @configure_input@
- 
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+use warnings;
-+
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-     if 0;
- 
- # autom4te - Wrapper around M4 libraries.
-@@ -87,7 +89,7 @@
- my $freeze = 0;
- 
- # $M4.
--my $m4 = $ENV{"M4"} || '@M4@';
-+my $m4 = $ENV{"M4"} || '@bindir@/env m4';
- # Some non-GNU m4's don't reject the --help option, so give them /dev/null.
- fatal "need GNU m4 1.4 or later: $m4"
-   if system "$m4 --help </dev/null 2>&1 | grep reload-state >/dev/null";
-Index: autoconf-2.59/bin/autoreconf.in
-===================================================================
---- autoconf-2.59.orig/bin/autoreconf.in	2005-03-09 16:27:17.354966960 -0500
-+++ autoconf-2.59/bin/autoreconf.in	2005-03-09 16:31:19.572144352 -0500
-@@ -1,8 +1,10 @@
--#! @PERL@ -w
-+#! @bindir@/env perl
- # -*- perl -*-
- # @configure_input@
- 
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+use warnings;
-+
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-     if 0;
- 
- # autoreconf - install the GNU Build System in a directory tree
-Index: autoconf-2.59/bin/autoscan.in
-===================================================================
---- autoconf-2.59.orig/bin/autoscan.in	2003-09-26 08:57:49.000000000 -0400
-+++ autoconf-2.59/bin/autoscan.in	2005-03-09 16:30:18.136483992 -0500
-@@ -1,4 +1,4 @@
--#! @PERL@ -w
-+#! @bindir@/env perl
- # -*- perl -*-
- # autoscan - Create configure.scan (a preliminary configure.ac) for a package.
- # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003
-@@ -21,7 +21,9 @@
- 
- # Written by David MacKenzie <djm@gnu.ai.mit.edu>.
- 
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+use warnings;
-+
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-     if 0;
- 
- BEGIN
-Index: autoconf-2.59/bin/autoupdate.in
-===================================================================
---- autoconf-2.59.orig/bin/autoupdate.in	2003-08-27 07:26:32.000000000 -0400
-+++ autoconf-2.59/bin/autoupdate.in	2005-03-09 16:30:19.912214040 -0500
-@@ -1,4 +1,4 @@
--#! @PERL@ -w
-+#! @bindir@/env perl
- # -*- perl -*-
- # autoupdate - modernize an Autoconf file.
- # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003
-@@ -22,7 +22,9 @@
- # Originally written by David MacKenzie <djm@gnu.ai.mit.edu>.
- # Rewritten by Akim Demaille <akim@freefriends.org>.
- 
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+use warnings;
-+
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-     if 0;
- 
- BEGIN
-@@ -54,7 +56,7 @@
- my @include = ('@datadir@');
- my $force = 0;
- # m4.
--my $m4 = $ENV{"M4"} || '@M4@';
-+my $m4 = $ENV{"M4"} || '@bindir@/env m4';
- 
- 
- # $HELP
-Index: autoconf-2.59/bin/ifnames.in
-===================================================================
---- autoconf-2.59.orig/bin/ifnames.in	2003-10-10 09:52:56.000000000 -0400
-+++ autoconf-2.59/bin/ifnames.in	2005-03-09 16:30:22.656796800 -0500
-@@ -1,8 +1,10 @@
--#! @PERL@ -w
-+#! @bindir@/env perl
- # -*- perl -*-
- # @configure_input@
- 
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+use warnings;
-+
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-     if 0;
- 
- # ifnames - print the identifiers used in C preprocessor conditionals
diff --git a/meta/recipes-devtools/autoconf/autoconf_2.69.bb b/meta/recipes-devtools/autoconf/autoconf_2.69.bb
index 1522729..b67155b 100644
--- a/meta/recipes-devtools/autoconf/autoconf_2.69.bb
+++ b/meta/recipes-devtools/autoconf/autoconf_2.69.bb
@@ -13,7 +13,6 @@ SRC_URI += "file://autoreconf-include.patch \
 	    file://autoreconf-foreign.patch \
 	    file://autoreconf-gnuconfigize.patch \
 	    file://autoheader-nonfatal-warnings.patch \
-	    ${@['file://path_prog_fixes.patch', ''][bb.data.inherits_class('native', d) or bb.data.inherits_class('nativesdk', d)]} \
             file://config_site.patch \
             file://remove-usr-local-lib-from-m4.patch \
             file://preferbash.patch \
-- 
1.8.3.1

[PATCH 3/6] autogen-native: upgrade to 5.18.2

[Robert Yang]

* Upgrade from 5.17.4 to 5.18.2
* Rename files -> autogen

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 ...n-native_5.17.4.bb => autogen-native_5.18.2.bb} |  6 +--
 .../autogen/{files => autogen}/guile.patch         | 48 +++++++++++++---------
 .../increase-timeout-limit.patch                   |  0
 3 files changed, 31 insertions(+), 23 deletions(-)
 rename meta/recipes-devtools/autogen/{autogen-native_5.17.4.bb => autogen-native_5.18.2.bb} (88%)
 rename meta/recipes-devtools/autogen/{files => autogen}/guile.patch (89%)
 rename meta/recipes-devtools/autogen/{files => autogen}/increase-timeout-limit.patch (100%)

diff --git a/meta/recipes-devtools/autogen/autogen-native_5.17.4.bb b/meta/recipes-devtools/autogen/autogen-native_5.18.2.bb
similarity index 88%
rename from meta/recipes-devtools/autogen/autogen-native_5.17.4.bb
rename to meta/recipes-devtools/autogen/autogen-native_5.18.2.bb
index 28d82b0..c7950c3 100644
--- a/meta/recipes-devtools/autogen/autogen-native_5.17.4.bb
+++ b/meta/recipes-devtools/autogen/autogen-native_5.18.2.bb
@@ -6,14 +6,14 @@ DESCRIPTION = "AutoGen is a tool designed to simplify the creation and\
 HOMEPAGE = "http://www.gnu.org/software/autogen/"
 SECTION = "devel"
 LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \
            file://guile.patch \
            file://increase-timeout-limit.patch"
 
-SRC_URI[md5sum] = "09f074cba57610bf4ef1147e01c8ae90"
-SRC_URI[sha256sum] = "cd2585f4794d0e9d7f2cb0b9af4f2bd429946e718473edf1cf8c49f081ca71ed"
+SRC_URI[md5sum] = "117c4bc5613c57e1b97d760a5d1910a4"
+SRC_URI[sha256sum] = "cc2702dec21ba5b01144865163f6d1a54268d2b72aafc5520ad0e0cb57104068"
 
 DEPENDS = "guile-native libtool-native libxml2-native"
 
diff --git a/meta/recipes-devtools/autogen/files/guile.patch b/meta/recipes-devtools/autogen/autogen/guile.patch
similarity index 89%
rename from meta/recipes-devtools/autogen/files/guile.patch
rename to meta/recipes-devtools/autogen/autogen/guile.patch
index 8a77dba..332e5aa 100644
--- a/meta/recipes-devtools/autogen/files/guile.patch
+++ b/meta/recipes-devtools/autogen/autogen/guile.patch
@@ -1,14 +1,24 @@
-Disable the autoconf macros that use dpkg (!) and guile-config to determine what 
-version and where guile is installed, and just use pkg-config directly (guile-config is a deprecated wrapper around pkg-config). 
- 
- Signed-off-by: Ross Burton <ross.burton@intel.com> 
- Upstream-Status: Pending (should be submitted)
+remove dpkg and guile-config
+
+Disable the autoconf macros that use dpkg (!) and guile-config to
+determine what version and where guile is installed, and just use
+pkg-config directly (guile-config is a deprecated wrapper around
+pkg-config).
+
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+Uprade to  5.18.2
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+Upstream-Status: Pending [should be submitted]
+---
+ config/ag_macros.m4 | 151 +++-------------------------------------------------
+ 1 file changed, 8 insertions(+), 143 deletions(-)
 
 diff --git a/config/ag_macros.m4 b/config/ag_macros.m4
-index 9914a65..b6db97a 100644
+index c05073e..a8e96da 100644
 --- a/config/ag_macros.m4
 +++ b/config/ag_macros.m4
-@@ -175,123 +175,12 @@ return 0;],
+@@ -180,118 +180,13 @@ return 0;],
  
  
  AC_DEFUN([AG_WITHLIB_GUILE],[
@@ -26,7 +36,12 @@ index 9914a65..b6db97a 100644
 -    ag_cv_with_libguile_cflags=no
 -    ag_cv_with_libguile_libs=no
 -  else
--
++  PKG_PROG_PKG_CONFIG
++  PKG_CHECK_MODULES(LIBGUILE, [guile-2.0])
++  case "${LIBGUILE_LIBS}" in *-L* )
++    LIBGUILE_PATH=`echo ,${LIBGUILE_LIBS} |           sed 's/.*[, ]-L[   ]*//;s/[  ].*//'`
++  ;; * ) LIBGUILE_PATH='' ;; esac
+ 
 -  AC_ARG_WITH([libguile-cflags],
 -    AS_HELP_STRING([--with-libguile-cflags], [libguile compile flags]),
 -    [ag_cv_with_libguile_cflags=${with_libguile_cflags}],
@@ -109,14 +124,10 @@ index 9914a65..b6db97a 100644
 -  AC_MSG_RESULT([${ag_cv_with_libguile}])
 -    AC_SUBST([LIBGUILE_CFLAGS])
 -    AC_SUBST([LIBGUILE_LIBS])
--    AC_SUBST([LIBGUILE_PATH])
 -  if test "X${ag_cv_with_libguile}" != Xno
 -  then[
 -      LIBGUILE_CFLAGS="${ag_cv_with_libguile_cflags}"
--      LIBGUILE_LIBS="${ag_cv_with_libguile_libs}"
--      case "${LIBGUILE_LIBS}" in *-L* )
--        LIBGUILE_PATH=`echo ,${LIBGUILE_LIBS} |           sed 's/.*[, ]-L[ 	]*//;s/[ 	].*//'`
--      ;; * ) LIBGUILE_PATH='' ;; esac]
+-      LIBGUILE_LIBS="${ag_cv_with_libguile_libs}"]
 -          CPPFLAGS="@S|@{ag_save_CPPFLAGS}"
 -      LIBS="@S|@{ag_save_LIBS}"
 -  else
@@ -124,20 +135,14 @@ index 9914a65..b6db97a 100644
 -    LIBS="${ag_save_LIBS}"
 -      LIBGUILE_CFLAGS=''
 -      LIBGUILE_LIBS=''
--      LIBGUILE_PATH=''
 -      AC_MSG_ERROR([Cannot find libguile.  libguile is required.  Perhaps you need to install guile-devel?])
 -  fi
-+  PKG_PROG_PKG_CONFIG
-+  PKG_CHECK_MODULES(LIBGUILE, [guile-2.0])
-+  case "${LIBGUILE_LIBS}" in *-L* )
-+    LIBGUILE_PATH=`echo ,${LIBGUILE_LIBS} |           sed 's/.*[, ]-L[   ]*//;s/[  ].*//'`
-+  ;; * ) LIBGUILE_PATH='' ;; esac
    AC_SUBST([AG_GUILE])
 -
  ]) # end of AC_DEFUN of AG_WITHLIB_GUILE
  
  
-@@ -311,40 +200,10 @@ AC_DEFUN([AG_WITHCONF_GUILE_VER],[
+@@ -311,40 +206,10 @@ AC_DEFUN([AG_WITHCONF_GUILE_VER],[
  
  
  AC_DEFUN([AG_TEST_GUILE_VERSION],[
@@ -181,3 +186,6 @@ index 9914a65..b6db97a 100644
    AC_MSG_RESULT([${ag_cv_test_guile_version}])
    if test "X${ag_cv_test_guile_version}" != Xno
    then
+-- 
+1.8.3.1
+
diff --git a/meta/recipes-devtools/autogen/files/increase-timeout-limit.patch b/meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch
similarity index 100%
rename from meta/recipes-devtools/autogen/files/increase-timeout-limit.patch
rename to meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch
-- 
1.8.3.1

[PATCH 4/6] make: remove the obsolete SCCS.patch

[Robert Yang]

This patch is used for removing SCCS/*s.conftest, but there is no SCCS
directory from 3.81, so remove it.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/make/files/SCCS.patch | 17 -----------------
 meta/recipes-devtools/make/make.inc         |  3 +--
 2 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 meta/recipes-devtools/make/files/SCCS.patch

diff --git a/meta/recipes-devtools/make/files/SCCS.patch b/meta/recipes-devtools/make/files/SCCS.patch
deleted file mode 100644
index c7ec3bd..0000000
--- a/meta/recipes-devtools/make/files/SCCS.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Pending
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- make-3.80/configure.in~SCCS
-+++ make-3.80/configure.in
-@@ -264,7 +264,7 @@
-            [Define this if the SCCS 'get' command understands the '-G<file>' option.]);;
-   esac
- fi
--rm -f s.conftest conftoast
-+rm -f s.conftest conftoast SCCS/*s.conftest
- 
- # Check the system to see if it provides GNU glob.  If not, use our
- # local version.
diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc
index 5de74e4..2e90eca 100644
--- a/meta/recipes-devtools/make/make.inc
+++ b/meta/recipes-devtools/make/make.inc
@@ -5,7 +5,6 @@ called the makefile, which lists each of the non-source files and how to compute
 HOMEPAGE = "http://www.gnu.org/software/make/"
 SECTION = "devel"
 
-SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \
-           file://SCCS.patch"
+SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2"
 
 inherit autotools gettext
-- 
1.8.3.1

[PATCH 5/6] make: upgrade to 4.0

[Robert Yang]

Upgrade to 4.0, remove the following patches since they have been fixed
by the upgrade:
 - expand_MAKEFLAGS.patch
 - intermediate-target-bugfix.patch
 - make-savannah-bug30612-fix_white_space.patch
 - make-savannah-bug30612-handling_of_archives.patch

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../make/make-3.82/expand_MAKEFLAGS.patch          |  39 -----
 .../make-3.82/intermediate-target-bugfix.patch     |  23 ---
 .../make-savannah-bug30612-fix_white_space.patch   |  58 -------
 ...ke-savannah-bug30612-handling_of_archives.patch | 188 ---------------------
 .../make/{make_3.82.bb => make_4.0.bb}             |  10 +-
 5 files changed, 2 insertions(+), 316 deletions(-)
 delete mode 100644 meta/recipes-devtools/make/make-3.82/expand_MAKEFLAGS.patch
 delete mode 100644 meta/recipes-devtools/make/make-3.82/intermediate-target-bugfix.patch
 delete mode 100644 meta/recipes-devtools/make/make-3.82/make-savannah-bug30612-fix_white_space.patch
 delete mode 100644 meta/recipes-devtools/make/make-3.82/make-savannah-bug30612-handling_of_archives.patch
 rename meta/recipes-devtools/make/{make_3.82.bb => make_4.0.bb} (44%)

diff --git a/meta/recipes-devtools/make/make-3.82/expand_MAKEFLAGS.patch b/meta/recipes-devtools/make/make-3.82/expand_MAKEFLAGS.patch
deleted file mode 100644
index 941365f..0000000
--- a/meta/recipes-devtools/make/make-3.82/expand_MAKEFLAGS.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Upstream-Status: Backport [The fix is already in upstream cvs repo, but not in the stable release]
-
-When working on the self-hosted-image work, I found in the target
-"bitbake eglibc-initial -c install" always failed:
-
-make[1]: Entering directory `/raid/pe2/build/tmp/work/i586-poky-linux/eglibc-initial-2.13-r18+svnr14157/eglibc-2_13/libc'
-/usr/bin/install -c -m 644 include/limits.h /usr/include/limits.h
-/usr/bin/install: cannot remove `/usr/include/limits.h': Permission denied
-make[1]: *** [/usr/include/limits.h] Error 1
-make[1]: Leaving directory `/raid/pe2/build/tmp/work/i586-poky-linux/eglibc-initial-2.13-r18+svnr14157/eglibc-2_13/libc'
-make: *** [install-headers] Error 2
-ERROR: oe_runmake faile
-
-Debugging shows the install_root variable in eglibc's makefiles is strangely
-reset at some place.
-
-Further investigation shows this is a bug of make-3.82:
-
-http://savannah.gnu.org/bugs/?30723
-http://cvs.savannah.gnu.org/viewvc/make/main.c?root=make&r1=1.243&r2=1.244
-http://old.nabble.com/-bug--30723--implicit-re-executing-of-subdirs-breaks-$(origin)-with-make-3.82-td29394353.html
-
-The patch was got from the second link above(the upstream cvs repo of make).
-
-Thu Dec  1 16:05:59 CST 2011
-Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
-
-diff -Nru make-3.82.orig//main.c make-3.82/main.c
---- make-3.82.orig//main.c	2010-07-19 15:10:53.000000000 +0800
-+++ make-3.82/main.c	2011-12-01 16:04:11.818522186 +0800
-@@ -2093,7 +2093,7 @@
-             const char *pv = define_makeflags (1, 1);
-             char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
-             sprintf (p, "MAKEFLAGS=%s", pv);
--            putenv (p);
-+            putenv (allocated_variable_expand (p));
-           }
- 
- 	  if (ISDB (DB_BASIC))
diff --git a/meta/recipes-devtools/make/make-3.82/intermediate-target-bugfix.patch b/meta/recipes-devtools/make/make-3.82/intermediate-target-bugfix.patch
deleted file mode 100644
index b416e64..0000000
--- a/meta/recipes-devtools/make/make-3.82/intermediate-target-bugfix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Upstream-Status: Backport [The fix is already in upstream git repo, but not in the stable release]
-
-From fbe5b2c9cd612b962836b9391fa2b58c8baed6fc Mon Sep 17 00:00:00 2001
-From: Paul Smith <psmith@gnu.org>
-Date: Mon, 10 Sep 2012 02:36:05 +0000
-Subject: Force intermediate targets to be considered if their non-intermediate
-
-parent needs to be remade.  Fixes Savannah bug #30653.
----
-diff --git a/remake.c b/remake.c
-index c0bf709..b1ddd23 100644
---- a/remake.c
-+++ b/remake.c
-@@ -612,6 +612,10 @@ update_file_1 (struct file *file, unsigned int depth)
-                 d->file->dontcare = file->dontcare;
-               }
- 
-+            /* We may have already considered this file, when we didn't know
-+               we'd need to update it.  Force update_file() to consider it and
-+               not prune it.  */
-+            d->file->considered = !considered;
- 
- 	    dep_status |= update_file (d->file, depth);
diff --git a/meta/recipes-devtools/make/make-3.82/make-savannah-bug30612-fix_white_space.patch b/meta/recipes-devtools/make/make-3.82/make-savannah-bug30612-fix_white_space.patch
deleted file mode 100644
index 0ef501f..0000000
--- a/meta/recipes-devtools/make/make-3.82/make-savannah-bug30612-fix_white_space.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Fix another error related to whitespace handling in archives.
-
-2011-06-12  Paul Smith  <psmith@gnu.org>
-
-* read.c (parse_file_seq): Move the check for empty members out of
-the loop so we can go to the next member properly.
-Another fix for Savannah bug #30612.
-
-Upstream-Status: Backport
-
----
- read.c                          | 10 +++++-----
- tests/scripts/features/archives |  5 +++++
- 5 files changed, 30 insertions(+), 5 deletions(-)
-
-diff --git a/read.c b/read.c
-index c87d4a7..b012094 100644
---- a/read.c
-+++ b/read.c
-@@ -3044,16 +3044,16 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar,
-                       nlen -= (n + 1) - tp;
-                       tp = n + 1;
- 
--                      /* If we have just "lib(", part of something like
--                         "lib( a b)", go to the next item.  */
--                      if (! nlen)
--                        continue;
--
-                       /* We can stop looking now.  */
-                       break;
-                     }
-                 }
-               while (*e != '\0');
-+
-+              /* If we have just "lib(", part of something like "lib( a b)",
-+                 go to the next item.  */
-+              if (! nlen)
-+                continue;
-             }
-         }
- 
-diff --git a/tests/scripts/features/archives b/tests/scripts/features/archives
-index 00aa1af..3fe46a0 100644
---- a/tests/scripts/features/archives
-+++ b/tests/scripts/features/archives
-@@ -36,6 +36,11 @@ utouch(-50, 'a2.o');
- run_make_test('all: libxx.a(a3.o *.o)', '',
-               "ar rv libxx.a a3.o\na - a3.o\nar rv libxx.a a2.o\nr - a2.o\n");
- 
-+# Check whitespace handling
-+utouch(-40, 'a2.o');
-+run_make_test('all: libxx.a(  a3.o    *.o     )', '',
-+              "ar rv libxx.a a2.o\nr - a2.o\n");
-+
- rmfiles(qw(a1.o a2.o a3.o libxx.a));
- 
- # This tells the test driver that the perl test script executed properly.
-
diff --git a/meta/recipes-devtools/make/make-3.82/make-savannah-bug30612-handling_of_archives.patch b/meta/recipes-devtools/make/make-3.82/make-savannah-bug30612-handling_of_archives.patch
deleted file mode 100644
index 2502ac7..0000000
--- a/meta/recipes-devtools/make/make-3.82/make-savannah-bug30612-handling_of_archives.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-Upstream-Status: Backport
-
-2010-08-13  Paul Smith  <psmith@gnu.org>
-
-* NEWS: Accidentally forgot to back out the sorted wildcard
-enhancement in 3.82, so update NEWS.
-Also add NEWS about the error check for explicit and pattern
-targets in the same rule, added to 3.82.
-
-* main.c (main): Add "oneshell" to $(.FEATURES) (forgot to add
-this in 3.82!)
-
-* read.c (parse_file_seq): Fix various errors parsing archives
-with multiple objects in the parenthesis, as well as wildcards.
-Fixes Savannah bug #30612.
-
-
-Index: NEWS
-===================================================================
---- NEWS.orig	2010-07-28 05:39:50.000000000 +0000
-+++ NEWS	2012-11-14 11:07:26.427456125 +0000
-@@ -18,14 +18,6 @@
- * Compiling GNU make now requires a conforming ISO C 1989 compiler and
-   standard runtime library.
- 
--* WARNING: Future backward-incompatibility!
--  Wildcards are not documented as returning sorted values, but up to and
--  including this release the results have been sorted and some makefiles are
--  apparently depending on that.  In the next release of GNU make, for
--  performance reasons, we may remove that sorting.  If your makefiles
--  require sorted results from wildcard expansions, use the $(sort ...)
--  function to request it explicitly.
--
- * WARNING: Backward-incompatibility!
-   The POSIX standard for make was changed in the 2008 version in a
-   fundamentally incompatible way: make is required to invoke the shell as if
-@@ -42,6 +34,21 @@
-   existing targets were provided in $?).
- 
- * WARNING: Backward-incompatibility!
-+  Wildcards were not documented as returning sorted values, but the results
-+  have been sorted up until this release..  If your makefiles require sorted
-+  results from wildcard expansions, use the $(sort ...)  function to request
-+  it explicitly.
-+
-+* WARNING: Backward-incompatibility!
-+  In previous versions of make it was acceptable to list one or more explicit
-+  targets followed by one or more pattern targets in the same rule and it
-+  worked "as expected".  However, this was not documented as acceptable and if
-+  you listed any explicit targets AFTER the pattern targets, the entire rule
-+  would be mis-parsed.  This release removes this ability completely: make
-+  will generate an error message if you mix explicit and pattern targets in
-+  the same rule.
-+
-+* WARNING: Backward-incompatibility!
-   As a result of parser enhancements, three backward-compatibility issues
-   exist: first, a prerequisite containing an "=" cannot be escaped with a
-   backslash any longer.  You must create a variable containing an "=" and
-Index: main.c
-===================================================================
---- main.c.orig	2012-11-14 11:07:25.000000000 +0000
-+++ main.c	2012-11-14 11:07:26.427456125 +0000
-@@ -1138,7 +1138,7 @@
-      a macro and some compilers (MSVC) don't like conditionals in macros.  */
-   {
-     const char *features = "target-specific order-only second-expansion"
--                           " else-if shortest-stem undefine"
-+                           " else-if shortest-stem undefine oneshell"
- #ifndef NO_ARCHIVES
-                            " archives"
- #endif
-Index: read.c
-===================================================================
---- read.c.orig	2010-07-13 01:20:42.000000000 +0000
-+++ read.c	2012-11-14 11:07:26.431456125 +0000
-@@ -3028,7 +3028,7 @@
-             {
-               /* This looks like the first element in an open archive group.
-                  A valid group MUST have ')' as the last character.  */
--              const char *e = p + nlen;
-+              const char *e = p;
-               do
-                 {
-                   e = next_token (e);
-@@ -3084,19 +3084,19 @@
-          Go to the next item in the string.  */
-       if (flags & PARSEFS_NOGLOB)
-         {
--          NEWELT (concat (2, prefix, tp));
-+          NEWELT (concat (2, prefix, tmpbuf));
-           continue;
-         }
- 
-       /* If we get here we know we're doing glob expansion.
-          TP is a string in tmpbuf.  NLEN is no longer used.
-          We may need to do more work: after this NAME will be set.  */
--      name = tp;
-+      name = tmpbuf;
- 
-       /* Expand tilde if applicable.  */
--      if (tp[0] == '~')
-+      if (tmpbuf[0] == '~')
- 	{
--	  tildep = tilde_expand (tp);
-+	  tildep = tilde_expand (tmpbuf);
- 	  if (tildep != 0)
-             name = tildep;
- 	}
-@@ -3152,7 +3152,10 @@
-             else
-               {
-                 /* We got a chain of items.  Attach them.  */
--                (*newp)->next = found;
-+                if (*newp)
-+                  (*newp)->next = found;
-+                else
-+                  *newp = found;
- 
-                 /* Find and set the new end.  Massage names if necessary.  */
-                 while (1)
-Index: tests/run_make_tests.pl
-===================================================================
---- tests/run_make_tests.pl.orig	2010-07-13 01:20:43.000000000 +0000
-+++ tests/run_make_tests.pl	2012-11-14 11:07:26.431456125 +0000
-@@ -29,6 +29,7 @@
- # You should have received a copy of the GNU General Public License along with
- # this program.  If not, see <http://www.gnu.org/licenses/>.
- 
-+%FEATURES = ();
- 
- $valgrind = 0;              # invoke make with valgrind
- $valgrind_args = '';
-@@ -367,6 +368,8 @@
-      $parallel_jobs = 1;
-    }
- 
-+   %FEATURES = map { $_ => 1 } split /\s+/, `sh -c "echo '\\\$(info \\\$(.FEATURES))' | $make_path -f- 2>/dev/null"`;
-+
-    # Set up for valgrind, if requested.
- 
-    if ($valgrind) {
-Index: tests/scripts/features/archives
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ tests/scripts/features/archives	2012-11-14 11:07:26.431456125 +0000
-@@ -0,0 +1,42 @@
-+#                                                              -*-mode: perl-*-
-+
-+$description = "Test GNU make's archive management features.";
-+
-+$details = "\
-+This only works on systems that support it.";
-+
-+# If this instance of make doesn't support archives, skip it
-+exists $FEATURES{archives} or return -1;
-+
-+# Create some .o files to work with
-+utouch(-60, qw(a1.o a2.o a3.o));
-+
-+# Very simple
-+run_make_test('all: libxx.a(a1.o)',
-+              '', "ar rv libxx.a a1.o\nar: creating libxx.a\na - a1.o\n");
-+
-+# Multiple .o's.  Add a new one to the existing library
-+run_make_test('all: libxx.a(a1.o a2.o)',
-+              '', "ar rv libxx.a a2.o\na - a2.o\n");
-+
-+# Touch one of the .o's so it's rebuilt
-+utouch(-40, 'a1.o');
-+run_make_test(undef, '', "ar rv libxx.a a1.o\nr - a1.o\n");
-+
-+# Use wildcards
-+run_make_test('all: libxx.a(*.o)',
-+              '', "#MAKE#: Nothing to be done for `all'.\n");
-+
-+# Touch one of the .o's so it's rebuilt
-+utouch(-30, 'a1.o');
-+run_make_test(undef, '', "ar rv libxx.a a1.o\nr - a1.o\n");
-+
-+# Use both wildcards and simple names
-+utouch(-50, 'a2.o');
-+run_make_test('all: libxx.a(a3.o *.o)', '',
-+              "ar rv libxx.a a3.o\na - a3.o\nar rv libxx.a a2.o\nr - a2.o\n");
-+
-+rmfiles(qw(a1.o a2.o a3.o libxx.a));
-+
-+# This tells the test driver that the perl test script executed properly.
-+1;
diff --git a/meta/recipes-devtools/make/make_3.82.bb b/meta/recipes-devtools/make/make_4.0.bb
similarity index 44%
rename from meta/recipes-devtools/make/make_3.82.bb
rename to meta/recipes-devtools/make/make_4.0.bb
index 6cc467d..bb2a7ed 100644
--- a/meta/recipes-devtools/make/make_3.82.bb
+++ b/meta/recipes-devtools/make/make_4.0.bb
@@ -1,16 +1,10 @@
-PR = "r3"
 LICENSE = "GPLv3 & LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
                     file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
                     file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4"
 require make.inc
 
-SRC_URI += "file://expand_MAKEFLAGS.patch \
-            file://intermediate-target-bugfix.patch \
-            file://make-savannah-bug30612-handling_of_archives.patch;striplevel=0 \
-            file://make-savannah-bug30612-fix_white_space.patch"
-
-SRC_URI[md5sum] = "1a11100f3c63fcf5753818e59d63088f"
-SRC_URI[sha256sum] = "e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966"
+SRC_URI[md5sum] = "571d470a7647b455e3af3f92d79f1c18"
+SRC_URI[sha256sum] = "e60686c7afede62cc8c86ad3012cf081ea4887daf9d223ce7115703b2bb2dbdb"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
1.8.3.1

[PATCH 6/6] git: upgrade to 1.8.5.2

[Robert Yang]

* Upgrade to 1.8.5.2
* Remove the SRC_URI from the git.inc since we use the one in
  git_1.8.5.2.bb

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/git/git.inc                            | 1 -
 meta/recipes-devtools/git/{git_1.8.4.4.bb => git_1.8.5.2.bb} | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/git/{git_1.8.4.4.bb => git_1.8.5.2.bb} (67%)

diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index f33069c..7791a7c 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -5,7 +5,6 @@ DEPENDS = "openssl curl zlib expat"
 
 PROVIDES_append_class-native = " git-replacement-native"
 
-SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.bz2 "
 S = "${WORKDIR}/git-${PV}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1"
diff --git a/meta/recipes-devtools/git/git_1.8.4.4.bb b/meta/recipes-devtools/git/git_1.8.5.2.bb
similarity index 67%
rename from meta/recipes-devtools/git/git_1.8.4.4.bb
rename to meta/recipes-devtools/git/git_1.8.5.2.bb
index cdcd894..4777c46 100644
--- a/meta/recipes-devtools/git/git_1.8.4.4.bb
+++ b/meta/recipes-devtools/git/git_1.8.5.2.bb
@@ -1,8 +1,9 @@
 require git.inc
 
 SRC_URI = "http://git-core.googlecode.com/files/git-${PV}.tar.gz"
-SRC_URI[md5sum] = "c07ea15d5d0c31544de265f567d6e5ef"
-SRC_URI[sha256sum] = "44392f5bfcb17aa943338469ddafd94a9091f8b33eb5d3a2abb60f2bb61d1a73"
+
+SRC_URI[md5sum] = "df8519044f9880f3687d863d99245282"
+SRC_URI[sha256sum] = "024694524b8be91fe29afca65bc3a9e40de1322dd5ef2b2c0babb6849c913e8a"
 
 EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \
                  ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
-- 
1.8.3.1

Re: [PATCH 0/6] upgrade automake/autogen-native/make/git

[Robert Yang]

On 12/30/2013 06:02 PM, Robert Yang wrote:
> I have tested these upgrades on the local autobuilder.
>
> // Robert
>
> The following changes since commit 5c95cc221aa55df7c25e3254d30a7a4b70ff5359:
>
>    maintainers.inc: reassign tzcode-native (2013-12-27 19:35:02 +0800)
>
> are available in the git repository at:
>
>    git://git.pokylinux.org/poky-contrib robert/upgrade
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/upgrade
>
> Robert Yang (6):
>    automake: upgrade to 1.14

The automake has a conflict with Paul's patch, and two of the commits
have been merged, so I rebased them and pushed to git contrib agagin:

   git://git.pokylinux.org/poky-contrib robert/upgrade
   http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/upgrade

Robert Yang (4):
   automake: upgrade to 1.14
   autoconf: remove path_prog_fixes.patch
   autogen-native: upgrade to 5.18.2
   make: upgrade to 4.0

// Robert

>    autoconf: remove path_prog_fixes.patch
>    autogen-native: upgrade to 5.18.2
>    make: remove the obsolete SCCS.patch
>    make: upgrade to 4.0
>    git: upgrade to 1.8.5.2
>
>   .../autoconf/autoconf/path_prog_fixes.patch        | 128 --------------
>   meta/recipes-devtools/autoconf/autoconf_2.69.bb    |   1 -
>   ...n-native_5.17.4.bb => autogen-native_5.18.2.bb} |   6 +-
>   .../autogen/{files => autogen}/guile.patch         |  48 +++---
>   .../increase-timeout-limit.patch                   |   0
>   .../automake/automake/path_prog_fixes.patch        |  41 -----
>   .../prefer-cpio-over-pax-for-ustar-archives.patch  |  48 ------
>   .../{automake_1.13.4.bb => automake_1.14.bb}       |  14 +-
>   meta/recipes-devtools/git/git.inc                  |   1 -
>   .../git/{git_1.8.4.4.bb => git_1.8.5.2.bb}         |   5 +-
>   meta/recipes-devtools/make/files/SCCS.patch        |  17 --
>   .../make/make-3.82/expand_MAKEFLAGS.patch          |  39 -----
>   .../make-3.82/intermediate-target-bugfix.patch     |  23 ---
>   .../make-savannah-bug30612-fix_white_space.patch   |  58 -------
>   ...ke-savannah-bug30612-handling_of_archives.patch | 188 ---------------------
>   meta/recipes-devtools/make/make.inc                |   3 +-
>   .../make/{make_3.82.bb => make_4.0.bb}             |  10 +-
>   17 files changed, 41 insertions(+), 589 deletions(-)
>   delete mode 100644 meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch
>   rename meta/recipes-devtools/autogen/{autogen-native_5.17.4.bb => autogen-native_5.18.2.bb} (88%)
>   rename meta/recipes-devtools/autogen/{files => autogen}/guile.patch (89%)
>   rename meta/recipes-devtools/autogen/{files => autogen}/increase-timeout-limit.patch (100%)
>   delete mode 100644 meta/recipes-devtools/automake/automake/path_prog_fixes.patch
>   delete mode 100644 meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch
>   rename meta/recipes-devtools/automake/{automake_1.13.4.bb => automake_1.14.bb} (75%)
>   rename meta/recipes-devtools/git/{git_1.8.4.4.bb => git_1.8.5.2.bb} (67%)
>   delete mode 100644 meta/recipes-devtools/make/files/SCCS.patch
>   delete mode 100644 meta/recipes-devtools/make/make-3.82/expand_MAKEFLAGS.patch
>   delete mode 100644 meta/recipes-devtools/make/make-3.82/intermediate-target-bugfix.patch
>   delete mode 100644 meta/recipes-devtools/make/make-3.82/make-savannah-bug30612-fix_white_space.patch
>   delete mode 100644 meta/recipes-devtools/make/make-3.82/make-savannah-bug30612-handling_of_archives.patch
>   rename meta/recipes-devtools/make/{make_3.82.bb => make_4.0.bb} (44%)
>

Re: [PATCH 5/6] make: upgrade to 4.0

[Burton, Ross]

On 30 December 2013 10:02, Robert Yang <liezhi.yang@windriver.com> wrote:
> Upgrade to 4.0, remove the following patches since they have been fixed
> by the upgrade:
>  - expand_MAKEFLAGS.patch
>  - intermediate-target-bugfix.patch
>  - make-savannah-bug30612-fix_white_space.patch
>  - make-savannah-bug30612-handling_of_archives.patch

Have you tried a build from scratch using make-native as make instead
of host make?

Not that I'm concerned that in fixing the bugs there's new regressions...

Ross

Re: [PATCH 5/6] make: upgrade to 4.0

[Robert Yang]

On 01/06/2014 09:43 PM, Burton, Ross wrote:
> On 30 December 2013 10:02, Robert Yang <liezhi.yang@windriver.com> wrote:
>> Upgrade to 4.0, remove the following patches since they have been fixed
>> by the upgrade:
>>   - expand_MAKEFLAGS.patch
>>   - intermediate-target-bugfix.patch
>>   - make-savannah-bug30612-fix_white_space.patch
>>   - make-savannah-bug30612-handling_of_archives.patch
>
> Have you tried a build from scratch using make-native as make instead
> of host make?
>

No, I haven't, but sounds reasonable, I will try it.

// Robert

> Not that I'm concerned that in fixing the bugs there's new regressions...
>
> Ross
>
>