* [PATCH 0/2] Automake update to 1.13
@ 2013-10-09 23:29 Marko Lindqvist
2013-10-09 23:29 ` [PATCH 1/2] automake: unhardcode version number Marko Lindqvist
2013-10-09 23:29 ` [PATCH 2/2] automake: update to upstream version 1.13.4 Marko Lindqvist
0 siblings, 2 replies; 3+ messages in thread
From: Marko Lindqvist @ 2013-10-09 23:29 UTC (permalink / raw)
To: openembedded-core
Previous version of the series was reduced to just one patch -
the actual automake update.
This version has one more patch before the actual update. Without
"unhardcode version number" -patch old version number is still expected
as part of the name of the command to modify in do_install_append().
The following changes since commit 1149b1fef8912f77d971242dfec151fff5a3aa51:
build-appliance: Update SRCREV for release (2013-10-08 16:33:25 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib cazfi/am13
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=cazfi/am13
Marko Lindqvist (2):
automake: unhardcode version number
automake: update to upstream version 1.13.4
.../prefer-cpio-over-pax-for-ustar-archives.patch | 37 +++++++++++-----------
.../{automake_1.12.6.bb => automake_1.13.4.bb} | 10 +++---
2 files changed, 24 insertions(+), 23 deletions(-)
rename meta/recipes-devtools/automake/{automake_1.12.6.bb => automake_1.13.4.bb} (83%)
--
1.8.4.rc3
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/2] automake: unhardcode version number
2013-10-09 23:29 [PATCH 0/2] Automake update to 1.13 Marko Lindqvist
@ 2013-10-09 23:29 ` Marko Lindqvist
2013-10-09 23:29 ` [PATCH 2/2] automake: update to upstream version 1.13.4 Marko Lindqvist
1 sibling, 0 replies; 3+ messages in thread
From: Marko Lindqvist @ 2013-10-09 23:29 UTC (permalink / raw)
To: openembedded-core
Use trim_version to get version part of the executable name.
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
meta/recipes-devtools/automake/automake_1.12.6.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/automake/automake_1.12.6.bb b/meta/recipes-devtools/automake/automake_1.12.6.bb
index 549051b..b65e5ae 100644
--- a/meta/recipes-devtools/automake/automake_1.12.6.bb
+++ b/meta/recipes-devtools/automake/automake_1.12.6.bb
@@ -3,6 +3,8 @@ LICENSE="GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
DEPENDS_class-native = "autoconf-native"
+NAMEVER = "${@oe.utils.trim_version("${PV}", 2)}"
+
RDEPENDS_${PN} += "\
autoconf \
perl \
@@ -29,14 +31,12 @@ SRC_URI += "${PATHFIXPATCH} \
SRC_URI[md5sum] = "199d39ece2e6070d64ac20d45ac86026"
SRC_URI[sha256sum] = "0cbe570db487908e70af7119da85ba04f7e28656b26f717df0265ae08defd9ef"
-PR = "r0"
-
do_install_append () {
install -d ${D}${datadir}
# Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
# for target as /usr/bin/perl, so fix it to /usr/bin/perl.
- for i in aclocal aclocal-1.12 automake automake-1.12; do
+ for i in aclocal aclocal-${NAMEVER} automake automake-${NAMEVER}; do
if [ -f ${D}${bindir}/$i ]; then
sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/perl,' \
-e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${USRBINPATH}/perl \1 exec ${USRBINPATH}/perl \2,' \
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] automake: update to upstream version 1.13.4
2013-10-09 23:29 [PATCH 0/2] Automake update to 1.13 Marko Lindqvist
2013-10-09 23:29 ` [PATCH 1/2] automake: unhardcode version number Marko Lindqvist
@ 2013-10-09 23:29 ` Marko Lindqvist
1 sibling, 0 replies; 3+ messages in thread
From: Marko Lindqvist @ 2013-10-09 23:29 UTC (permalink / raw)
To: openembedded-core
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} | 4 +--
2 files changed, 21 insertions(+), 20 deletions(-)
rename meta/recipes-devtools/automake/{automake_1.12.6.bb => automake_1.13.4.bb} (91%)
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..6ffff83 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 -'],
\ No newline at end of file
diff --git a/meta/recipes-devtools/automake/automake_1.12.6.bb b/meta/recipes-devtools/automake/automake_1.13.4.bb
similarity index 91%
rename from meta/recipes-devtools/automake/automake_1.12.6.bb
rename to meta/recipes-devtools/automake/automake_1.13.4.bb
index b65e5ae..b114d99 100644
--- a/meta/recipes-devtools/automake/automake_1.12.6.bb
+++ b/meta/recipes-devtools/automake/automake_1.13.4.bb
@@ -28,8 +28,8 @@ SRC_URI += "${PATHFIXPATCH} \
file://py-compile-compile-only-optimized-byte-code.patch \
file://buildtest.patch"
-SRC_URI[md5sum] = "199d39ece2e6070d64ac20d45ac86026"
-SRC_URI[sha256sum] = "0cbe570db487908e70af7119da85ba04f7e28656b26f717df0265ae08defd9ef"
+SRC_URI[md5sum] = "9199e266993a5bbdc914923349d51e3e"
+SRC_URI[sha256sum] = "4c93abc0bff54b296f41f92dd3aa1e73e554265a6f719df465574983ef6f878c"
do_install_append () {
install -d ${D}${datadir}
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-10-09 23:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-09 23:29 [PATCH 0/2] Automake update to 1.13 Marko Lindqvist
2013-10-09 23:29 ` [PATCH 1/2] automake: unhardcode version number Marko Lindqvist
2013-10-09 23:29 ` [PATCH 2/2] automake: update to upstream version 1.13.4 Marko Lindqvist
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.