summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2011-08-02 21:20:56 (GMT)
committerSaul Wold <sgw@linux.intel.com>2011-08-04 01:48:05 (GMT)
commite2bdd80985af08e1397800d868607ad52111cd09 (patch)
tree3b82cf116d05147fd84423bef402d22f0c3885ec
parent97c908cf64c603dcc805e1ec52997ca981bb7148 (diff)
downloadpoky-e2bdd80985af08e1397800d868607ad52111cd09.tar.gz
automake: Fix issue with tar configure failing with large UID/GIDs
Add a fixup for trying to create ustar archives when the users UID or GID is larger than the format allows. (From OE-Core rev: 7a092818f901c5c860e82f573534cd505d9fb959) Signed-off-by: Tom Rini <tom_rini@mentor.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/automake/automake.inc2
-rw-r--r--meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch41
-rw-r--r--meta/recipes-devtools/automake/automake_1.11.1.bb3
3 files changed, 44 insertions, 2 deletions
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."
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5HOMEPAGE = "http://www.gnu.org/software/automake/" 5HOMEPAGE = "http://www.gnu.org/software/automake/"
6SECTION = "devel" 6SECTION = "devel"
7PR = "r2" 7PR = "r3"
8 8
9SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 " 9SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 "
10 10
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..083547a
--- /dev/null
+++ b/meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch
@@ -0,0 +1,41 @@
1When the user has a UID or GID that is larger than the ustar format
2supports, pax does not error out gracefully in some cases (FC13). In
3this case cpio does.
4
5See for more details: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8343
6
7Additionally drop tar.m4 out of that part of the Makefile or we end up in
8a fatal attempt to regen loop:
9
10CDPATH="${ZSH_VERSION+.}:" && cd . && perllibdir="automake-1.11.1/lib:./lib" "automake-1.11.1/aclocal" --acdir=m4 -I m4
11/bin/sh: automake-1.11.1/aclocal: No such file or directory
12make: *** [aclocal.m4] Error 127
13
14Signed-off-by: Tom Rini <tom_rini@mentor.com>
15
16Index: automake-1.11.1/m4/tar.m4
17===================================================================
18--- automake-1.11.1.orig/m4/tar.m4
19+++ automake-1.11.1/m4/tar.m4
20@@ -30,7 +30,7 @@ m4_if([$1], [v7],
21 [m4_fatal([Unknown tar format])])
22 AC_MSG_CHECKING([how to create a $1 tar archive])
23 # Loop over all known methods to create a tar archive until one works.
24-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
25+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) cpio pax none'
26 _am_tools=${am_cv_prog_tar_$1-$_am_tools}
27 # Do not fold the above two line into one, because Tru64 sh and
28 # Solaris sh will not grok spaces in the rhs of `-'.
29Index: automake-1.11.1/Makefile.in
30===================================================================
31--- automake-1.11.1.orig/Makefile.in
32+++ automake-1.11.1/Makefile.in
33@@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
34 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \
35 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
36 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \
37- $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \
38+ $(top_srcdir)/m4/substnot.m4 \
39 $(top_srcdir)/configure.ac
40 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
41 $(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..c66155f 100644
--- a/meta/recipes-devtools/automake/automake_1.11.1.bb
+++ b/meta/recipes-devtools/automake/automake_1.11.1.bb
@@ -32,7 +32,8 @@ RDEPENDS_automake-native = "autoconf-native perl-native-runtime"
32PATHFIXPATCH = "file://path_prog_fixes.patch;patch=1" 32PATHFIXPATCH = "file://path_prog_fixes.patch;patch=1"
33PATHFIXPATCH_virtclass-native = "" 33PATHFIXPATCH_virtclass-native = ""
34 34
35SRC_URI += "${PATHFIXPATCH}" 35SRC_URI += "${PATHFIXPATCH} \
36 file://prefer-cpio-over-pax-for-ustar-archives.patch"
36 37
37SRC_URI[md5sum] = "c2972c4d9b3e29c03d5f2af86249876f" 38SRC_URI[md5sum] = "c2972c4d9b3e29c03d5f2af86249876f"
38SRC_URI[sha256sum] = "5b159d3c0e0a1f87de71b68bcb9f1a1c49e9e71749c9b723f17e2e1e0295c7ae" 39SRC_URI[sha256sum] = "5b159d3c0e0a1f87de71b68bcb9f1a1c49e9e71749c9b723f17e2e1e0295c7ae"