[OE-core] [PATCH 1/5] automake: 1.15.1 -> 1.16.1
Khem Raj
raj.khem at gmail.com
Wed Jul 11 20:00:27 UTC 2018
On Wed, Jul 11, 2018 at 12:15 AM Robert Yang <liezhi.yang at windriver.com> wrote:
>
> Hi Khem,
>
> I've sent patches to oe-devel to fix the problem:
>
> sblim-sfcb: fix sfcbinst2mof_DEPENDENCIES in Makefile.am
> ntop: fix so generation in plugins/Makefile.am
>
Thanks for followup. I have staged them for testing.
> // Robert
>
> On 07/06/2018 02:06 PM, Khem Raj wrote:
> > this is regressing following recipes in meta-openembedded
> >
> > http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-support/ntop/ntop_5.0.1.bb?h=master
> > http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb?h=master
> >
> >
> > On Mon, Jul 2, 2018 at 9:02 PM Robert Yang <liezhi.yang at windriver.com> wrote:
> >>
> >> * Refreshed the following patches:
> >> - 0001-automake-Add-default-libtool_tag-to-cppasm.patch
> >> - automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch
> >> - buildtest.patch
> >> - new_rt_path_for_test-driver.patch
> >> - performance.patch
> >> - python-libdir.patch
> >>
> >> Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
> >> ---
> >> ...utomake-Add-default-libtool_tag-to-cppasm.patch | 18 +++---
> >> ...tion-in-shebangs-with-modern-use-warnings.patch | 68 +++++-----------------
> >> .../automake/automake/buildtest.patch | 20 +++++--
> >> .../automake/new_rt_path_for_test-driver.patch | 22 +++++--
> >> .../automake/automake/performance.patch | 19 ++++--
> >> .../automake/automake/python-libdir.patch | 19 +++---
> >> .../{automake_1.15.1.bb => automake_1.16.1.bb} | 4 +-
> >> 7 files changed, 82 insertions(+), 88 deletions(-)
> >> rename meta/recipes-devtools/automake/{automake_1.15.1.bb => automake_1.16.1.bb} (89%)
> >>
> >> diff --git a/meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch b/meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch
> >> index 1221f13..deb1d03 100644
> >> --- a/meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch
> >> +++ b/meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch
> >> @@ -1,4 +1,4 @@
> >> -From 25a8ac30486798d23f516722d73eb622e6264f28 Mon Sep 17 00:00:00 2001
> >> +From b3c6e1971786cd93a2e3017c92bfbfe96baaf2f7 Mon Sep 17 00:00:00 2001
> >> From: Khem Raj <raj.khem at gmail.com>
> >> Date: Wed, 26 Jul 2017 11:19:56 -0700
> >> Subject: [PATCH] automake: Add default libtool_tag to cppasm.
> >> @@ -6,19 +6,19 @@ Subject: [PATCH] automake: Add default libtool_tag to cppasm.
> >> * bin/automake.in (register_language): Define default libtool tag to be CC
> >> since CPPASCOMPILE is using CC to call assembler
> >>
> >> -Signed-off-by: Khem Raj <raj.khem at gmail.com>
> >> ----
> >> Upstream-Status: Submitted
> >> +Signed-off-by: Khem Raj <raj.khem at gmail.com>
> >>
> >> +---
> >> bin/automake.in | 1 +
> >> 1 file changed, 1 insertion(+)
> >>
> >> -Index: automake-1.15.1/bin/automake.in
> >> -===================================================================
> >> ---- automake-1.15.1.orig/bin/automake.in
> >> -+++ automake-1.15.1/bin/automake.in
> >> -@@ -831,6 +831,7 @@ register_language ('name' => 'cppasm',
> >> - 'compiler' => 'CPPASCOMPILE',
> >> +diff --git a/bin/automake.in b/bin/automake.in
> >> +index 3a66965..08ba09a 100644
> >> +--- a/bin/automake.in
> >> ++++ b/bin/automake.in
> >> +@@ -898,6 +898,7 @@ register_language ('name' => 'cppasm',
> >> + 'libtool_tag' => 'CC',
> >> 'compile_flag' => '-c',
> >> 'output_flag' => '-o',
> >> + 'libtool_tag' => 'CC',
> >> diff --git a/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch b/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch
> >> index 96b5a3d..1592c02 100644
> >> --- a/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch
> >> +++ b/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch
> >> @@ -1,4 +1,4 @@
> >> -From 41e06b7a354774913dcd2e32a35440e407843357 Mon Sep 17 00:00:00 2001
> >> +From 081385f4d4bba367afad3bff1fa034f5263305e6 Mon Sep 17 00:00:00 2001
> >> From: Serhii Popovych <spopovyc at cisco.com>
> >> Date: Wed, 10 Feb 2016 17:07:32 +0000
> >> Subject: [PATCH] perl: Replace -w option in shebangs with modern "use
> >> @@ -15,24 +15,24 @@ line and add "use warnings" statement.
> >>
> >> Upstream-Status: Pending
> >> Signed-off-by: Serhii Popovych <spopovyc at cisco.com>
> >> +Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
> >> +
> >> ---
> >> - bin/aclocal.in | 3 ++-
> >> - bin/automake.in | 3 ++-
> >> - t/wrap/aclocal.in | 3 ++-
> >> - t/wrap/automake.in | 3 ++-
> >> - 4 files changed, 8 insertions(+), 4 deletions(-)
> >> + bin/aclocal.in | 3 ++-
> >> + bin/automake.in | 3 ++-
> >> + 2 files changed, 4 insertions(+), 2 deletions(-)
> >>
> >> -Index: automake-1.15.1/bin/aclocal.in
> >> -===================================================================
> >> ---- automake-1.15.1.orig/bin/aclocal.in
> >> -+++ automake-1.15.1/bin/aclocal.in
> >> +diff --git a/bin/aclocal.in b/bin/aclocal.in
> >> +index b3715d9..461d453 100644
> >> +--- a/bin/aclocal.in
> >> ++++ b/bin/aclocal.in
> >> @@ -1,4 +1,4 @@
> >> -#!@PERL@ -w
> >> +#!@PERL@
> >> # -*- perl -*-
> >> # @configure_input@
> >>
> >> -@@ -33,6 +33,7 @@ BEGIN
> >> +@@ -32,6 +32,7 @@ BEGIN
> >> }
> >>
> >> use strict;
> >> @@ -40,17 +40,17 @@ Index: automake-1.15.1/bin/aclocal.in
> >>
> >> use Automake::Config;
> >> use Automake::General;
> >> -Index: automake-1.15.1/bin/automake.in
> >> -===================================================================
> >> ---- automake-1.15.1.orig/bin/automake.in
> >> -+++ automake-1.15.1/bin/automake.in
> >> +diff --git a/bin/automake.in b/bin/automake.in
> >> +index 8377d20..3a66965 100644
> >> +--- a/bin/automake.in
> >> ++++ b/bin/automake.in
> >> @@ -1,4 +1,4 @@
> >> -#!@PERL@ -w
> >> +#!@PERL@
> >> # -*- perl -*-
> >> # @configure_input@
> >>
> >> -@@ -28,6 +28,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
> >> +@@ -28,6 +28,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
> >> package Automake;
> >>
> >> use strict;
> >> @@ -58,39 +58,3 @@ Index: automake-1.15.1/bin/automake.in
> >>
> >> BEGIN
> >> {
> >> -Index: automake-1.15.1/t/wrap/aclocal.in
> >> -===================================================================
> >> ---- automake-1.15.1.orig/t/wrap/aclocal.in
> >> -+++ automake-1.15.1/t/wrap/aclocal.in
> >> -@@ -1,4 +1,4 @@
> >> --#!@PERL@ -w
> >> -+#!@PERL@
> >> - # @configure_input@
> >> -
> >> - # Copyright (C) 2012-2017 Free Software Foundation, Inc.
> >> -@@ -19,6 +19,7 @@
> >> - BEGIN
> >> - {
> >> - use strict;
> >> -+ use warnings;
> >> - @Aclocal::perl_libdirs = ('@abs_top_srcdir@/lib');
> >> - unshift @Aclocal::perl_libdirs, '@abs_top_builddir@/lib'
> >> - if '@srcdir@' ne '.';
> >> -Index: automake-1.15.1/t/wrap/automake.in
> >> -===================================================================
> >> ---- automake-1.15.1.orig/t/wrap/automake.in
> >> -+++ automake-1.15.1/t/wrap/automake.in
> >> -@@ -1,4 +1,4 @@
> >> --#!@PERL@ -w
> >> -+#!@PERL@
> >> - # @configure_input@
> >> -
> >> - # Copyright (C) 2012-2017 Free Software Foundation, Inc.
> >> -@@ -19,6 +19,7 @@
> >> - BEGIN
> >> - {
> >> - use strict;
> >> -+ use warnings;
> >> - @Automake::perl_libdirs = ('@abs_top_srcdir@/lib');
> >> - unshift @Automake::perl_libdirs, '@abs_top_builddir@/lib'
> >> - if '@srcdir@' ne '.';
> >> diff --git a/meta/recipes-devtools/automake/automake/buildtest.patch b/meta/recipes-devtools/automake/automake/buildtest.patch
> >> index c32cd1f..b88b9e8 100644
> >> --- a/meta/recipes-devtools/automake/automake/buildtest.patch
> >> +++ b/meta/recipes-devtools/automake/automake/buildtest.patch
> >> @@ -1,13 +1,25 @@
> >> +From a860b28069785aa5bf2fa9b671287de9af5004ff Mon Sep 17 00:00:00 2001
> >> +From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= <bjst at enea.com>
> >> +Date: Wed, 19 Dec 2012 17:18:27 +0100
> >> +Subject: [PATCH] Add a new distro feature "ptest".
> >> +MIME-Version: 1.0
> >> +Content-Type: text/plain; charset=UTF-8
> >> +Content-Transfer-Encoding: 8bit
> >> +
> >> Split "check-TESTS" into a buildtest and runtest target, so that they can
> >> be run separately.
> >>
> >> Signed-off-by: Björn Stenberg <bjst at enea.com>
> >> Upstream-Status: Pending
> >>
> >> -Index: automake-1.15.1/lib/am/check.am
> >> -===================================================================
> >> ---- automake-1.15.1.orig/lib/am/check.am
> >> -+++ automake-1.15.1/lib/am/check.am
> >> +---
> >> + lib/am/check.am | 11 +++++++++--
> >> + 1 file changed, 9 insertions(+), 2 deletions(-)
> >> +
> >> +diff --git a/lib/am/check.am b/lib/am/check.am
> >> +index e0db651..de137fa 100644
> >> +--- a/lib/am/check.am
> >> ++++ b/lib/am/check.am
> >> @@ -41,7 +41,7 @@ am__tty_colors = { \
> >> fi; \
> >> }
> >> diff --git a/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch b/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch
> >> index 2c6594f..1f71722 100644
> >> --- a/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch
> >> +++ b/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch
> >> @@ -1,22 +1,32 @@
> >> -Set relative to top_builddir path in Makefile to access test-driver
> >> +From f78dfa39139d528c94d72f27994f337f2fd3b6bd Mon Sep 17 00:00:00 2001
> >> +From: Adrian Calianu <adrian.calianu at enea.com>
> >> +Date: Thu, 25 Feb 2016 16:08:04 +0100
> >> +Subject: [PATCH] Set relative to top_builddir path in Makefile to access
> >> + test-driver
> >>
> >> Signed-off-by: Adrian Calianu <adrian.calianu at enea.com>
> >> Upstream-Status: Pending
> >> Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042
> >>
> >> +---
> >> + bin/automake.in | 9 ++++++++-
> >> + 1 file changed, 8 insertions(+), 1 deletion(-)
> >> +
> >> +diff --git a/bin/automake.in b/bin/automake.in
> >> +index a52a489..8377d20 100644
> >> --- a/bin/automake.in
> >> +++ b/bin/automake.in
> >> -@@ -272,6 +272,9 @@
> >> +@@ -324,6 +324,9 @@ my $config_aux_dir_set_in_configure_ac = 0;
> >> # $AM_CONFIG_AUX_DIR is prefixed with $(top_srcdir), so it can be used
> >> # in Makefiles.
> >> my $am_config_aux_dir = '';
> >> +# Directory used at runtime like running test-driver that should not
> >> +# depend on $(top_srcdir)
> >> +my $am_config_rt_aux_dir = '';
> >> -
> >> +
> >> # Directory to search for AC_LIBSOURCE files, as set by AC_CONFIG_LIBOBJ_DIR
> >> # in configure.ac.
> >> -@@ -4700,7 +4703,7 @@
> >> +@@ -4854,7 +4857,7 @@ sub handle_per_suffix_test
> >> {
> >> require_conf_file ("parallel-tests", FOREIGN, 'test-driver');
> >> define_variable ("${pfx}LOG_DRIVER",
> >> @@ -25,7 +35,7 @@ Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042
> >> INTERNAL);
> >> }
> >> my $driver = '$(' . $pfx . 'LOG_DRIVER)';
> >> -@@ -7284,6 +7287,10 @@
> >> +@@ -7440,6 +7443,10 @@ sub locate_aux_dir ()
> >> $am_config_aux_dir =
> >> '$(top_srcdir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir");
> >> $am_config_aux_dir =~ s,/*$,,;
> >> @@ -34,3 +44,5 @@ Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042
> >> + '$(top_builddir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir");
> >> + $am_config_rt_aux_dir =~ s,/*$,,;
> >> }
> >> +
> >> +
> >> diff --git a/meta/recipes-devtools/automake/automake/performance.patch b/meta/recipes-devtools/automake/automake/performance.patch
> >> index 3e6d569..a8ba659 100644
> >> --- a/meta/recipes-devtools/automake/automake/performance.patch
> >> +++ b/meta/recipes-devtools/automake/automake/performance.patch
> >> @@ -1,15 +1,24 @@
> >> +From cd47c328cb53546891bb3dc7c9b2c54ed01cc6d1 Mon Sep 17 00:00:00 2001
> >> +From: Richard Purdie <richard.purdie at linuxfoundation.org>
> >> +Date: Mon, 7 Dec 2015 18:28:05 +0000
> >> +Subject: [PATCH] automake: Remove delays in configure scripts using automake
> >> +
> >> By default automake puts "sleep 1" into the start of configure scripts
> >> -which adds pointless delays to them. Rather than do this, lets just assume
> >> +which adds pointless delays to them. Rather than do this, lets just assume
> >> our systems are sane.
> >>
> >> RP
> >> 2015/12/7
> >> Upstream-Status: Inappropriate
> >>
> >> -Index: automake-1.15/m4/sanity.m4
> >> -===================================================================
> >> ---- automake-1.15.orig/m4/sanity.m4
> >> -+++ automake-1.15/m4/sanity.m4
> >> +---
> >> + m4/sanity.m4 | 55 -------------------------------------------------------
> >> + 1 file changed, 55 deletions(-)
> >> +
> >> +diff --git a/m4/sanity.m4 b/m4/sanity.m4
> >> +index eaac218..bfdfe88 100644
> >> +--- a/m4/sanity.m4
> >> ++++ b/m4/sanity.m4
> >> @@ -23,60 +23,5 @@ case $srcdir in
> >> AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
> >> esac
> >> diff --git a/meta/recipes-devtools/automake/automake/python-libdir.patch b/meta/recipes-devtools/automake/automake/python-libdir.patch
> >> index 2a48b13..ee1f725 100644
> >> --- a/meta/recipes-devtools/automake/automake/python-libdir.patch
> >> +++ b/meta/recipes-devtools/automake/automake/python-libdir.patch
> >> @@ -1,7 +1,7 @@
> >> -From 472a3d36c97ef7535f05d6c185edcbc22b0074c4 Mon Sep 17 00:00:00 2001
> >> +From a80dacd5124d0713cf2c986b28d736e78dc6b0ca Mon Sep 17 00:00:00 2001
> >> From: Kumar Gala <galak at kernel.crashing.org>
> >> Date: Thu, 11 Aug 2011 01:26:33 -0500
> >> -Subject: [PATCH 1/4] automake: Update for python.m4 to respect libdir
> >> +Subject: [PATCH] automake: Update for python.m4 to respect libdir
> >>
> >> Upstream-Status: Inappropriate [embedded specific]
> >>
> >> @@ -17,10 +17,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin at gmail.com>
> >> 1 file changed, 7 insertions(+), 20 deletions(-)
> >>
> >> diff --git a/m4/python.m4 b/m4/python.m4
> >> -index 5b2c695..ed19261 100644
> >> +index 63c0a0e..7bbd2d2 100644
> >> --- a/m4/python.m4
> >> +++ b/m4/python.m4
> >> -@@ -91,12 +91,13 @@ AC_DEFUN([AM_PATH_PYTHON],
> >> +@@ -94,12 +94,13 @@ AC_DEFUN([AM_PATH_PYTHON],
> >> [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
> >> AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
> >>
> >> @@ -36,7 +36,7 @@ index 5b2c695..ed19261 100644
> >> AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
> >>
> >> dnl At times (like when building shared libraries) you may want
> >> -@@ -141,14 +142,7 @@ except ImportError:
> >> +@@ -144,14 +145,7 @@ except ImportError:
> >> else
> >> am_py_prefix=$prefix
> >> fi
> >> @@ -52,7 +52,7 @@ index 5b2c695..ed19261 100644
> >> case $am_cv_python_pythondir in
> >> $am_py_prefix*)
> >> am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
> >> -@@ -158,7 +152,7 @@ sys.stdout.write(sitedir)"`
> >> +@@ -161,7 +155,7 @@ sys.stdout.write(sitedir)"`
> >> case $am_py_prefix in
> >> /usr|/System*) ;;
> >> *)
> >> @@ -61,7 +61,7 @@ index 5b2c695..ed19261 100644
> >> ;;
> >> esac
> >> ;;
> >> -@@ -183,14 +177,7 @@ sys.stdout.write(sitedir)"`
> >> +@@ -186,14 +180,7 @@ sys.stdout.write(sitedir)"`
> >> else
> >> am_py_exec_prefix=$exec_prefix
> >> fi
> >> @@ -77,7 +77,7 @@ index 5b2c695..ed19261 100644
> >> case $am_cv_python_pyexecdir in
> >> $am_py_exec_prefix*)
> >> am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
> >> -@@ -200,7 +187,7 @@ sys.stdout.write(sitedir)"`
> >> +@@ -203,7 +190,7 @@ sys.stdout.write(sitedir)"`
> >> case $am_py_exec_prefix in
> >> /usr|/System*) ;;
> >> *)
> >> @@ -86,6 +86,3 @@ index 5b2c695..ed19261 100644
> >> ;;
> >> esac
> >> ;;
> >> ---
> >> -2.8.1
> >> -
> >> diff --git a/meta/recipes-devtools/automake/automake_1.15.1.bb b/meta/recipes-devtools/automake/automake_1.16.1.bb
> >> similarity index 89%
> >> rename from meta/recipes-devtools/automake/automake_1.15.1.bb
> >> rename to meta/recipes-devtools/automake/automake_1.16.1.bb
> >> index 4f9b616..c64ee44 100644
> >> --- a/meta/recipes-devtools/automake/automake_1.15.1.bb
> >> +++ b/meta/recipes-devtools/automake/automake_1.16.1.bb
> >> @@ -27,8 +27,8 @@ SRC_URI += "file://python-libdir.patch \
> >> file://0001-automake-Add-default-libtool_tag-to-cppasm.patch \
> >> "
> >>
> >> -SRC_URI[md5sum] = "95df3f2d6eb8f81e70b8cb63a93c8853"
> >> -SRC_URI[sha256sum] = "988e32527abe052307d21c8ca000aa238b914df363a617e38f4fb89f5abf6260"
> >> +SRC_URI[md5sum] = "83cc2463a4080efd46a72ba2c9f6b8f5"
> >> +SRC_URI[sha256sum] = "608a97523f97db32f1f5d5615c98ca69326ced2054c9f82e65bade7fc4c9dea8"
> >>
> >> PERL = "${USRBINPATH}/perl"
> >> PERL_class-native = "${USRBINPATH}/env perl"
> >> --
> >> 2.7.4
> >>
> >> --
> >> _______________________________________________
> >> Openembedded-core mailing list
> >> Openembedded-core at lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-core
> >
More information about the Openembedded-core
mailing list