Patchwork automake: Fix issue with tar configure failing with large UID/GIDs

login
register
mail settings
Submitter Kumar Gala
Date Aug. 2, 2011, 8:14 a.m.
Message ID <1312272881-15695-1-git-send-email-galak@kernel.crashing.org>
Download mbox | patch
Permalink /patch/9062/
State New, archived
Headers show

Comments

Kumar Gala - Aug. 2, 2011, 8:14 a.m.
Add a fixup for trying to create ustar archives when the users
UID or GID is larger than the format allows.

Based on a patch from Tom Rini

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 meta/recipes-devtools/automake/automake.inc        |    2 +-
 .../prefer-cpio-over-pax-for-ustar-archives.patch  |   26 ++++++++++++++++++++
 meta/recipes-devtools/automake/automake_1.11.1.bb  |    8 +++++-
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch
Richard Purdie - Aug. 2, 2011, 10:09 a.m.
On Tue, 2011-08-02 at 03:14 -0500, Kumar Gala wrote:
> Add a fixup for trying to create ustar archives when the users
> UID or GID is larger than the format allows.
> 
> Based on a patch from Tom Rini
> 
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> ---
>  meta/recipes-devtools/automake/automake.inc        |    2 +-
>  .../prefer-cpio-over-pax-for-ustar-archives.patch  |   26 ++++++++++++++++++++
>  meta/recipes-devtools/automake/automake_1.11.1.bb  |    8 +++++-
>  3 files changed, 34 insertions(+), 2 deletions(-)
>  create mode 100644 meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch
> 
> diff --git a/meta/recipes-devtools/automake/automake.inc b/meta/recipes-devtools/automake/automake.inc
> index beeec7b..96d797f 100644
> --- a/meta/recipes-devtools/automake/automake.inc
> +++ b/meta/recipes-devtools/automake/automake.inc
> @@ -4,7 +4,7 @@ Standards. Automake requires the use of Autoconf."
>  LICENSE = "GPLv2"
>  HOMEPAGE = "http://www.gnu.org/software/automake/"
>  SECTION = "devel"
> -PR = "r2"
> +PR = "r3"
>  
>  SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 "
>  
> 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
> new file mode 100644
> index 0000000..3fda937
> --- /dev/null
> +++ b/meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch


Can we add some documentation into the patch header about why this is
necessary and how it solved the problem please?

> @@ -0,0 +1,26 @@
> +Index: automake-1.11.1/m4/tar.m4
> +===================================================================
> +--- automake-1.11.1.orig/m4/tar.m4
> ++++ automake-1.11.1/m4/tar.m4
> +@@ -30,7 +30,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.1/Makefile.in
> +===================================================================
> +--- automake-1.11.1.orig/Makefile.in
> ++++ automake-1.11.1/Makefile.in
> +@@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
> + 	$(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \
> + 	$(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
> + 	$(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \
> +-	$(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \
> ++	$(top_srcdir)/m4/substnot.m4 \
> + 	$(top_srcdir)/configure.ac
> + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
> + 	$(ACLOCAL_M4)
> diff --git a/meta/recipes-devtools/automake/automake_1.11.1.bb b/meta/recipes-devtools/automake/automake_1.11.1.bb
> index b231a94..764b6fc 100644
> --- a/meta/recipes-devtools/automake/automake_1.11.1.bb
> +++ b/meta/recipes-devtools/automake/automake_1.11.1.bb
> @@ -32,11 +32,17 @@ RDEPENDS_automake-native = "autoconf-native perl-native-runtime"
>  PATHFIXPATCH = "file://path_prog_fixes.patch;patch=1"
>  PATHFIXPATCH_virtclass-native = ""
>  
> -SRC_URI += "${PATHFIXPATCH}"
> +SRC_URI += "${PATHFIXPATCH} \
> +	    file://prefer-cpio-over-pax-for-ustar-archives.patch;patch=1"
>  
>  SRC_URI[md5sum] = "c2972c4d9b3e29c03d5f2af86249876f"
>  SRC_URI[sha256sum] = "5b159d3c0e0a1f87de71b68bcb9f1a1c49e9e71749c9b723f17e2e1e0295c7ae"
>  
> +do_configure () {
> +	touch ${S}/Makefile.in
> +	autotools_do_configure
> +}
> +

and a comment here would be very useful too to explain why this is
necessary?

Cheers,

Richard
Khem Raj - Aug. 2, 2011, 3:09 p.m.
On Aug 2, 2011, at 1:14 AM, Kumar Gala <galak@kernel.crashing.org> wrote:

> Add a fixup for trying to create ustar archives when the users
> UID or GID is larger than the format allows.
> 
> Based on a patch from Tom Rini
> 
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> ---
> meta/recipes-devtools/automake/automake.inc        |    2 +-
> .../prefer-cpio-over-pax-for-ustar-archives.patch  |   26 ++++++++++++++++++++
> meta/recipes-devtools/automake/automake_1.11.1.bb  |    8 +++++-
> 3 files changed, 34 insertions(+), 2 deletions(-)
> create mode 100644 meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch
> 
> diff --git a/meta/recipes-devtools/automake/automake.inc b/meta/recipes-devtools/automake/automake.inc
> index beeec7b..96d797f 100644
> --- a/meta/recipes-devtools/automake/automake.inc
> +++ b/meta/recipes-devtools/automake/automake.inc
> @@ -4,7 +4,7 @@ Standards. Automake requires the use of Autoconf."
> LICENSE = "GPLv2"
> HOMEPAGE = "http://www.gnu.org/software/automake/"
> SECTION = "devel"
> -PR = "r2"
> +PR = "r3"
> 
> SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 "
> 
> 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
> new file mode 100644
> index 0000000..3fda937
> --- /dev/null
> +++ b/meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch
> @@ -0,0 +1,26 @@
> +Index: automake-1.11.1/m4/tar.m4
> +===================================================================
> +--- automake-1.11.1.orig/m4/tar.m4
> ++++ automake-1.11.1/m4/tar.m4
> +@@ -30,7 +30,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.1/Makefile.in
> +===================================================================
> +--- automake-1.11.1.orig/Makefile.in
> ++++ automake-1.11.1/Makefile.in
> +@@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
> +    $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \
> +    $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
> +    $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \
> +-    $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \
> ++    $(top_srcdir)/m4/substnot.m4 \
> +    $(top_srcdir)/configure.ac
> + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
> +    $(ACLOCAL_M4)
> diff --git a/meta/recipes-devtools/automake/automake_1.11.1.bb b/meta/recipes-devtools/automake/automake_1.11.1.bb
> index b231a94..764b6fc 100644
> --- a/meta/recipes-devtools/automake/automake_1.11.1.bb
> +++ b/meta/recipes-devtools/automake/automake_1.11.1.bb
> @@ -32,11 +32,17 @@ RDEPENDS_automake-native = "autoconf-native perl-native-runtime"
> PATHFIXPATCH = "file://path_prog_fixes.patch;patch=1"
> PATHFIXPATCH_virtclass-native = ""
> 
> -SRC_URI += "${PATHFIXPATCH}"
> +SRC_URI += "${PATHFIXPATCH} \
> +        file://prefer-cpio-over-pax-for-ustar-archives.patch;patch=1"

Patch level 1 is default so patch=1 is not needed here
> 
> SRC_URI[md5sum] = "c2972c4d9b3e29c03d5f2af86249876f"
> SRC_URI[sha256sum] = "5b159d3c0e0a1f87de71b68bcb9f1a1c49e9e71749c9b723f17e2e1e0295c7ae"
> 
> +do_configure () {
> +    touch ${S}/Makefile.in
> +    autotools_do_configure
> +}
> +
> do_install () {
>    oe_runmake 'DESTDIR=${D}' install
>    install -d ${D}${datadir}
> -- 
> 1.7.3.4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Phil Blundell - Aug. 2, 2011, 3:19 p.m.
On Tue, 2011-08-02 at 03:14 -0500, Kumar Gala wrote:
> +-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
> ++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) cpio pax none'

Have you discussed that with upstream?  If not, are you confident that
preferring cpio will not simply mean that we are swapping one deficiency
for another?

> +Index: automake-1.11.1/Makefile.in
> +===================================================================
> +--- automake-1.11.1.orig/Makefile.in
> ++++ automake-1.11.1/Makefile.in
> +@@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
> + 	$(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \
> + 	$(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
> + 	$(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \
> +-	$(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \
> ++	$(top_srcdir)/m4/substnot.m4 \
> + 	$(top_srcdir)/configure.ac
> + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
> + 	$(ACLOCAL_M4)

Can you explain why this hunk is necessary?

> +do_configure () {
> +	touch ${S}/Makefile.in
> +	autotools_do_configure
> +}

... and this one?

Also, your patch is missing a Signed-off-by line.  See:

http://wiki.openembedded.org/index.php/Commit_Patch_Message_Guidelines#Patch_Headers_and_Commit_Messages

p.
Tom Rini - Aug. 2, 2011, 3:34 p.m.
On 08/02/2011 08:19 AM, Phil Blundell wrote:
> On Tue, 2011-08-02 at 03:14 -0500, Kumar Gala wrote:
>> +-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
>> ++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) cpio pax none'
> 
> Have you discussed that with upstream?  If not, are you confident that
> preferring cpio will not simply mean that we are swapping one deficiency
> for another?

A bug was filed with upstream automake.  At issue is that pax does not
fail gracefully when it cannot create ustar archives while cpio does.

>> +Index: automake-1.11.1/Makefile.in
>> +===================================================================
>> +--- automake-1.11.1.orig/Makefile.in
>> ++++ automake-1.11.1/Makefile.in
>> +@@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
>> + 	$(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \
>> + 	$(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
>> + 	$(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \
>> +-	$(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \
>> ++	$(top_srcdir)/m4/substnot.m4 \
>> + 	$(top_srcdir)/configure.ac
>> + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>> + 	$(ACLOCAL_M4)
> 
> Can you explain why this hunk is necessary?

That I don't recall.  Possibly some sort of re-gen hell I was trying /
needing to avoid.

> 
>> +do_configure () {
>> +	touch ${S}/Makefile.in
>> +	autotools_do_configure
>> +}
> 
> ... and this one?

Didn't do that one.  Kumar? :)
Tom Rini - Aug. 2, 2011, 3:35 p.m.
On 08/02/2011 08:34 AM, Tom Rini wrote:
> On 08/02/2011 08:19 AM, Phil Blundell wrote:
>> On Tue, 2011-08-02 at 03:14 -0500, Kumar Gala wrote:
>>> +-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
>>> ++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) cpio pax none'
>>
>> Have you discussed that with upstream?  If not, are you confident that
>> preferring cpio will not simply mean that we are swapping one deficiency
>> for another?
> 
> A bug was filed with upstream automake.  At issue is that pax does not
> fail gracefully when it cannot create ustar archives while cpio does.

http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8343 and should be in the
patch header...
Kumar Gala - Aug. 2, 2011, 4:01 p.m.
On Aug 2, 2011, at 10:34 AM, Tom Rini wrote:

> On 08/02/2011 08:19 AM, Phil Blundell wrote:
>> On Tue, 2011-08-02 at 03:14 -0500, Kumar Gala wrote:
>>> +-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
>>> ++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) cpio pax none'
>> 
>> Have you discussed that with upstream?  If not, are you confident that
>> preferring cpio will not simply mean that we are swapping one deficiency
>> for another?
> 
> A bug was filed with upstream automake.  At issue is that pax does not
> fail gracefully when it cannot create ustar archives while cpio does.
> 
>>> +Index: automake-1.11.1/Makefile.in
>>> +===================================================================
>>> +--- automake-1.11.1.orig/Makefile.in
>>> ++++ automake-1.11.1/Makefile.in
>>> +@@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
>>> + 	$(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \
>>> + 	$(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
>>> + 	$(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \
>>> +-	$(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \
>>> ++	$(top_srcdir)/m4/substnot.m4 \
>>> + 	$(top_srcdir)/configure.ac
>>> + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>>> + 	$(ACLOCAL_M4)
>> 
>> Can you explain why this hunk is necessary?
> 
> That I don't recall.  Possibly some sort of re-gen hell I was trying /
> needing to avoid.
> 
>> 
>>> +do_configure () {
>>> +	touch ${S}/Makefile.in
>>> +	autotools_do_configure
>>> +}
>> 
>> ... and this one?
> 
> Didn't do that one.  Kumar? :)

I think I pulled that from the SB3 change you made.

- k
Tom Rini - Aug. 2, 2011, 4:04 p.m.
On 08/02/2011 09:01 AM, Kumar Gala wrote:
> 
> On Aug 2, 2011, at 10:34 AM, Tom Rini wrote:
> 
>> On 08/02/2011 08:19 AM, Phil Blundell wrote:
>>> On Tue, 2011-08-02 at 03:14 -0500, Kumar Gala wrote:
>>>> +-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
>>>> ++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) cpio pax none'
>>>
>>> Have you discussed that with upstream?  If not, are you confident that
>>> preferring cpio will not simply mean that we are swapping one deficiency
>>> for another?
>>
>> A bug was filed with upstream automake.  At issue is that pax does not
>> fail gracefully when it cannot create ustar archives while cpio does.
>>
>>>> +Index: automake-1.11.1/Makefile.in
>>>> +===================================================================
>>>> +--- automake-1.11.1.orig/Makefile.in
>>>> ++++ automake-1.11.1/Makefile.in
>>>> +@@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
>>>> + 	$(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \
>>>> + 	$(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
>>>> + 	$(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \
>>>> +-	$(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \
>>>> ++	$(top_srcdir)/m4/substnot.m4 \
>>>> + 	$(top_srcdir)/configure.ac
>>>> + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>>>> + 	$(ACLOCAL_M4)
>>>
>>> Can you explain why this hunk is necessary?
>>
>> That I don't recall.  Possibly some sort of re-gen hell I was trying /
>> needing to avoid.
>>
>>>
>>>> +do_configure () {
>>>> +	touch ${S}/Makefile.in
>>>> +	autotools_do_configure
>>>> +}
>>>
>>> ... and this one?
>>
>> Didn't do that one.  Kumar? :)
> 
> I think I pulled that from the SB3 change you made.

Gah, you're right.  I think it was more "avoid re-gen" bits.
Kumar Gala - Aug. 2, 2011, 4:08 p.m.
On Aug 2, 2011, at 11:04 AM, Tom Rini wrote:

> On 08/02/2011 09:01 AM, Kumar Gala wrote:
>> 
>> On Aug 2, 2011, at 10:34 AM, Tom Rini wrote:
>> 
>>> On 08/02/2011 08:19 AM, Phil Blundell wrote:
>>>> On Tue, 2011-08-02 at 03:14 -0500, Kumar Gala wrote:
>>>>> +-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
>>>>> ++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) cpio pax none'
>>>> 
>>>> Have you discussed that with upstream?  If not, are you confident that
>>>> preferring cpio will not simply mean that we are swapping one deficiency
>>>> for another?
>>> 
>>> A bug was filed with upstream automake.  At issue is that pax does not
>>> fail gracefully when it cannot create ustar archives while cpio does.
>>> 
>>>>> +Index: automake-1.11.1/Makefile.in
>>>>> +===================================================================
>>>>> +--- automake-1.11.1.orig/Makefile.in
>>>>> ++++ automake-1.11.1/Makefile.in
>>>>> +@@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
>>>>> + 	$(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \
>>>>> + 	$(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
>>>>> + 	$(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \
>>>>> +-	$(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \
>>>>> ++	$(top_srcdir)/m4/substnot.m4 \
>>>>> + 	$(top_srcdir)/configure.ac
>>>>> + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>>>>> + 	$(ACLOCAL_M4)
>>>> 
>>>> Can you explain why this hunk is necessary?
>>> 
>>> That I don't recall.  Possibly some sort of re-gen hell I was trying /
>>> needing to avoid.
>>> 
>>>> 
>>>>> +do_configure () {
>>>>> +	touch ${S}/Makefile.in
>>>>> +	autotools_do_configure
>>>>> +}
>>>> 
>>>> ... and this one?
>>> 
>>> Didn't do that one.  Kumar? :)
>> 
>> I think I pulled that from the SB3 change you made.
> 
> Gah, you're right.  I think it was more "avoid re-gen" bits.

Tom,

Do you mind take a stab at updating this patch based on feedback as your far more familiar with that I am ;)

- k

Patch

diff --git a/meta/recipes-devtools/automake/automake.inc b/meta/recipes-devtools/automake/automake.inc
index beeec7b..96d797f 100644
--- a/meta/recipes-devtools/automake/automake.inc
+++ b/meta/recipes-devtools/automake/automake.inc
@@ -4,7 +4,7 @@  Standards. Automake requires the use of Autoconf."
 LICENSE = "GPLv2"
 HOMEPAGE = "http://www.gnu.org/software/automake/"
 SECTION = "devel"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 "
 
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
new file mode 100644
index 0000000..3fda937
--- /dev/null
+++ b/meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch
@@ -0,0 +1,26 @@ 
+Index: automake-1.11.1/m4/tar.m4
+===================================================================
+--- automake-1.11.1.orig/m4/tar.m4
++++ automake-1.11.1/m4/tar.m4
+@@ -30,7 +30,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.1/Makefile.in
+===================================================================
+--- automake-1.11.1.orig/Makefile.in
++++ automake-1.11.1/Makefile.in
+@@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ 	$(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \
+ 	$(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
+ 	$(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \
+-	$(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \
++	$(top_srcdir)/m4/substnot.m4 \
+ 	$(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
diff --git a/meta/recipes-devtools/automake/automake_1.11.1.bb b/meta/recipes-devtools/automake/automake_1.11.1.bb
index b231a94..764b6fc 100644
--- a/meta/recipes-devtools/automake/automake_1.11.1.bb
+++ b/meta/recipes-devtools/automake/automake_1.11.1.bb
@@ -32,11 +32,17 @@  RDEPENDS_automake-native = "autoconf-native perl-native-runtime"
 PATHFIXPATCH = "file://path_prog_fixes.patch;patch=1"
 PATHFIXPATCH_virtclass-native = ""
 
-SRC_URI += "${PATHFIXPATCH}"
+SRC_URI += "${PATHFIXPATCH} \
+	    file://prefer-cpio-over-pax-for-ustar-archives.patch;patch=1"
 
 SRC_URI[md5sum] = "c2972c4d9b3e29c03d5f2af86249876f"
 SRC_URI[sha256sum] = "5b159d3c0e0a1f87de71b68bcb9f1a1c49e9e71749c9b723f17e2e1e0295c7ae"
 
+do_configure () {
+	touch ${S}/Makefile.in
+	autotools_do_configure
+}
+
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 	install -d ${D}${datadir}