Skip to contentSkip to conversation

upgrade automake/autogen-native/make/git

PATCH In review Robert Yang 2 participants 10 messages Dec 30, 2013 – Jan 7, 2014

lore
Share & tools
lore
#0 lore raw

cover upgrade automake/autogen-native/make/git

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%)
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/6 automake: upgrade to 1.14

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.

---
 .../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%)
meta/recipes-devtools/automake/automake/path_prog_fixes.patch deleted +0 -41
deleted file mode 100644
index 9ee0672..0000000
@@ -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
meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch deleted +0 -48

49 lines not on this page · raw message

meta/recipes-devtools/automake/automake_1.14.bb renamed from meta/recipes-devtools/automake/automake_1.13.4.bb +4 -10
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
@@ -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}
Signature · 1 line
1.8.3.1
#2 lore raw

PATCH 2/6 autoconf: remove path_prog_fixes.patch

In reply to 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.

---
 .../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
meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch deleted +0 -128
deleted file mode 100644
index cb57dfd..0000000
@@ -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 <[email protected]>.
- 
--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 <[email protected]>.
- # Rewritten by Akim Demaille <[email protected]>.
- 
--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
meta/recipes-devtools/autoconf/autoconf_2.69.bb +0 -1
index 1522729..b67155b 100644
@@ -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 \
Signature · 1 line
1.8.3.1
#3 lore raw

PATCH 3/6 autogen-native: upgrade to 5.18.2

In reply to Robert Yang

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

---
 ...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%)
meta/recipes-devtools/autogen/autogen-native_5.18.2.bb renamed from meta/recipes-devtools/autogen/autogen-native_5.17.4.bb +3 -3
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
@@ -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"
 
meta/recipes-devtools/autogen/autogen/guile.patch renamed from meta/recipes-devtools/autogen/files/guile.patch +28 -20

86 lines not on this page · raw message

meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch renamed from meta/recipes-devtools/autogen/files/increase-timeout-limit.patch +0 -0
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
Signature · 1 line
1.8.3.1
#4 lore raw

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

In reply to Robert Yang

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

---
 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
meta/recipes-devtools/make/files/SCCS.patch deleted +0 -17
deleted file mode 100644
index c7ec3bd..0000000
@@ -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.
meta/recipes-devtools/make/make.inc +1 -2
index 5de74e4..2e90eca 100644
@@ -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
Signature · 1 line
1.8.3.1
#5 lore raw

PATCH 5/6 make: upgrade to 4.0

In reply to 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

---
 .../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%)
meta/recipes-devtools/make/make-3.82/expand_MAKEFLAGS.patch deleted +0 -39
deleted file mode 100644
index 941365f..0000000
@@ -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 <[email protected]>
-
-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))
meta/recipes-devtools/make/make-3.82/intermediate-target-bugfix.patch deleted +0 -23
deleted file mode 100644
index b416e64..0000000
@@ -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 <[email protected]>
-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);
meta/recipes-devtools/make/make-3.82/make-savannah-bug30612-fix_white_space.patch deleted +0 -58

58 lines not on this page · raw message

meta/recipes-devtools/make/make-3.82/make-savannah-bug30612-handling_of_archives.patch deleted +0 -188

188 lines not on this page · raw message

meta/recipes-devtools/make/make_4.0.bb renamed from meta/recipes-devtools/make/make_3.82.bb +2 -8
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
@@ -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"
Signature · 1 line
1.8.3.1
#6 lore raw

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

Quoted 6 lines · 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

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

#7 lore raw

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

Quoted 11 lines · Ross
Quoted 6 lines · 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

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

Quoted 5 lines

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

Ross

#8 lore raw

PATCH 6/6 git: upgrade to 1.8.5.2

In reply to 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

---
 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%)
meta/recipes-devtools/git/git.inc +0 -1
index f33069c..7791a7c 100644
@@ -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"
meta/recipes-devtools/git/git_1.8.5.2.bb renamed from meta/recipes-devtools/git/git_1.8.4.4.bb +3 -2
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
@@ -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} \
Signature · 1 line
1.8.3.1
#9 lore raw
In reply to Robert Yang
Quoted 8 lines · 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)
Quoted 7 lines

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

Quoted 39 lines

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%)