All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/5] Recipes upgrade
@ 2018-07-03  4:11 Robert Yang
  2018-07-03  4:11 ` [PATCH 1/5] automake: 1.15.1 -> 1.16.1 Robert Yang
                   ` (4 more replies)
  0 siblings, 5 replies; 14+ messages in thread
From: Robert Yang @ 2018-07-03  4:11 UTC (permalink / raw)
  To: openembedded-core

The following changes since commit ae48ee6627e6c1c4f1fcc4ead40edc968e64f7fe:

  multilib: Fix issues with some cross-canadian toolchain sysroots (2018-07-02 17:13:19 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/up
  http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/up

Robert Yang (5):
  automake: 1.15.1 -> 1.16.1
  e2fsprogs: 1.43.8 -> 1.44.2
  git: 2.16.1 -> 2.17.0
  nfs-utils: 2.1.1 -> 2.3.1
  ccache: 3.3.5 -> 3.4.2

 ...gure-Allow-to-explicitly-disable-nfsidmap.patch |  40 -------
 ...nclude-stdint.h-for-UINT16_MAX-definition.patch |  27 -----
 .../nfs-utils-1.2.3-sm-notify-res_init.patch       |  37 ------
 .../nfs-utils/nfs-utils-musl-limits.patch          | 133 +++++++++++++++++++++
 .../nfs-utils/nfs-utils-musl-res_querydomain.patch |  22 ++++
 .../{nfs-utils_2.1.1.bb => nfs-utils_2.3.1.bb}     |  12 +-
 ...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 +-
 meta/recipes-devtools/ccache/ccache_3.3.5.bb       |  12 --
 meta/recipes-devtools/ccache/ccache_3.4.2.bb       |  11 ++
 .../0002-dev.mk.in-fix-file-name-too-long.patch    |  15 +--
 ...te-man-page-in-the-make-install-from-git-.patch |  33 -----
 meta/recipes-devtools/e2fsprogs/e2fsprogs.inc      |   2 +-
 ...ix-build-failure-in-swapfs.c-on-big-endia.patch |  40 -------
 ...fs-enable-the-metadata_csum-and-64bit-fea.patch |  12 +-
 .../{e2fsprogs_1.43.8.bb => e2fsprogs_1.44.2.bb}   |   3 +-
 meta/recipes-devtools/git/git.inc                  |  12 +-
 meta/recipes-devtools/git/git_2.16.1.bb            |  11 --
 meta/recipes-devtools/git/git_2.17.0.bb            |  11 ++
 24 files changed, 283 insertions(+), 320 deletions(-)
 delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
 delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
 delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
 create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch
 create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch
 rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.1.1.bb => nfs-utils_2.3.1.bb} (92%)
 rename meta/recipes-devtools/automake/{automake_1.15.1.bb => automake_1.16.1.bb} (89%)
 delete mode 100644 meta/recipes-devtools/ccache/ccache_3.3.5.bb
 create mode 100644 meta/recipes-devtools/ccache/ccache_3.4.2.bb
 delete mode 100644 meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.43.8.bb => e2fsprogs_1.44.2.bb} (97%)
 delete mode 100644 meta/recipes-devtools/git/git_2.16.1.bb
 create mode 100644 meta/recipes-devtools/git/git_2.17.0.bb

-- 
2.7.4



^ permalink raw reply	[flat|nested] 14+ messages in thread

* [PATCH 1/5] automake: 1.15.1 -> 1.16.1
  2018-07-03  4:11 [PATCH 0/5] Recipes upgrade Robert Yang
@ 2018-07-03  4:11 ` Robert Yang
  2018-07-06  6:06   ` Khem Raj
  2018-07-03  4:11 ` [PATCH 2/5] e2fsprogs: 1.43.8 -> 1.44.2 Robert Yang
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 14+ messages in thread
From: Robert Yang @ 2018-07-03  4:11 UTC (permalink / raw)
  To: openembedded-core

* 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@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@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@gmail.com>
----
 Upstream-Status: Submitted
+Signed-off-by: Khem Raj <raj.khem@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@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@cisco.com>
+Signed-off-by: Robert Yang <liezhi.yang@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@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@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@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@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@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@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@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



^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 2/5] e2fsprogs: 1.43.8 -> 1.44.2
  2018-07-03  4:11 [PATCH 0/5] Recipes upgrade Robert Yang
  2018-07-03  4:11 ` [PATCH 1/5] automake: 1.15.1 -> 1.16.1 Robert Yang
@ 2018-07-03  4:11 ` Robert Yang
  2018-07-03  4:11 ` [PATCH 3/5] git: 2.16.1 -> 2.17.0 Robert Yang
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2018-07-03  4:11 UTC (permalink / raw)
  To: openembedded-core

- Rebased Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch
- Removed backport patch 0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch
- The LIC_FILES_CHKSUM changed because it updated the address, others are the same

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/e2fsprogs/e2fsprogs.inc      |  2 +-
 ...ix-build-failure-in-swapfs.c-on-big-endia.patch | 40 ----------------------
 ...fs-enable-the-metadata_csum-and-64bit-fea.patch | 12 +++----
 .../{e2fsprogs_1.43.8.bb => e2fsprogs_1.44.2.bb}   |  3 +-
 4 files changed, 8 insertions(+), 49 deletions(-)
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.43.8.bb => e2fsprogs_1.44.2.bb} (97%)

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
index 81d90a1..a54a11c 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
@@ -9,7 +9,7 @@ LICENSE_e2fsprogs-mke2fs = "GPLv2"
 LICENSE_e2fsprogs-fsck = "GPLv2"
 LICENSE_e2fsprogs-tune2fs = "GPLv2"
 LICENSE_e2fsprogs-badblocks = "GPLv2"
-LIC_FILES_CHKSUM = "file://NOTICE;md5=b48f21d765b875bd10400975d12c1ca2 \
+LIC_FILES_CHKSUM = "file://NOTICE;md5=d50be0580c0b0a7fbc7a4830bbe6c12b \
                       file://lib/ext2fs/ext2fs.h;beginline=1;endline=9;md5=596a8dedcb4e731c6b21c7a46fba6bef \
                       file://lib/e2p/e2p.h;beginline=1;endline=7;md5=8a74ade8f9d65095d70ef2d4bf48e36a \
                       file://lib/uuid/uuid.h.in;beginline=1;endline=32;md5=dbb8079e114a5f841934b99e59c8820a \
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch
deleted file mode 100644
index ff1284e..0000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ae6603206176b771c9ed1f82569f68fc1257f014 Mon Sep 17 00:00:00 2001
-From: Theodore Ts'o <tytso@mit.edu>
-Date: Wed, 3 Jan 2018 01:32:02 -0500
-Subject: [PATCH] libext2fs: fix build failure in swapfs.c on big-endian
- systems
-
-Addresses-Debian-Bug: #886119
-
-Reported-by: James Clarke <jrtc27@debian.org>
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
----
-Upstream-Status: Backport
-
- lib/ext2fs/swapfs.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c
-index 6e5cff97..b13dc422 100644
---- a/lib/ext2fs/swapfs.c
-+++ b/lib/ext2fs/swapfs.c
-@@ -19,6 +19,7 @@
- 
- #include "ext2_fs.h"
- #include "ext2fs.h"
-+#include "ext2fsP.h"
- #include <ext2fs/ext2_ext_attr.h>
- 
- #ifdef WORDS_BIGENDIAN
-@@ -358,7 +359,7 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t,
- 	if (inode_includes(inode_size, i_projid))
-                 t->i_projid = ext2fs_swab16(f->i_projid);
- 	/* catch new static fields added after i_projid */
--	EXT2FS_BUILD_BUG_ON(sizeof(ext2_inode_large) != 160);
-+	EXT2FS_BUILD_BUG_ON(sizeof(struct ext2_inode_large) != 160);
- 
- 	i = sizeof(struct ext2_inode) + extra_isize + sizeof(__u32);
- 	if (bufsize < (int) i)
--- 
-2.16.1
-
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch
index 38e1bdb..d7e09b6 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch
@@ -19,16 +19,16 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  misc/mke2fs.conf.in | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-Index: git/misc/mke2fs.conf.in
-===================================================================
---- git.orig/misc/mke2fs.conf.in
-+++ git/misc/mke2fs.conf.in
+diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in
+index 01e35cf..25105b3 100644
+--- a/misc/mke2fs.conf.in
++++ b/misc/mke2fs.conf.in
 @@ -11,8 +11,9 @@
  		features = has_journal
  	}
  	ext4 = {
--		features = has_journal,extent,huge_file,flex_bg,uninit_bg,64bit,dir_nlink,extra_isize
-+		features = has_journal,extent,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
+-		features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize
++		features = has_journal,extent,huge_file,flex_bg,metadata_csum,dir_nlink,extra_isize
  		inode_size = 256
 +		auto_64-bit_support = 1
  	}
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.2.bb
similarity index 97%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.2.bb
index 989d473..f2537a5 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.2.bb
@@ -6,14 +6,13 @@ SRC_URI += "file://remove.ldconfig.call.patch \
             file://Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch \
             file://mkdir_p.patch \
             file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \
-            file://0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch \
             "
 
 SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \
                                 file://quiet-debugfs.patch \
 "
 
-SRCREV = "af2eac481cf426c05ae12b946396980e16c8ab19"
+SRCREV = "7b9ea51db3be8972c7a17de25be179b18fc9fcde"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
 
 EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 3/5] git: 2.16.1 -> 2.17.0
  2018-07-03  4:11 [PATCH 0/5] Recipes upgrade Robert Yang
  2018-07-03  4:11 ` [PATCH 1/5] automake: 1.15.1 -> 1.16.1 Robert Yang
  2018-07-03  4:11 ` [PATCH 2/5] e2fsprogs: 1.43.8 -> 1.44.2 Robert Yang
@ 2018-07-03  4:11 ` Robert Yang
  2018-07-03 12:42   ` Otavio Salvador
  2018-07-03  4:11 ` [PATCH 4/5] nfs-utils: 2.1.1 -> 2.3.1 Robert Yang
  2018-07-03  4:11 ` [PATCH 5/5] ccache: 3.3.5 -> 3.4.2 Robert Yang
  4 siblings, 1 reply; 14+ messages in thread
From: Robert Yang @ 2018-07-03  4:11 UTC (permalink / raw)
  To: openembedded-core

* Removed code for "${D}${exec_prefix}/lib/perl-native/perl" since there is no
  such a directory now.
* Fixed perl related code.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/git/git.inc       | 12 ++----------
 meta/recipes-devtools/git/git_2.16.1.bb | 11 -----------
 meta/recipes-devtools/git/git_2.17.0.bb | 11 +++++++++++
 3 files changed, 13 insertions(+), 21 deletions(-)
 delete mode 100644 meta/recipes-devtools/git/git_2.16.1.bb
 create mode 100644 meta/recipes-devtools/git/git_2.17.0.bb

diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index dd9d792..26a22ac 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -52,13 +52,6 @@ perl_native_fixup () {
 	       -e 's#${libdir}/perl-native/#${libdir}/#' \
 	    ${@d.getVar("PERLTOOLS").replace(' /',d.getVar('D') + '/')}
 
-	# ${libdir} is not applicable here, perl-native files are always
-	# installed to /usr/lib on both 32/64 bits targets.
-
-	mkdir -p ${D}${libdir}
-	mv ${D}${exec_prefix}/lib/perl-native/perl ${D}${libdir}
-	rmdir -p ${D}${exec_prefix}/lib/perl-native || true
-
 	if [ ! "${@bb.utils.filter('PACKAGECONFIG', 'cvsserver', d)}" ]; then
 		# Only install the git cvsserver command if explicitly requested
 		# as it requires the DBI Perl module, which does not exist in
@@ -72,8 +65,7 @@ perl_native_fixup () {
 		# if explicitly requested as they require the SVN::Core Perl
 		# module, which does not exist in OE-Core.
 		rm -r ${D}${libexecdir}/git-core/git-svn \
-		      ${D}${libdir}/perl/site_perl/*/Git/SVN*
-		sed -i -e '/SVN/d' ${D}${libdir}/perl/site_perl/*/auto/Git/.packlist
+		      ${D}${datadir}/perl5/Git/SVN*
 	fi
 }
 
@@ -124,7 +116,7 @@ PACKAGES =+ "${PN}-perltools"
 FILES_${PN}-perltools += " \
     ${PERLTOOLS} \
     ${libdir}/perl \
-    ${datadir}/perl \
+    ${datadir}/perl5 \
 "
 
 RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils"
diff --git a/meta/recipes-devtools/git/git_2.16.1.bb b/meta/recipes-devtools/git/git_2.16.1.bb
deleted file mode 100644
index 9dc4eba..0000000
--- a/meta/recipes-devtools/git/git_2.16.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require git.inc
-
-EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
-                 ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
-                 "
-EXTRA_OEMAKE += "NO_GETTEXT=1"
-
-SRC_URI[tarball.md5sum] = "37467da8e79e72f28598d667f219f75e"
-SRC_URI[tarball.sha256sum] = "56cfa48af2b289bba172ca0a47c29f0083f5846cf4759978b70988e4f07fc9fd"
-SRC_URI[manpages.md5sum] = "5587407f3c28446af12fde3f3131ba34"
-SRC_URI[manpages.sha256sum] = "d499e825f429d76862be415f579c20cc26b046573a3a39237acaf9682cb71be7"
diff --git a/meta/recipes-devtools/git/git_2.17.0.bb b/meta/recipes-devtools/git/git_2.17.0.bb
new file mode 100644
index 0000000..915ed2e
--- /dev/null
+++ b/meta/recipes-devtools/git/git_2.17.0.bb
@@ -0,0 +1,11 @@
+require git.inc
+
+EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
+                 ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
+                 "
+EXTRA_OEMAKE += "NO_GETTEXT=1"
+
+SRC_URI[tarball.md5sum] = "4e1c44b87ecdf41c7538b6c4a95dae08"
+SRC_URI[tarball.sha256sum] = "7a0cff35dbb14b77dca6924c33ac9fe510b9de35d5267172490af548ec5ee1b8"
+SRC_URI[manpages.md5sum] = "e006bb1e890afce4e55cfafffb34d871"
+SRC_URI[manpages.sha256sum] = "41b58c68e90e4c95265c75955ddd5b68f6491f4d57b2f17c6d68e60bbb07ba6a"
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 4/5] nfs-utils: 2.1.1 -> 2.3.1
  2018-07-03  4:11 [PATCH 0/5] Recipes upgrade Robert Yang
                   ` (2 preceding siblings ...)
  2018-07-03  4:11 ` [PATCH 3/5] git: 2.16.1 -> 2.17.0 Robert Yang
@ 2018-07-03  4:11 ` Robert Yang
  2018-07-03 11:53   ` Burton, Ross
  2018-07-03  4:11 ` [PATCH 5/5] ccache: 3.3.5 -> 3.4.2 Robert Yang
  4 siblings, 1 reply; 14+ messages in thread
From: Robert Yang @ 2018-07-03  4:11 UTC (permalink / raw)
  To: openembedded-core

* Removed 001-configure-Allow-to-explicitly-disable-nfsidmap.patch,
  the nfsidmap is enabled when --enable-nfsv4, so I added a
  PACKAGECONFIG[nfsv4], and default is no since keyutils is not in oe-core by
  default.

* Removed 0001-include-stdint.h-for-UINT16_MAX-definition.patch and
  nfs-utils-1.2.3-sm-notify-res_init.patch since they are already in the
  source.

* Backported two patches from git://git.alpinelinux.org/aports to fix build with musl

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 ...gure-Allow-to-explicitly-disable-nfsidmap.patch |  40 -------
 ...nclude-stdint.h-for-UINT16_MAX-definition.patch |  27 -----
 .../nfs-utils-1.2.3-sm-notify-res_init.patch       |  37 ------
 .../nfs-utils/nfs-utils-musl-limits.patch          | 133 +++++++++++++++++++++
 .../nfs-utils/nfs-utils-musl-res_querydomain.patch |  22 ++++
 .../{nfs-utils_2.1.1.bb => nfs-utils_2.3.1.bb}     |  12 +-
 6 files changed, 161 insertions(+), 110 deletions(-)
 delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
 delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
 delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
 create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch
 create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch
 rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.1.1.bb => nfs-utils_2.3.1.bb} (92%)

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
deleted file mode 100644
index 26b558c..0000000
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 9b84cff305866abd150cf1a4c6e7e5ebf8a7eb3a Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Fri, 15 Nov 2013 23:21:35 +0100
-Subject: [PATCH] configure: Allow to explicitly disable nfsidmap
-
-* keyutils availability is autodetected and builds aren't reproducible
-
-Upstream-Status: Pending
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure.ac | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-Index: nfs-utils-2.1.1/configure.ac
-===================================================================
---- nfs-utils-2.1.1.orig/configure.ac
-+++ nfs-utils-2.1.1/configure.ac
-@@ -92,6 +92,12 @@ AC_ARG_ENABLE(nfsv4,
- 	AC_SUBST(enable_nfsv4)
- 	AM_CONDITIONAL(CONFIG_NFSV4, [test "$enable_nfsv4" = "yes"])
- 
-+AC_ARG_ENABLE(nfsidmap,
-+        [AC_HELP_STRING([--enable-nfsidmap],
-+                        [enable support for NFSv4 idmapper @<:@default=yes@:>@])],
-+        enable_nfsidmap=$enableval,
-+        enable_nfsidmap=yes)
-+
- AC_ARG_ENABLE(nfsv41,
- 	[AC_HELP_STRING([--disable-nfsv41],
-                         [disable support for NFSv41 @<:@default=no@:>@])],
-@@ -339,7 +345,7 @@ fi
- 
- dnl enable nfsidmap when its support by libnfsidmap
- AM_CONDITIONAL(CONFIG_NFSDCLTRACK, [test "$enable_nfsdcltrack" = "yes" ])
--AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
-+AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyesyes"])
- 
- 
- if test "$knfsd_cv_glibc2" = no; then
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
deleted file mode 100644
index 235a2c7..0000000
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 36b48057bce76dced335d67a2894a420967811c9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 20 May 2017 14:07:53 -0700
-Subject: [PATCH] include stdint.h for UINT16_MAX definition
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- support/nsm/rpc.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/support/nsm/rpc.c b/support/nsm/rpc.c
-index 4e5f40e..d91c6ea 100644
---- a/support/nsm/rpc.c
-+++ b/support/nsm/rpc.c
-@@ -40,6 +40,7 @@
- 
- #include <time.h>
- #include <stdbool.h>
-+#include <stdint.h>
- #include <string.h>
- #include <unistd.h>
- #include <fcntl.h>
--- 
-2.13.0
-
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
deleted file mode 100644
index 89a8a57..0000000
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Fixes errors like
-sm-notify[1070]: DNS resolution of a.b.c.d..com failed; retrying later
-This error will occur anytime sm-notify is run before the network if fully up,
-which is happening more and more with parallel startup systems.
-The res_init() call is simple, safe, quick, and a patch to use it should be
-able to go upstream.  Presumably the whole reason sm-notify tries several
-times is to wait for possible changes to the network configuration, but without
-calling res_init() it will never be aware of those changes
-
-Backported drom Fedora
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-
-Index: nfs-utils-2.1.1/utils/statd/sm-notify.c
-===================================================================
---- nfs-utils-2.1.1.orig/utils/statd/sm-notify.c
-+++ nfs-utils-2.1.1/utils/statd/sm-notify.c
-@@ -28,6 +28,9 @@
- #include <netdb.h>
- #include <errno.h>
- #include <grp.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
-+#include <resolv.h>
- 
- #include "conffile.h"
- #include "sockaddr.h"
-@@ -89,6 +92,7 @@ smn_lookup(const char *name)
- 	};
- 	int error;
- 
-+	res_init();
- 	error = getaddrinfo(name, NULL, &hint, &ai);
- 	if (error != 0) {
- 		xlog(D_GENERAL, "getaddrinfo(3): %s", gai_strerror(error));
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch
new file mode 100644
index 0000000..7a4604b
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch
@@ -0,0 +1,133 @@
+Fixed:
+| file.c: In function 'generic_make_pathname':
+| file.c:48:13: error: 'PATH_MAX' undeclared (first use in this function); did you mean 'RAND_MAX'?
+|   if (size > PATH_MAX)
+|              ^~~~~~~~
+[snip]
+
+Upstream-Status: Backport [https://git.alpinelinux.org/cgit/aports/tree/main/nfs-utils/limits.patch?id=f6734a77d3caee73325f8cc1f77d1b5117a75096]
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ support/export/export.c          | 1 +
+ support/export/xtab.c            | 1 +
+ support/misc/file.c              | 1 +
+ support/nfs/xcommon.c            | 1 +
+ support/nsm/file.c               | 1 +
+ utils/blkmapd/device-discovery.c | 1 +
+ utils/gssd/krb5_util.c           | 1 +
+ utils/mountd/cache.c             | 1 +
+ utils/mountd/mountd.c            | 1 +
+ utils/mountd/rmtab.c             | 1 +
+ 10 files changed, 10 insertions(+)
+
+diff --git a/support/export/export.c b/support/export/export.c
+--- a/support/export/export.c
++++ b/support/export/export.c
+@@ -17,6 +17,7 @@
+ #include <stdlib.h>
+ #include <dirent.h>
+ #include <errno.h>
++#include <limits.h>
+ #include "xmalloc.h"
+ #include "nfslib.h"
+ #include "exportfs.h"
+diff --git a/support/export/xtab.c b/support/export/xtab.c
+--- a/support/export/xtab.c
++++ b/support/export/xtab.c
+@@ -18,6 +18,7 @@
+ #include <sys/stat.h>
+ #include <errno.h>
+ #include <libgen.h>
++#include <limits.h>
+ 
+ #include "nfslib.h"
+ #include "exportfs.h"
+diff --git a/support/misc/file.c b/support/misc/file.c
+--- a/support/misc/file.c
++++ b/support/misc/file.c
+@@ -27,6 +27,7 @@
+ #include <dirent.h>
+ #include <stdlib.h>
+ #include <stdbool.h>
++#include <limits.h>
+ 
+ #include "xlog.h"
+ #include "misc.h"
+diff --git a/support/nfs/xcommon.c b/support/nfs/xcommon.c
+--- a/support/nfs/xcommon.c
++++ b/support/nfs/xcommon.c
+@@ -16,6 +16,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <limits.h>
+ 
+ #include "xcommon.h"
+ #include "nls.h"	/* _() */
+diff --git a/support/nsm/file.c b/support/nsm/file.c
+--- a/support/nsm/file.c
++++ b/support/nsm/file.c
+@@ -85,6 +85,7 @@
+ #include <fcntl.h>
+ #include <dirent.h>
+ #include <grp.h>
++#include <limits.h>
+ 
+ #include "xlog.h"
+ #include "nsm.h"
+diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c
+--- a/utils/blkmapd/device-discovery.c
++++ b/utils/blkmapd/device-discovery.c
+@@ -49,6 +49,7 @@
+ #include <unistd.h>
+ #include <libgen.h>
+ #include <errno.h>
++#include <limits.h>
+ #include <libdevmapper.h>
+ 
+ #ifdef HAVE_CONFIG_H
+diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c
+--- a/utils/gssd/krb5_util.c
++++ b/utils/gssd/krb5_util.c
+@@ -120,6 +120,7 @@
+ #endif
+ #include <krb5.h>
+ #include <rpc/auth_gss.h>
++#include <limits.h>
+ 
+ #include "gssd.h"
+ #include "err_util.h"
+diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
+--- a/utils/mountd/cache.c
++++ b/utils/mountd/cache.c
+@@ -26,6 +26,7 @@
+ #include <pwd.h>
+ #include <grp.h>
+ #include <mntent.h>
++#include <limits.h>
+ #include "misc.h"
+ #include "nfslib.h"
+ #include "exportfs.h"
+diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
+--- a/utils/mountd/mountd.c
++++ b/utils/mountd/mountd.c
+@@ -22,6 +22,7 @@
+ #include <fcntl.h>
+ #include <sys/resource.h>
+ #include <sys/wait.h>
++#include <limits.h>
+ 
+ #include "conffile.h"
+ #include "xmalloc.h"
+diff --git a/utils/mountd/rmtab.c b/utils/mountd/rmtab.c
+--- a/utils/mountd/rmtab.c
++++ b/utils/mountd/rmtab.c
+@@ -16,6 +16,7 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
++#include <limits.h>
+ 
+ #include "misc.h"
+ #include "exportfs.h"
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch
new file mode 100644
index 0000000..7a93450
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch
@@ -0,0 +1,22 @@
+Fixed:
+configure: error: res_querydomain needed
+
+Upstream-Status: Backport [https://git.alpinelinux.org/cgit/aports/tree/main/nfs-utils/musl-res_querydomain.patch?id=f6734a77d3caee73325f8cc1f77d1b5117a75096]
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -401,7 +401,7 @@ if test "$enable_gss" = yes; then
+ fi
+ 
+ dnl libdnsidmap specific checks
+-AC_CHECK_LIB([resolv], [__res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
++AC_CHECK_LIB([resolv], [res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
+ 
+ AC_ARG_ENABLE([ldap],
+ 	[AS_HELP_STRING([--disable-ldap],[Disable support for LDAP @<:default=detect@:>@])])
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.1.1.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb
similarity index 92%
rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.1.1.bb
rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb
index 79453ad..52edfb6 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.1.1.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb
@@ -19,8 +19,6 @@ USERADD_PARAM_${PN}-client = "--system  --home-dir /var/lib/nfs \
 			      --shell /bin/false --user-group rpcuser"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.xz \
-           file://0001-configure-Allow-to-explicitly-disable-nfsidmap.patch \
-           file://nfs-utils-1.2.3-sm-notify-res_init.patch \
            file://nfsserver \
            file://nfscommon \
            file://nfs-utils.conf \
@@ -31,11 +29,12 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
            file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \
            file://nfs-utils-debianize-start-statd.patch \
            file://bugfix-adjust-statd-service-name.patch \
-           file://0001-include-stdint.h-for-UINT16_MAX-definition.patch \
+           file://nfs-utils-musl-res_querydomain.patch \
+           file://nfs-utils-musl-limits.patch \
 "
 
-SRC_URI[md5sum] = "59dfcb2e6254b129f901f40c86086b13"
-SRC_URI[sha256sum] = "0faeb54c70b84e6bd3b9b6901544b1f6add8d246f35c1683e402daf4e0c719ef"
+SRC_URI[md5sum] = "d77b182a9ee396aa6221ac2401ad7046"
+SRC_URI[sha256sum] = "96d06b5a86b185815760d8f04c34fdface8fa8b9949ff256ac05c3ebc08335a5"
 
 # Only kernel-module-nfsd is required here (but can be built-in)  - the nfsd module will
 # pull in the remainder of the dependencies.
@@ -67,10 +66,11 @@ PACKAGECONFIG ??= "tcp-wrappers \
 "
 PACKAGECONFIG_remove_libc-musl = "tcp-wrappers"
 PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wrappers"
-PACKAGECONFIG[nfsidmap] = "--enable-nfsidmap,--disable-nfsidmap,keyutils"
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
 # libdevmapper is available in meta-oe
 PACKAGECONFIG[nfsv41] = "--enable-nfsv41,--disable-nfsv41,libdevmapper"
+# keyutils is available in meta-security
+PACKAGECONFIG[nfsv4] = "--enable-nfsv4,--disable-nfsv4,keyutils"
 
 PACKAGES =+ "${PN}-client ${PN}-mount ${PN}-stats"
 
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 5/5] ccache: 3.3.5 -> 3.4.2
  2018-07-03  4:11 [PATCH 0/5] Recipes upgrade Robert Yang
                   ` (3 preceding siblings ...)
  2018-07-03  4:11 ` [PATCH 4/5] nfs-utils: 2.1.1 -> 2.3.1 Robert Yang
@ 2018-07-03  4:11 ` Robert Yang
  4 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2018-07-03  4:11 UTC (permalink / raw)
  To: openembedded-core

* The license file is changed to LICENSE.adoc, it is still GPLv3+.
* Removed Revert-Create-man-page-in-the-make-install-from-git-.patch, it was
  used for fixing a build failure of no asciidoc, but now there is no such a
  failure, so remove it.
* Refreshed 0002-dev.mk.in-fix-file-name-too-long.patch

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/ccache/ccache_3.3.5.bb       | 12 --------
 meta/recipes-devtools/ccache/ccache_3.4.2.bb       | 11 ++++++++
 .../0002-dev.mk.in-fix-file-name-too-long.patch    | 15 +++++-----
 ...te-man-page-in-the-make-install-from-git-.patch | 33 ----------------------
 4 files changed, 19 insertions(+), 52 deletions(-)
 delete mode 100644 meta/recipes-devtools/ccache/ccache_3.3.5.bb
 create mode 100644 meta/recipes-devtools/ccache/ccache_3.4.2.bb
 delete mode 100644 meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch

diff --git a/meta/recipes-devtools/ccache/ccache_3.3.5.bb b/meta/recipes-devtools/ccache/ccache_3.3.5.bb
deleted file mode 100644
index 929f0f1..0000000
--- a/meta/recipes-devtools/ccache/ccache_3.3.5.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ccache.inc
-
-LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=dae379a85bb6e9d594773e0aa64876f6"
-
-SRC_URI[md5sum] = "eee58db7cce892febddb989308dc568f"
-SRC_URI[sha256sum] = "190576a6e938760ec8113523e6fd380141117303e90766cc4802e770422b30c6"
-
-SRC_URI += " \
-            file://0002-dev.mk.in-fix-file-name-too-long.patch \
-            file://Revert-Create-man-page-in-the-make-install-from-git-.patch \
-"
diff --git a/meta/recipes-devtools/ccache/ccache_3.4.2.bb b/meta/recipes-devtools/ccache/ccache_3.4.2.bb
new file mode 100644
index 0000000..7230934
--- /dev/null
+++ b/meta/recipes-devtools/ccache/ccache_3.4.2.bb
@@ -0,0 +1,11 @@
+require ccache.inc
+
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=2722abeaf1750dbf175b9491112374e1"
+
+SRC_URI[md5sum] = "9e048f88f3897125864f9a5e1abfb72d"
+SRC_URI[sha256sum] = "18a8b14367d63d3d37fb6c33cba60e1b7fcd7a63d608df97c9771ae0d234fee2"
+
+SRC_URI += " \
+            file://0002-dev.mk.in-fix-file-name-too-long.patch \
+"
diff --git a/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch b/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch
index 3f01c69..68c2371 100644
--- a/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch
+++ b/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch
@@ -1,4 +1,4 @@
-From 71bd0082c6edcf73f054a8a4fa34bd8dd4de7cd7 Mon Sep 17 00:00:00 2001
+From 7dab2995ed8eeccd7b0acd79668bc28f3a2427d5 Mon Sep 17 00:00:00 2001
 From: Robert Yang <liezhi.yang@windriver.com>
 Date: Wed, 16 Sep 2015 19:45:40 -0700
 Subject: [PATCH] dev.mk.in: fix file name too long
@@ -10,14 +10,15 @@ to fix the problem.
 Upstream-Status: Pending
 
 Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+
 ---
- dev.mk.in |    2 +-
+ dev.mk.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: ccache-3.3.4/dev.mk.in
-===================================================================
---- ccache-3.3.4.orig/dev.mk.in
-+++ ccache-3.3.4/dev.mk.in
+diff --git a/dev.mk.in b/dev.mk.in
+index 91b0a57..583ade0 100644
+--- a/dev.mk.in
++++ b/dev.mk.in
 @@ -1,7 +1,7 @@
  # GNU make syntax reigns in this file.
  
@@ -25,5 +26,5 @@ Index: ccache-3.3.4/dev.mk.in
 -all_cppflags += -MD -MP -MF .deps/$(subst .._,,$(subst /,_,$<)).d
 +all_cppflags += -MD -MP -MF .deps/$(subst .._,,$(subst /,_,$(subst $(srcdir)/,,$<))).d
  
+ A2X = a2x
  ASCIIDOC = asciidoc
- CPPCHECK = cppcheck
diff --git a/meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch b/meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch
deleted file mode 100644
index f0208b9..0000000
--- a/meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 94fabcdda5c7e54ccdbc1f0aeccb26ce30e61226 Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Mon, 18 Jul 2016 19:53:00 -0700
-Subject: [PATCH] Revert "Create man page in the make-install-from-git-repo
- case"
-
-This reverts commit b86784902d28defd5e475c8922de594787df4541.
-
-We dont' have asciidoc, so revert it.
-
-Upstream-Status: Inappropriate [OE-Core specific]
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index d474f2a..c6cdc04 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -76,7 +76,7 @@ ccache$(EXEEXT): $(ccache_objs) $(extra_libs)
- 	$(CC) $(all_cflags) -o $@ $(ccache_objs) $(LDFLAGS) $(extra_libs) $(LIBS)
- 
- .PHONY: install
--install: all $(srcdir)/ccache.1
-+install: all
- 	$(installcmd) -d $(DESTDIR)$(bindir)
- 	$(installcmd) -m 755 ccache$(EXEEXT) $(DESTDIR)$(bindir)
- 	$(installcmd) -d $(DESTDIR)$(mandir)/man1
--- 
-2.9.0
-
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 14+ messages in thread

* Re: [PATCH 4/5] nfs-utils: 2.1.1 -> 2.3.1
  2018-07-03  4:11 ` [PATCH 4/5] nfs-utils: 2.1.1 -> 2.3.1 Robert Yang
@ 2018-07-03 11:53   ` Burton, Ross
  2018-07-03 15:31     ` Robert Yang
  0 siblings, 1 reply; 14+ messages in thread
From: Burton, Ross @ 2018-07-03 11:53 UTC (permalink / raw)
  To: Robert Yang; +Cc: OE-core

Failing for me:

| checking for res_querydomain in -lresolv... no
| configure: error: res_querydomain needed
| NOTE: The following config.log files may provide further information.

Ross

On 3 July 2018 at 05:11, Robert Yang <liezhi.yang@windriver.com> wrote:
> * Removed 001-configure-Allow-to-explicitly-disable-nfsidmap.patch,
>   the nfsidmap is enabled when --enable-nfsv4, so I added a
>   PACKAGECONFIG[nfsv4], and default is no since keyutils is not in oe-core by
>   default.
>
> * Removed 0001-include-stdint.h-for-UINT16_MAX-definition.patch and
>   nfs-utils-1.2.3-sm-notify-res_init.patch since they are already in the
>   source.
>
> * Backported two patches from git://git.alpinelinux.org/aports to fix build with musl
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>  ...gure-Allow-to-explicitly-disable-nfsidmap.patch |  40 -------
>  ...nclude-stdint.h-for-UINT16_MAX-definition.patch |  27 -----
>  .../nfs-utils-1.2.3-sm-notify-res_init.patch       |  37 ------
>  .../nfs-utils/nfs-utils-musl-limits.patch          | 133 +++++++++++++++++++++
>  .../nfs-utils/nfs-utils-musl-res_querydomain.patch |  22 ++++
>  .../{nfs-utils_2.1.1.bb => nfs-utils_2.3.1.bb}     |  12 +-
>  6 files changed, 161 insertions(+), 110 deletions(-)
>  delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
>  delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
>  delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
>  create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch
>  create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch
>  rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.1.1.bb => nfs-utils_2.3.1.bb} (92%)
>
> diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
> deleted file mode 100644
> index 26b558c..0000000
> --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
> +++ /dev/null
> @@ -1,40 +0,0 @@
> -From 9b84cff305866abd150cf1a4c6e7e5ebf8a7eb3a Mon Sep 17 00:00:00 2001
> -From: Martin Jansa <Martin.Jansa@gmail.com>
> -Date: Fri, 15 Nov 2013 23:21:35 +0100
> -Subject: [PATCH] configure: Allow to explicitly disable nfsidmap
> -
> -* keyutils availability is autodetected and builds aren't reproducible
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ----
> - configure.ac | 10 +++++++++-
> - 1 file changed, 9 insertions(+), 1 deletion(-)
> -
> -Index: nfs-utils-2.1.1/configure.ac
> -===================================================================
> ---- nfs-utils-2.1.1.orig/configure.ac
> -+++ nfs-utils-2.1.1/configure.ac
> -@@ -92,6 +92,12 @@ AC_ARG_ENABLE(nfsv4,
> -       AC_SUBST(enable_nfsv4)
> -       AM_CONDITIONAL(CONFIG_NFSV4, [test "$enable_nfsv4" = "yes"])
> -
> -+AC_ARG_ENABLE(nfsidmap,
> -+        [AC_HELP_STRING([--enable-nfsidmap],
> -+                        [enable support for NFSv4 idmapper @<:@default=yes@:>@])],
> -+        enable_nfsidmap=$enableval,
> -+        enable_nfsidmap=yes)
> -+
> - AC_ARG_ENABLE(nfsv41,
> -       [AC_HELP_STRING([--disable-nfsv41],
> -                         [disable support for NFSv41 @<:@default=no@:>@])],
> -@@ -339,7 +345,7 @@ fi
> -
> - dnl enable nfsidmap when its support by libnfsidmap
> - AM_CONDITIONAL(CONFIG_NFSDCLTRACK, [test "$enable_nfsdcltrack" = "yes" ])
> --AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
> -+AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyesyes"])
> -
> -
> - if test "$knfsd_cv_glibc2" = no; then
> diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
> deleted file mode 100644
> index 235a2c7..0000000
> --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -From 36b48057bce76dced335d67a2894a420967811c9 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Sat, 20 May 2017 14:07:53 -0700
> -Subject: [PATCH] include stdint.h for UINT16_MAX definition
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> -Upstream-Status: Pending
> -
> - support/nsm/rpc.c | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/support/nsm/rpc.c b/support/nsm/rpc.c
> -index 4e5f40e..d91c6ea 100644
> ---- a/support/nsm/rpc.c
> -+++ b/support/nsm/rpc.c
> -@@ -40,6 +40,7 @@
> -
> - #include <time.h>
> - #include <stdbool.h>
> -+#include <stdint.h>
> - #include <string.h>
> - #include <unistd.h>
> - #include <fcntl.h>
> ---
> -2.13.0
> -
> diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
> deleted file mode 100644
> index 89a8a57..0000000
> --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -Fixes errors like
> -sm-notify[1070]: DNS resolution of a.b.c.d..com failed; retrying later
> -This error will occur anytime sm-notify is run before the network if fully up,
> -which is happening more and more with parallel startup systems.
> -The res_init() call is simple, safe, quick, and a patch to use it should be
> -able to go upstream.  Presumably the whole reason sm-notify tries several
> -times is to wait for possible changes to the network configuration, but without
> -calling res_init() it will never be aware of those changes
> -
> -Backported drom Fedora
> -
> -Upstream-Status: Pending
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -
> -
> -Index: nfs-utils-2.1.1/utils/statd/sm-notify.c
> -===================================================================
> ---- nfs-utils-2.1.1.orig/utils/statd/sm-notify.c
> -+++ nfs-utils-2.1.1/utils/statd/sm-notify.c
> -@@ -28,6 +28,9 @@
> - #include <netdb.h>
> - #include <errno.h>
> - #include <grp.h>
> -+#include <netinet/in.h>
> -+#include <arpa/nameser.h>
> -+#include <resolv.h>
> -
> - #include "conffile.h"
> - #include "sockaddr.h"
> -@@ -89,6 +92,7 @@ smn_lookup(const char *name)
> -       };
> -       int error;
> -
> -+      res_init();
> -       error = getaddrinfo(name, NULL, &hint, &ai);
> -       if (error != 0) {
> -               xlog(D_GENERAL, "getaddrinfo(3): %s", gai_strerror(error));
> diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch
> new file mode 100644
> index 0000000..7a4604b
> --- /dev/null
> +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch
> @@ -0,0 +1,133 @@
> +Fixed:
> +| file.c: In function 'generic_make_pathname':
> +| file.c:48:13: error: 'PATH_MAX' undeclared (first use in this function); did you mean 'RAND_MAX'?
> +|   if (size > PATH_MAX)
> +|              ^~~~~~~~
> +[snip]
> +
> +Upstream-Status: Backport [https://git.alpinelinux.org/cgit/aports/tree/main/nfs-utils/limits.patch?id=f6734a77d3caee73325f8cc1f77d1b5117a75096]
> +
> +Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> +---
> + support/export/export.c          | 1 +
> + support/export/xtab.c            | 1 +
> + support/misc/file.c              | 1 +
> + support/nfs/xcommon.c            | 1 +
> + support/nsm/file.c               | 1 +
> + utils/blkmapd/device-discovery.c | 1 +
> + utils/gssd/krb5_util.c           | 1 +
> + utils/mountd/cache.c             | 1 +
> + utils/mountd/mountd.c            | 1 +
> + utils/mountd/rmtab.c             | 1 +
> + 10 files changed, 10 insertions(+)
> +
> +diff --git a/support/export/export.c b/support/export/export.c
> +--- a/support/export/export.c
> ++++ b/support/export/export.c
> +@@ -17,6 +17,7 @@
> + #include <stdlib.h>
> + #include <dirent.h>
> + #include <errno.h>
> ++#include <limits.h>
> + #include "xmalloc.h"
> + #include "nfslib.h"
> + #include "exportfs.h"
> +diff --git a/support/export/xtab.c b/support/export/xtab.c
> +--- a/support/export/xtab.c
> ++++ b/support/export/xtab.c
> +@@ -18,6 +18,7 @@
> + #include <sys/stat.h>
> + #include <errno.h>
> + #include <libgen.h>
> ++#include <limits.h>
> +
> + #include "nfslib.h"
> + #include "exportfs.h"
> +diff --git a/support/misc/file.c b/support/misc/file.c
> +--- a/support/misc/file.c
> ++++ b/support/misc/file.c
> +@@ -27,6 +27,7 @@
> + #include <dirent.h>
> + #include <stdlib.h>
> + #include <stdbool.h>
> ++#include <limits.h>
> +
> + #include "xlog.h"
> + #include "misc.h"
> +diff --git a/support/nfs/xcommon.c b/support/nfs/xcommon.c
> +--- a/support/nfs/xcommon.c
> ++++ b/support/nfs/xcommon.c
> +@@ -16,6 +16,7 @@
> + #include <stdio.h>
> + #include <stdlib.h>
> + #include <string.h>
> ++#include <limits.h>
> +
> + #include "xcommon.h"
> + #include "nls.h"      /* _() */
> +diff --git a/support/nsm/file.c b/support/nsm/file.c
> +--- a/support/nsm/file.c
> ++++ b/support/nsm/file.c
> +@@ -85,6 +85,7 @@
> + #include <fcntl.h>
> + #include <dirent.h>
> + #include <grp.h>
> ++#include <limits.h>
> +
> + #include "xlog.h"
> + #include "nsm.h"
> +diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c
> +--- a/utils/blkmapd/device-discovery.c
> ++++ b/utils/blkmapd/device-discovery.c
> +@@ -49,6 +49,7 @@
> + #include <unistd.h>
> + #include <libgen.h>
> + #include <errno.h>
> ++#include <limits.h>
> + #include <libdevmapper.h>
> +
> + #ifdef HAVE_CONFIG_H
> +diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c
> +--- a/utils/gssd/krb5_util.c
> ++++ b/utils/gssd/krb5_util.c
> +@@ -120,6 +120,7 @@
> + #endif
> + #include <krb5.h>
> + #include <rpc/auth_gss.h>
> ++#include <limits.h>
> +
> + #include "gssd.h"
> + #include "err_util.h"
> +diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
> +--- a/utils/mountd/cache.c
> ++++ b/utils/mountd/cache.c
> +@@ -26,6 +26,7 @@
> + #include <pwd.h>
> + #include <grp.h>
> + #include <mntent.h>
> ++#include <limits.h>
> + #include "misc.h"
> + #include "nfslib.h"
> + #include "exportfs.h"
> +diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
> +--- a/utils/mountd/mountd.c
> ++++ b/utils/mountd/mountd.c
> +@@ -22,6 +22,7 @@
> + #include <fcntl.h>
> + #include <sys/resource.h>
> + #include <sys/wait.h>
> ++#include <limits.h>
> +
> + #include "conffile.h"
> + #include "xmalloc.h"
> +diff --git a/utils/mountd/rmtab.c b/utils/mountd/rmtab.c
> +--- a/utils/mountd/rmtab.c
> ++++ b/utils/mountd/rmtab.c
> +@@ -16,6 +16,7 @@
> + #include <netinet/in.h>
> + #include <arpa/inet.h>
> + #include <netdb.h>
> ++#include <limits.h>
> +
> + #include "misc.h"
> + #include "exportfs.h"
> diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch
> new file mode 100644
> index 0000000..7a93450
> --- /dev/null
> +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch
> @@ -0,0 +1,22 @@
> +Fixed:
> +configure: error: res_querydomain needed
> +
> +Upstream-Status: Backport [https://git.alpinelinux.org/cgit/aports/tree/main/nfs-utils/musl-res_querydomain.patch?id=f6734a77d3caee73325f8cc1f77d1b5117a75096]
> +
> +Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> +---
> + configure.ac | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -401,7 +401,7 @@ if test "$enable_gss" = yes; then
> + fi
> +
> + dnl libdnsidmap specific checks
> +-AC_CHECK_LIB([resolv], [__res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
> ++AC_CHECK_LIB([resolv], [res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
> +
> + AC_ARG_ENABLE([ldap],
> +       [AS_HELP_STRING([--disable-ldap],[Disable support for LDAP @<:default=detect@:>@])])
> diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.1.1.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb
> similarity index 92%
> rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.1.1.bb
> rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb
> index 79453ad..52edfb6 100644
> --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.1.1.bb
> +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb
> @@ -19,8 +19,6 @@ USERADD_PARAM_${PN}-client = "--system  --home-dir /var/lib/nfs \
>                               --shell /bin/false --user-group rpcuser"
>
>  SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.xz \
> -           file://0001-configure-Allow-to-explicitly-disable-nfsidmap.patch \
> -           file://nfs-utils-1.2.3-sm-notify-res_init.patch \
>             file://nfsserver \
>             file://nfscommon \
>             file://nfs-utils.conf \
> @@ -31,11 +29,12 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
>             file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \
>             file://nfs-utils-debianize-start-statd.patch \
>             file://bugfix-adjust-statd-service-name.patch \
> -           file://0001-include-stdint.h-for-UINT16_MAX-definition.patch \
> +           file://nfs-utils-musl-res_querydomain.patch \
> +           file://nfs-utils-musl-limits.patch \
>  "
>
> -SRC_URI[md5sum] = "59dfcb2e6254b129f901f40c86086b13"
> -SRC_URI[sha256sum] = "0faeb54c70b84e6bd3b9b6901544b1f6add8d246f35c1683e402daf4e0c719ef"
> +SRC_URI[md5sum] = "d77b182a9ee396aa6221ac2401ad7046"
> +SRC_URI[sha256sum] = "96d06b5a86b185815760d8f04c34fdface8fa8b9949ff256ac05c3ebc08335a5"
>
>  # Only kernel-module-nfsd is required here (but can be built-in)  - the nfsd module will
>  # pull in the remainder of the dependencies.
> @@ -67,10 +66,11 @@ PACKAGECONFIG ??= "tcp-wrappers \
>  "
>  PACKAGECONFIG_remove_libc-musl = "tcp-wrappers"
>  PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wrappers"
> -PACKAGECONFIG[nfsidmap] = "--enable-nfsidmap,--disable-nfsidmap,keyutils"
>  PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
>  # libdevmapper is available in meta-oe
>  PACKAGECONFIG[nfsv41] = "--enable-nfsv41,--disable-nfsv41,libdevmapper"
> +# keyutils is available in meta-security
> +PACKAGECONFIG[nfsv4] = "--enable-nfsv4,--disable-nfsv4,keyutils"
>
>  PACKAGES =+ "${PN}-client ${PN}-mount ${PN}-stats"
>
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 3/5] git: 2.16.1 -> 2.17.0
  2018-07-03  4:11 ` [PATCH 3/5] git: 2.16.1 -> 2.17.0 Robert Yang
@ 2018-07-03 12:42   ` Otavio Salvador
  2018-07-03 15:31     ` Robert Yang
  0 siblings, 1 reply; 14+ messages in thread
From: Otavio Salvador @ 2018-07-03 12:42 UTC (permalink / raw)
  To: Robert Yang; +Cc: Patches and discussions about the oe-core layer

On Tue, Jul 3, 2018 at 1:11 AM, Robert Yang <liezhi.yang@windriver.com> wrote:
> * Removed code for "${D}${exec_prefix}/lib/perl-native/perl" since there is no
>   such a directory now.
> * Fixed perl related code.
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>

Latest release is 2.18.0, it makes sense to upgrade to it except if
there is a reason to avoid it.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750


^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 4/5] nfs-utils: 2.1.1 -> 2.3.1
  2018-07-03 11:53   ` Burton, Ross
@ 2018-07-03 15:31     ` Robert Yang
  0 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2018-07-03 15:31 UTC (permalink / raw)
  To: Burton, Ross; +Cc: OE-core



On 07/03/2018 07:53 PM, Burton, Ross wrote:
> Failing for me:
> 
> | checking for res_querydomain in -lresolv... no
> | configure: error: res_querydomain needed
> | NOTE: The following config.log files may provide further information.
> 
> Ross

I'm sorry, that patch should be for musl only, I will fix it.

// Robert

> 
> On 3 July 2018 at 05:11, Robert Yang <liezhi.yang@windriver.com> wrote:
>> * Removed 001-configure-Allow-to-explicitly-disable-nfsidmap.patch,
>>    the nfsidmap is enabled when --enable-nfsv4, so I added a
>>    PACKAGECONFIG[nfsv4], and default is no since keyutils is not in oe-core by
>>    default.
>>
>> * Removed 0001-include-stdint.h-for-UINT16_MAX-definition.patch and
>>    nfs-utils-1.2.3-sm-notify-res_init.patch since they are already in the
>>    source.
>>
>> * Backported two patches from git://git.alpinelinux.org/aports to fix build with musl
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>>   ...gure-Allow-to-explicitly-disable-nfsidmap.patch |  40 -------
>>   ...nclude-stdint.h-for-UINT16_MAX-definition.patch |  27 -----
>>   .../nfs-utils-1.2.3-sm-notify-res_init.patch       |  37 ------
>>   .../nfs-utils/nfs-utils-musl-limits.patch          | 133 +++++++++++++++++++++
>>   .../nfs-utils/nfs-utils-musl-res_querydomain.patch |  22 ++++
>>   .../{nfs-utils_2.1.1.bb => nfs-utils_2.3.1.bb}     |  12 +-
>>   6 files changed, 161 insertions(+), 110 deletions(-)
>>   delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
>>   delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
>>   delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
>>   create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch
>>   create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch
>>   rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.1.1.bb => nfs-utils_2.3.1.bb} (92%)
>>
>> diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
>> deleted file mode 100644
>> index 26b558c..0000000
>> --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
>> +++ /dev/null
>> @@ -1,40 +0,0 @@
>> -From 9b84cff305866abd150cf1a4c6e7e5ebf8a7eb3a Mon Sep 17 00:00:00 2001
>> -From: Martin Jansa <Martin.Jansa@gmail.com>
>> -Date: Fri, 15 Nov 2013 23:21:35 +0100
>> -Subject: [PATCH] configure: Allow to explicitly disable nfsidmap
>> -
>> -* keyutils availability is autodetected and builds aren't reproducible
>> -
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>> ----
>> - configure.ac | 10 +++++++++-
>> - 1 file changed, 9 insertions(+), 1 deletion(-)
>> -
>> -Index: nfs-utils-2.1.1/configure.ac
>> -===================================================================
>> ---- nfs-utils-2.1.1.orig/configure.ac
>> -+++ nfs-utils-2.1.1/configure.ac
>> -@@ -92,6 +92,12 @@ AC_ARG_ENABLE(nfsv4,
>> -       AC_SUBST(enable_nfsv4)
>> -       AM_CONDITIONAL(CONFIG_NFSV4, [test "$enable_nfsv4" = "yes"])
>> -
>> -+AC_ARG_ENABLE(nfsidmap,
>> -+        [AC_HELP_STRING([--enable-nfsidmap],
>> -+                        [enable support for NFSv4 idmapper @<:@default=yes@:>@])],
>> -+        enable_nfsidmap=$enableval,
>> -+        enable_nfsidmap=yes)
>> -+
>> - AC_ARG_ENABLE(nfsv41,
>> -       [AC_HELP_STRING([--disable-nfsv41],
>> -                         [disable support for NFSv41 @<:@default=no@:>@])],
>> -@@ -339,7 +345,7 @@ fi
>> -
>> - dnl enable nfsidmap when its support by libnfsidmap
>> - AM_CONDITIONAL(CONFIG_NFSDCLTRACK, [test "$enable_nfsdcltrack" = "yes" ])
>> --AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
>> -+AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyesyes"])
>> -
>> -
>> - if test "$knfsd_cv_glibc2" = no; then
>> diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
>> deleted file mode 100644
>> index 235a2c7..0000000
>> --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
>> +++ /dev/null
>> @@ -1,27 +0,0 @@
>> -From 36b48057bce76dced335d67a2894a420967811c9 Mon Sep 17 00:00:00 2001
>> -From: Khem Raj <raj.khem@gmail.com>
>> -Date: Sat, 20 May 2017 14:07:53 -0700
>> -Subject: [PATCH] include stdint.h for UINT16_MAX definition
>> -
>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ----
>> -Upstream-Status: Pending
>> -
>> - support/nsm/rpc.c | 1 +
>> - 1 file changed, 1 insertion(+)
>> -
>> -diff --git a/support/nsm/rpc.c b/support/nsm/rpc.c
>> -index 4e5f40e..d91c6ea 100644
>> ---- a/support/nsm/rpc.c
>> -+++ b/support/nsm/rpc.c
>> -@@ -40,6 +40,7 @@
>> -
>> - #include <time.h>
>> - #include <stdbool.h>
>> -+#include <stdint.h>
>> - #include <string.h>
>> - #include <unistd.h>
>> - #include <fcntl.h>
>> ---
>> -2.13.0
>> -
>> diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
>> deleted file mode 100644
>> index 89a8a57..0000000
>> --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
>> +++ /dev/null
>> @@ -1,37 +0,0 @@
>> -Fixes errors like
>> -sm-notify[1070]: DNS resolution of a.b.c.d..com failed; retrying later
>> -This error will occur anytime sm-notify is run before the network if fully up,
>> -which is happening more and more with parallel startup systems.
>> -The res_init() call is simple, safe, quick, and a patch to use it should be
>> -able to go upstream.  Presumably the whole reason sm-notify tries several
>> -times is to wait for possible changes to the network configuration, but without
>> -calling res_init() it will never be aware of those changes
>> -
>> -Backported drom Fedora
>> -
>> -Upstream-Status: Pending
>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> -
>> -
>> -Index: nfs-utils-2.1.1/utils/statd/sm-notify.c
>> -===================================================================
>> ---- nfs-utils-2.1.1.orig/utils/statd/sm-notify.c
>> -+++ nfs-utils-2.1.1/utils/statd/sm-notify.c
>> -@@ -28,6 +28,9 @@
>> - #include <netdb.h>
>> - #include <errno.h>
>> - #include <grp.h>
>> -+#include <netinet/in.h>
>> -+#include <arpa/nameser.h>
>> -+#include <resolv.h>
>> -
>> - #include "conffile.h"
>> - #include "sockaddr.h"
>> -@@ -89,6 +92,7 @@ smn_lookup(const char *name)
>> -       };
>> -       int error;
>> -
>> -+      res_init();
>> -       error = getaddrinfo(name, NULL, &hint, &ai);
>> -       if (error != 0) {
>> -               xlog(D_GENERAL, "getaddrinfo(3): %s", gai_strerror(error));
>> diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch
>> new file mode 100644
>> index 0000000..7a4604b
>> --- /dev/null
>> +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch
>> @@ -0,0 +1,133 @@
>> +Fixed:
>> +| file.c: In function 'generic_make_pathname':
>> +| file.c:48:13: error: 'PATH_MAX' undeclared (first use in this function); did you mean 'RAND_MAX'?
>> +|   if (size > PATH_MAX)
>> +|              ^~~~~~~~
>> +[snip]
>> +
>> +Upstream-Status: Backport [https://git.alpinelinux.org/cgit/aports/tree/main/nfs-utils/limits.patch?id=f6734a77d3caee73325f8cc1f77d1b5117a75096]
>> +
>> +Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> +---
>> + support/export/export.c          | 1 +
>> + support/export/xtab.c            | 1 +
>> + support/misc/file.c              | 1 +
>> + support/nfs/xcommon.c            | 1 +
>> + support/nsm/file.c               | 1 +
>> + utils/blkmapd/device-discovery.c | 1 +
>> + utils/gssd/krb5_util.c           | 1 +
>> + utils/mountd/cache.c             | 1 +
>> + utils/mountd/mountd.c            | 1 +
>> + utils/mountd/rmtab.c             | 1 +
>> + 10 files changed, 10 insertions(+)
>> +
>> +diff --git a/support/export/export.c b/support/export/export.c
>> +--- a/support/export/export.c
>> ++++ b/support/export/export.c
>> +@@ -17,6 +17,7 @@
>> + #include <stdlib.h>
>> + #include <dirent.h>
>> + #include <errno.h>
>> ++#include <limits.h>
>> + #include "xmalloc.h"
>> + #include "nfslib.h"
>> + #include "exportfs.h"
>> +diff --git a/support/export/xtab.c b/support/export/xtab.c
>> +--- a/support/export/xtab.c
>> ++++ b/support/export/xtab.c
>> +@@ -18,6 +18,7 @@
>> + #include <sys/stat.h>
>> + #include <errno.h>
>> + #include <libgen.h>
>> ++#include <limits.h>
>> +
>> + #include "nfslib.h"
>> + #include "exportfs.h"
>> +diff --git a/support/misc/file.c b/support/misc/file.c
>> +--- a/support/misc/file.c
>> ++++ b/support/misc/file.c
>> +@@ -27,6 +27,7 @@
>> + #include <dirent.h>
>> + #include <stdlib.h>
>> + #include <stdbool.h>
>> ++#include <limits.h>
>> +
>> + #include "xlog.h"
>> + #include "misc.h"
>> +diff --git a/support/nfs/xcommon.c b/support/nfs/xcommon.c
>> +--- a/support/nfs/xcommon.c
>> ++++ b/support/nfs/xcommon.c
>> +@@ -16,6 +16,7 @@
>> + #include <stdio.h>
>> + #include <stdlib.h>
>> + #include <string.h>
>> ++#include <limits.h>
>> +
>> + #include "xcommon.h"
>> + #include "nls.h"      /* _() */
>> +diff --git a/support/nsm/file.c b/support/nsm/file.c
>> +--- a/support/nsm/file.c
>> ++++ b/support/nsm/file.c
>> +@@ -85,6 +85,7 @@
>> + #include <fcntl.h>
>> + #include <dirent.h>
>> + #include <grp.h>
>> ++#include <limits.h>
>> +
>> + #include "xlog.h"
>> + #include "nsm.h"
>> +diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c
>> +--- a/utils/blkmapd/device-discovery.c
>> ++++ b/utils/blkmapd/device-discovery.c
>> +@@ -49,6 +49,7 @@
>> + #include <unistd.h>
>> + #include <libgen.h>
>> + #include <errno.h>
>> ++#include <limits.h>
>> + #include <libdevmapper.h>
>> +
>> + #ifdef HAVE_CONFIG_H
>> +diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c
>> +--- a/utils/gssd/krb5_util.c
>> ++++ b/utils/gssd/krb5_util.c
>> +@@ -120,6 +120,7 @@
>> + #endif
>> + #include <krb5.h>
>> + #include <rpc/auth_gss.h>
>> ++#include <limits.h>
>> +
>> + #include "gssd.h"
>> + #include "err_util.h"
>> +diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
>> +--- a/utils/mountd/cache.c
>> ++++ b/utils/mountd/cache.c
>> +@@ -26,6 +26,7 @@
>> + #include <pwd.h>
>> + #include <grp.h>
>> + #include <mntent.h>
>> ++#include <limits.h>
>> + #include "misc.h"
>> + #include "nfslib.h"
>> + #include "exportfs.h"
>> +diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
>> +--- a/utils/mountd/mountd.c
>> ++++ b/utils/mountd/mountd.c
>> +@@ -22,6 +22,7 @@
>> + #include <fcntl.h>
>> + #include <sys/resource.h>
>> + #include <sys/wait.h>
>> ++#include <limits.h>
>> +
>> + #include "conffile.h"
>> + #include "xmalloc.h"
>> +diff --git a/utils/mountd/rmtab.c b/utils/mountd/rmtab.c
>> +--- a/utils/mountd/rmtab.c
>> ++++ b/utils/mountd/rmtab.c
>> +@@ -16,6 +16,7 @@
>> + #include <netinet/in.h>
>> + #include <arpa/inet.h>
>> + #include <netdb.h>
>> ++#include <limits.h>
>> +
>> + #include "misc.h"
>> + #include "exportfs.h"
>> diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch
>> new file mode 100644
>> index 0000000..7a93450
>> --- /dev/null
>> +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch
>> @@ -0,0 +1,22 @@
>> +Fixed:
>> +configure: error: res_querydomain needed
>> +
>> +Upstream-Status: Backport [https://git.alpinelinux.org/cgit/aports/tree/main/nfs-utils/musl-res_querydomain.patch?id=f6734a77d3caee73325f8cc1f77d1b5117a75096]
>> +
>> +Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> +---
>> + configure.ac | 2 +-
>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>> +
>> +diff --git a/configure.ac b/configure.ac
>> +--- a/configure.ac
>> ++++ b/configure.ac
>> +@@ -401,7 +401,7 @@ if test "$enable_gss" = yes; then
>> + fi
>> +
>> + dnl libdnsidmap specific checks
>> +-AC_CHECK_LIB([resolv], [__res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
>> ++AC_CHECK_LIB([resolv], [res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
>> +
>> + AC_ARG_ENABLE([ldap],
>> +       [AS_HELP_STRING([--disable-ldap],[Disable support for LDAP @<:default=detect@:>@])])
>> diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.1.1.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb
>> similarity index 92%
>> rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.1.1.bb
>> rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb
>> index 79453ad..52edfb6 100644
>> --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.1.1.bb
>> +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb
>> @@ -19,8 +19,6 @@ USERADD_PARAM_${PN}-client = "--system  --home-dir /var/lib/nfs \
>>                                --shell /bin/false --user-group rpcuser"
>>
>>   SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.xz \
>> -           file://0001-configure-Allow-to-explicitly-disable-nfsidmap.patch \
>> -           file://nfs-utils-1.2.3-sm-notify-res_init.patch \
>>              file://nfsserver \
>>              file://nfscommon \
>>              file://nfs-utils.conf \
>> @@ -31,11 +29,12 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
>>              file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \
>>              file://nfs-utils-debianize-start-statd.patch \
>>              file://bugfix-adjust-statd-service-name.patch \
>> -           file://0001-include-stdint.h-for-UINT16_MAX-definition.patch \
>> +           file://nfs-utils-musl-res_querydomain.patch \
>> +           file://nfs-utils-musl-limits.patch \
>>   "
>>
>> -SRC_URI[md5sum] = "59dfcb2e6254b129f901f40c86086b13"
>> -SRC_URI[sha256sum] = "0faeb54c70b84e6bd3b9b6901544b1f6add8d246f35c1683e402daf4e0c719ef"
>> +SRC_URI[md5sum] = "d77b182a9ee396aa6221ac2401ad7046"
>> +SRC_URI[sha256sum] = "96d06b5a86b185815760d8f04c34fdface8fa8b9949ff256ac05c3ebc08335a5"
>>
>>   # Only kernel-module-nfsd is required here (but can be built-in)  - the nfsd module will
>>   # pull in the remainder of the dependencies.
>> @@ -67,10 +66,11 @@ PACKAGECONFIG ??= "tcp-wrappers \
>>   "
>>   PACKAGECONFIG_remove_libc-musl = "tcp-wrappers"
>>   PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wrappers"
>> -PACKAGECONFIG[nfsidmap] = "--enable-nfsidmap,--disable-nfsidmap,keyutils"
>>   PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
>>   # libdevmapper is available in meta-oe
>>   PACKAGECONFIG[nfsv41] = "--enable-nfsv41,--disable-nfsv41,libdevmapper"
>> +# keyutils is available in meta-security
>> +PACKAGECONFIG[nfsv4] = "--enable-nfsv4,--disable-nfsv4,keyutils"
>>
>>   PACKAGES =+ "${PN}-client ${PN}-mount ${PN}-stats"
>>
>> --
>> 2.7.4
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
> 


^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 3/5] git: 2.16.1 -> 2.17.0
  2018-07-03 12:42   ` Otavio Salvador
@ 2018-07-03 15:31     ` Robert Yang
  0 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2018-07-03 15:31 UTC (permalink / raw)
  To: Otavio Salvador; +Cc: Patches and discussions about the oe-core layer



On 07/03/2018 08:42 PM, Otavio Salvador wrote:
> On Tue, Jul 3, 2018 at 1:11 AM, Robert Yang <liezhi.yang@windriver.com> wrote:
>> * Removed code for "${D}${exec_prefix}/lib/perl-native/perl" since there is no
>>    such a directory now.
>> * Fixed perl related code.
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> 
> Latest release is 2.18.0, it makes sense to upgrade to it except if
> there is a reason to avoid it.

Thanks, I will update it.

// Robert

> 


^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 1/5] automake: 1.15.1 -> 1.16.1
  2018-07-03  4:11 ` [PATCH 1/5] automake: 1.15.1 -> 1.16.1 Robert Yang
@ 2018-07-06  6:06   ` Khem Raj
  2018-07-06  6:11     ` Robert Yang
  2018-07-11  6:19     ` Robert Yang
  0 siblings, 2 replies; 14+ messages in thread
From: Khem Raj @ 2018-07-06  6:06 UTC (permalink / raw)
  To: Robert Yang; +Cc: Patches and discussions about the oe-core layer

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@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@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@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@gmail.com>
> ----
>  Upstream-Status: Submitted
> +Signed-off-by: Khem Raj <raj.khem@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@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@cisco.com>
> +Signed-off-by: Robert Yang <liezhi.yang@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@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@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@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@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@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@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@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@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 1/5] automake: 1.15.1 -> 1.16.1
  2018-07-06  6:06   ` Khem Raj
@ 2018-07-06  6:11     ` Robert Yang
  2018-07-11  6:19     ` Robert Yang
  1 sibling, 0 replies; 14+ messages in thread
From: Robert Yang @ 2018-07-06  6:11 UTC (permalink / raw)
  To: Khem Raj; +Cc: Patches and discussions about the oe-core layer



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

Sorry, I will check and fix them.

// Robert

> 
> 
> On Mon, Jul 2, 2018 at 9:02 PM Robert Yang <liezhi.yang@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@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@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@gmail.com>
>> ----
>>   Upstream-Status: Submitted
>> +Signed-off-by: Khem Raj <raj.khem@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@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@cisco.com>
>> +Signed-off-by: Robert Yang <liezhi.yang@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@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@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@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@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@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@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@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@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
> 


^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 1/5] automake: 1.15.1 -> 1.16.1
  2018-07-06  6:06   ` Khem Raj
  2018-07-06  6:11     ` Robert Yang
@ 2018-07-11  6:19     ` Robert Yang
  2018-07-11 20:00       ` Khem Raj
  1 sibling, 1 reply; 14+ messages in thread
From: Robert Yang @ 2018-07-11  6:19 UTC (permalink / raw)
  To: Khem Raj; +Cc: Patches and discussions about the oe-core layer

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

// 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@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@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@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@gmail.com>
>> ----
>>   Upstream-Status: Submitted
>> +Signed-off-by: Khem Raj <raj.khem@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@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@cisco.com>
>> +Signed-off-by: Robert Yang <liezhi.yang@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@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@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@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@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@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@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@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@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
> 


^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 1/5] automake: 1.15.1 -> 1.16.1
  2018-07-11  6:19     ` Robert Yang
@ 2018-07-11 20:00       ` Khem Raj
  0 siblings, 0 replies; 14+ messages in thread
From: Khem Raj @ 2018-07-11 20:00 UTC (permalink / raw)
  To: Robert Yang; +Cc: Patches and discussions about the oe-core layer

On Wed, Jul 11, 2018 at 12:15 AM Robert Yang <liezhi.yang@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@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@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@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@gmail.com>
> >> ----
> >>   Upstream-Status: Submitted
> >> +Signed-off-by: Khem Raj <raj.khem@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@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@cisco.com>
> >> +Signed-off-by: Robert Yang <liezhi.yang@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@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@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@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@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@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@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@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@lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-core
> >


^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2018-07-11 20:00 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-03  4:11 [PATCH 0/5] Recipes upgrade Robert Yang
2018-07-03  4:11 ` [PATCH 1/5] automake: 1.15.1 -> 1.16.1 Robert Yang
2018-07-06  6:06   ` Khem Raj
2018-07-06  6:11     ` Robert Yang
2018-07-11  6:19     ` Robert Yang
2018-07-11 20:00       ` Khem Raj
2018-07-03  4:11 ` [PATCH 2/5] e2fsprogs: 1.43.8 -> 1.44.2 Robert Yang
2018-07-03  4:11 ` [PATCH 3/5] git: 2.16.1 -> 2.17.0 Robert Yang
2018-07-03 12:42   ` Otavio Salvador
2018-07-03 15:31     ` Robert Yang
2018-07-03  4:11 ` [PATCH 4/5] nfs-utils: 2.1.1 -> 2.3.1 Robert Yang
2018-07-03 11:53   ` Burton, Ross
2018-07-03 15:31     ` Robert Yang
2018-07-03  4:11 ` [PATCH 5/5] ccache: 3.3.5 -> 3.4.2 Robert Yang

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.