Recipes upgrade

* 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 <[email protected]>

---
 ...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%)

meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch +9 -9

index 1221f13..deb1d03 100644
@@ -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 <[email protected]>
 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 <[email protected]>
----
 Upstream-Status: Submitted
+Signed-off-by: Khem Raj <[email protected]>
 
+---
  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',

meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch +16 -52

index 96b5a3d..1592c02 100644
@@ -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 <[email protected]>
 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 <[email protected]>
+Signed-off-by: Robert Yang <[email protected]>
+
 ---
- 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 '.';

meta/recipes-devtools/automake/automake/buildtest.patch +16 -4

index c32cd1f..b88b9e8 100644
@@ -1,13 +1,25 @@
+From a860b28069785aa5bf2fa9b671287de9af5004ff Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= <[email protected]>
+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 <[email protected]>
 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; \
  }

meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch +17 -5

index 2c6594f..1f71722 100644
@@ -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 <[email protected]>
+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 <[email protected]>
 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,/*$,,;
  }
+
+

meta/recipes-devtools/automake/automake/performance.patch +14 -5

index 3e6d569..a8ba659 100644
@@ -1,15 +1,24 @@
+From cd47c328cb53546891bb3dc7c9b2c54ed01cc6d1 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <[email protected]>
+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

meta/recipes-devtools/automake/automake/python-libdir.patch +8 -11

index 2a48b13..ee1f725 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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
-

meta/recipes-devtools/automake/automake_1.16.1.bb renamed from meta/recipes-devtools/automake/automake_1.15.1.bb +2 -3

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
@@ -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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

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

Quoted 387 lines

* 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 <[email protected]>

---
  ...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%)

meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch +9 -9

index 1221f13..deb1d03 100644
@@ -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 <[email protected]>
  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 <[email protected]>
----
  Upstream-Status: Submitted
+Signed-off-by: Khem Raj <[email protected]>
 
+---
   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',

meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch +16 -52

index 96b5a3d..1592c02 100644
@@ -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 <[email protected]>
  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 <[email protected]>
+Signed-off-by: Robert Yang <[email protected]>
+
  ---
- 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 '.';

meta/recipes-devtools/automake/automake/buildtest.patch +16 -4

index c32cd1f..b88b9e8 100644
@@ -1,13 +1,25 @@
+From a860b28069785aa5bf2fa9b671287de9af5004ff Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= <[email protected]>
+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 <[email protected]>
  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; \
   }

meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch +17 -5

index 2c6594f..1f71722 100644
@@ -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 <[email protected]>
+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 <[email protected]>
  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,/*$,,;
   }
+
+

meta/recipes-devtools/automake/automake/performance.patch +14 -5

index 3e6d569..a8ba659 100644
@@ -1,15 +1,24 @@
+From cd47c328cb53546891bb3dc7c9b2c54ed01cc6d1 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <[email protected]>
+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

meta/recipes-devtools/automake/automake/python-libdir.patch +8 -11

index 2a48b13..ee1f725 100644
@@ -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 <[email protected]>
  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 <[email protected]>
   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
-

meta/recipes-devtools/automake/automake_1.16.1.bb renamed from meta/recipes-devtools/automake/automake_1.15.1.bb +2 -3

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
@@ -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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

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

Quoted 387 lines · Robert Yang

* 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 <[email protected]>

---
  ...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%)

meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch +9 -9

index 1221f13..deb1d03 100644
@@ -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 <[email protected]>
  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 <[email protected]>
----
  Upstream-Status: Submitted
+Signed-off-by: Khem Raj <[email protected]>
 
+---
   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',

meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch +16 -52

index 96b5a3d..1592c02 100644
@@ -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 <[email protected]>
  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 <[email protected]>
+Signed-off-by: Robert Yang <[email protected]>
+
  ---
- 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 '.';

meta/recipes-devtools/automake/automake/buildtest.patch +16 -4

index c32cd1f..b88b9e8 100644
@@ -1,13 +1,25 @@
+From a860b28069785aa5bf2fa9b671287de9af5004ff Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= <[email protected]>
+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 <[email protected]>
  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; \
   }

meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch +17 -5

index 2c6594f..1f71722 100644
@@ -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 <[email protected]>
+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 <[email protected]>
  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,/*$,,;
   }
+
+

meta/recipes-devtools/automake/automake/performance.patch +14 -5

index 3e6d569..a8ba659 100644
@@ -1,15 +1,24 @@
+From cd47c328cb53546891bb3dc7c9b2c54ed01cc6d1 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <[email protected]>
+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

meta/recipes-devtools/automake/automake/python-libdir.patch +8 -11

index 2a48b13..ee1f725 100644
@@ -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 <[email protected]>
  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 <[email protected]>
   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
-

meta/recipes-devtools/automake/automake_1.16.1.bb renamed from meta/recipes-devtools/automake/automake_1.15.1.bb +2 -3

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
@@ -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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

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

Quoted 395 lines · Khem Raj

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

Quoted 387 lines · Robert Yang

* 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 <[email protected]>

---
  ...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%)

meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch +9 -9

index 1221f13..deb1d03 100644
@@ -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 <[email protected]>
  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 <[email protected]>
----
  Upstream-Status: Submitted
+Signed-off-by: Khem Raj <[email protected]>
 
+---
   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',

meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch +16 -52

index 96b5a3d..1592c02 100644
@@ -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 <[email protected]>
  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 <[email protected]>
+Signed-off-by: Robert Yang <[email protected]>
+
  ---
- 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 '.';

meta/recipes-devtools/automake/automake/buildtest.patch +16 -4

index c32cd1f..b88b9e8 100644
@@ -1,13 +1,25 @@
+From a860b28069785aa5bf2fa9b671287de9af5004ff Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= <[email protected]>
+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 <[email protected]>
  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; \
   }

meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch +17 -5

index 2c6594f..1f71722 100644
@@ -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 <[email protected]>
+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 <[email protected]>
  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,/*$,,;
   }
+
+

meta/recipes-devtools/automake/automake/performance.patch +14 -5

index 3e6d569..a8ba659 100644
@@ -1,15 +1,24 @@
+From cd47c328cb53546891bb3dc7c9b2c54ed01cc6d1 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <[email protected]>
+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

meta/recipes-devtools/automake/automake/python-libdir.patch +8 -11

index 2a48b13..ee1f725 100644
@@ -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 <[email protected]>
  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 <[email protected]>
   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
-

meta/recipes-devtools/automake/automake_1.16.1.bb renamed from meta/recipes-devtools/automake/automake_1.15.1.bb +2 -3

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
@@ -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
[email protected]
http://lists.openembedded.org/mailman/listinfo/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 <[email protected]>

Quoted 5 lines · Robert Yang

* 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 <[email protected]>

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

* 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 <[email protected]>

---
 ...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%)

meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch deleted +0 -40

deleted file mode 100644
index 26b558c..0000000
@@ -1,40 +0,0 @@
-From 9b84cff305866abd150cf1a4c6e7e5ebf8a7eb3a Mon Sep 17 00:00:00 2001
-From: Martin Jansa <[email protected]>
-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 <[email protected]>
----
- 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

meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch deleted +0 -27

deleted file mode 100644
index 235a2c7..0000000
@@ -1,27 +0,0 @@
-From 36b48057bce76dced335d67a2894a420967811c9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sat, 20 May 2017 14:07:53 -0700
-Subject: [PATCH] include stdint.h for UINT16_MAX definition
-
-Signed-off-by: Khem Raj <[email protected]>
----
-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
-

meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch deleted +0 -37

deleted file mode 100644
index 89a8a57..0000000
@@ -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 <[email protected]>
-
-
-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));

meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch new file +133 -0

new file mode 100644
index 0000000..7a4604b
@@ -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 <[email protected]>
+---
+ 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"

meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch new file +22 -0

new file mode 100644
index 0000000..7a93450
@@ -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 <[email protected]>
+---
+ 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@:>@])])

meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb renamed from meta/recipes-connectivity/nfs-utils/nfs-utils_2.1.1.bb +6 -7

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
@@ -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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-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

Quoted 369 lines

* 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 <[email protected]>

---
  ...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%)

meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch deleted +0 -40

deleted file mode 100644
index 26b558c..0000000
@@ -1,40 +0,0 @@
-From 9b84cff305866abd150cf1a4c6e7e5ebf8a7eb3a Mon Sep 17 00:00:00 2001
-From: Martin Jansa <[email protected]>
-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 <[email protected]>
----
- 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

meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch deleted +0 -27

deleted file mode 100644
index 235a2c7..0000000
@@ -1,27 +0,0 @@
-From 36b48057bce76dced335d67a2894a420967811c9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sat, 20 May 2017 14:07:53 -0700
-Subject: [PATCH] include stdint.h for UINT16_MAX definition
-
-Signed-off-by: Khem Raj <[email protected]>
----
-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
-

meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch deleted +0 -37

deleted file mode 100644
index 89a8a57..0000000
@@ -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 <[email protected]>
-
-
-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));

meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch new file +133 -0

new file mode 100644
index 0000000..7a4604b
@@ -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 <[email protected]>
+---
+ 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"

meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch new file +22 -0

new file mode 100644
index 0000000..7a93450
@@ -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 <[email protected]>
+---
+ 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@:>@])])

meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb renamed from meta/recipes-connectivity/nfs-utils/nfs-utils_2.1.1.bb +6 -7

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
@@ -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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core