Patchwork [2/2] automake: update to upstream version 1.13.4

login
register
mail settings
Submitter Marko Lindqvist
Date Aug. 22, 2013, 9:37 p.m.
Message ID <fa107ce2393b834fd74c353526e98e9edcac0a85.1377207091.git.cazfi74@gmail.com>
Download mbox | patch
Permalink /patch/56307/
State New
Headers show

Comments

Marko Lindqvist - Aug. 22, 2013, 9:37 p.m.
prefer-cpio-over-pax-for-ustar-archives.patch updated to apply

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../prefer-cpio-over-pax-for-ustar-archives.patch  |   37 ++++++++++----------
 .../{automake_1.12.6.bb => automake_1.13.4.bb}     |    6 ++--
 2 files changed, 21 insertions(+), 22 deletions(-)
 rename meta/recipes-devtools/automake/{automake_1.12.6.bb => automake_1.13.4.bb} (90%)
Saul Wold - Aug. 23, 2013, 4:19 p.m.
On 08/22/2013 02:37 PM, Marko Lindqvist wrote:
> prefer-cpio-over-pax-for-ustar-archives.patch updated to apply
>
> Signed-off-by: Marko Lindqvist <cazfi74-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
>   .../prefer-cpio-over-pax-for-ustar-archives.patch  |   37 ++++++++++----------
>   .../{automake_1.12.6.bb => automake_1.13.4.bb}     |    6 ++--
>   2 files changed, 21 insertions(+), 22 deletions(-)
>   rename meta/recipes-devtools/automake/{automake_1.12.6.bb => automake_1.13.4.bb} (90%)
>
> 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
> index 4627855..6558a00 100644
> --- 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
> @@ -19,24 +19,13 @@ Updated for version 1.11.3:
>   Signed-off-by: Nitin A Kamble <nitin.a.kamble-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
>   Date: 2011/03/14
>
> -Index: automake-1.11.3/m4/tar.m4
> -===================================================================
> ---- automake-1.11.3.orig/m4/tar.m4	2012-01-31 03:41:18.000000000 -0800
> -+++ automake-1.11.3/m4/tar.m4	2012-03-14 17:36:11.901303777 -0700
> -@@ -31,7 +31,7 @@ m4_if([$1], [v7],
> -               [m4_fatal([Unknown tar format])])
> - AC_MSG_CHECKING([how to create a $1 tar archive])
> - # 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'
> - _am_tools=${am_cv_prog_tar_$1-$_am_tools}
> - # Do not fold the above two line into one, because Tru64 sh and
> - # Solaris sh will not grok spaces in the rhs of `-'.
> -Index: automake-1.11.3/Makefile.in
> -===================================================================
> ---- automake-1.11.3.orig/Makefile.in	2012-02-01 02:37:59.000000000 -0800
> -+++ automake-1.11.3/Makefile.in	2012-03-14 17:38:03.530869197 -0700
> -@@ -62,7 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
> +Updated for version 1.13.2:
> +Signed-off-by: Marko Lindqvist <cazfi74-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> +
> +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 \
> @@ -45,3 +34,15 @@ Index: automake-1.11.3/Makefile.in
>    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 -'],
> diff --git a/meta/recipes-devtools/automake/automake_1.12.6.bb b/meta/recipes-devtools/automake/automake_1.13.4.bb
> similarity index 90%
> rename from meta/recipes-devtools/automake/automake_1.12.6.bb
> rename to meta/recipes-devtools/automake/automake_1.13.4.bb
> index 549051b..e3db834 100644
> --- a/meta/recipes-devtools/automake/automake_1.12.6.bb
> +++ b/meta/recipes-devtools/automake/automake_1.13.4.bb
> @@ -26,10 +26,8 @@ SRC_URI += "${PATHFIXPATCH} \
>               file://py-compile-compile-only-optimized-byte-code.patch \
>               file://buildtest.patch"
>
> -SRC_URI[md5sum] = "199d39ece2e6070d64ac20d45ac86026"
> -SRC_URI[sha256sum] = "0cbe570db487908e70af7119da85ba04f7e28656b26f717df0265ae08defd9ef"
> -
> -PR = "r0"
> +SRC_URI[md5sum] = "9199e266993a5bbdc914923349d51e3e"
> +SRC_URI[sha256sum] = "4c93abc0bff54b296f41f92dd3aa1e73e554265a6f719df465574983ef6f878c"
>
>   do_install_append () {
>       install -d ${D}${datadir}
>
Seems this update might have a perl script that is hard coded and will 
need to be worked on.  This occurs with a toolchain build:
bitbake core-image-sato -c populate_sdk

| Computing transaction...error: Can't install 
nativesdk-automake-1.13.4-r0@x86_64_nativesdk: no package provides /bin/perl
|

Sau!
Marko Lindqvist - Aug. 25, 2013, 7:13 p.m.
On 23 August 2013 19:19, Saul Wold <saul.wold@intel.com> wrote:
>>
> Seems this update might have a perl script that is hard coded and will need
> to be worked on.  This occurs with a toolchain build:
> bitbake core-image-sato -c populate_sdk
>
> | Computing transaction...error: Can't install
> nativesdk-automake-1.13.4-r0@x86_64_nativesdk: no package provides /bin/perl

 I couldn't reproduce, and grepping for "/bin/perl" reveals nothing
that would be new since 1.12.6.

 There's one perl handling related error in the patch - recipe has old
version number hardcoded when adjusting perl paths. It needs to be
fixed in any case, and we can hope that it fixes the issue you are
experiencing. I'll make the version number unhardcoding separate patch
so it can be applied already before the automake update. I'll push
updated series to contrib tree to cazfi/am13 branch for those
interested (probably late tonight or tomorrow), but won't send pull
request before 1.6 development begins.


 - ML

Patch

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
index 4627855..6558a00 100644
--- 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
@@ -19,24 +19,13 @@  Updated for version 1.11.3:
 Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
 Date: 2011/03/14
 
-Index: automake-1.11.3/m4/tar.m4
-===================================================================
---- automake-1.11.3.orig/m4/tar.m4	2012-01-31 03:41:18.000000000 -0800
-+++ automake-1.11.3/m4/tar.m4	2012-03-14 17:36:11.901303777 -0700
-@@ -31,7 +31,7 @@ m4_if([$1], [v7],
-               [m4_fatal([Unknown tar format])])
- AC_MSG_CHECKING([how to create a $1 tar archive])
- # 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'
- _am_tools=${am_cv_prog_tar_$1-$_am_tools}
- # Do not fold the above two line into one, because Tru64 sh and
- # Solaris sh will not grok spaces in the rhs of `-'.
-Index: automake-1.11.3/Makefile.in
-===================================================================
---- automake-1.11.3.orig/Makefile.in	2012-02-01 02:37:59.000000000 -0800
-+++ automake-1.11.3/Makefile.in	2012-03-14 17:38:03.530869197 -0700
-@@ -62,7 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+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 \
@@ -45,3 +34,15 @@  Index: automake-1.11.3/Makefile.in
  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 -'],
diff --git a/meta/recipes-devtools/automake/automake_1.12.6.bb b/meta/recipes-devtools/automake/automake_1.13.4.bb
similarity index 90%
rename from meta/recipes-devtools/automake/automake_1.12.6.bb
rename to meta/recipes-devtools/automake/automake_1.13.4.bb
index 549051b..e3db834 100644
--- a/meta/recipes-devtools/automake/automake_1.12.6.bb
+++ b/meta/recipes-devtools/automake/automake_1.13.4.bb
@@ -26,10 +26,8 @@  SRC_URI += "${PATHFIXPATCH} \
             file://py-compile-compile-only-optimized-byte-code.patch \
             file://buildtest.patch"
 
-SRC_URI[md5sum] = "199d39ece2e6070d64ac20d45ac86026"
-SRC_URI[sha256sum] = "0cbe570db487908e70af7119da85ba04f7e28656b26f717df0265ae08defd9ef"
-
-PR = "r0"
+SRC_URI[md5sum] = "9199e266993a5bbdc914923349d51e3e"
+SRC_URI[sha256sum] = "4c93abc0bff54b296f41f92dd3aa1e73e554265a6f719df465574983ef6f878c"
 
 do_install_append () {
     install -d ${D}${datadir}