Skip to contentSkip to conversation

python3: update to 3.8.1

PATCH In review Alexander Kanavin 6 participants 40 messages Jan 20, 2020 – Jan 24, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/24 python3: update to 3.8.1

Drop backports, rebase other patches.

0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch is removed as the use case (allowing python 2 and 3 to coexist in SDKs) is no longer relevant with Python 2.x reaching end of line and upstream has refactored the code making a rebase difficult. If needed, please re-add the patch to py2, rather than py3.

Python 3.8 no longer adds "m" to "3.8" in paths, so adjust the recipes and classes accordingly.

The manifest for the 3.8.0 version is updated; particularly pkgutil module is now packaged in -core (as other things in core need it); this also necessitates allowing empty -pkgutil package to avoid breakage across layers.

---
 meta/classes/python3-dir.bbclass              |   4 +-
 ...ib-termcap-to-linker-flags-to-avoid-.patch |  14 +-
 ...lib-as-location-for-site-packages-an.patch | 156 ++++++++------
 ...-detection-of-mips-architecture-for-.patch |  16 +-
 ...fig-append-STAGING_LIBDIR-python-sys.patch |   8 +-
 ...ON3HOME-is-set-use-instead-of-PYTHON.patch |  47 -----
 ...asename-to-replace-CC-for-checking-c.patch |  37 ++--
 ...sing-libraries-to-Extension-for-mul.patch} |  41 ++--
 ...runtime-test-to-get-float-byte-order.patch | 199 ------------------
 ...report-missing-dependencies-for-disa.patch |  11 +-
 ...tutils-prefix-is-inside-staging-area.patch |  10 +-
 .../python3/avoid_warning_about_tkinter.patch |  33 ++-
 .../python/python3/python-config.patch        |  24 ++-
 .../python/python3/python3-manifest.json      | 106 +++++-----
 .../{python3_3.7.6.bb => python3_3.8.1.bb}    |  30 ++-
 15 files changed, 249 insertions(+), 487 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch
 rename meta/recipes-devtools/python/python3/{0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch => 0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch} (60%)
 delete mode 100644 meta/recipes-devtools/python/python3/0002-Don-t-do-runtime-test-to-get-float-byte-order.patch
 rename meta/recipes-devtools/python/{python3_3.7.6.bb => python3_3.8.1.bb} (92%)
meta/classes/python3-dir.bbclass +2 -2
index 7dd130bad99..036d7140d99 100644
@@ -1,5 +1,5 @@
-PYTHON_BASEVERSION = "3.7"
-PYTHON_ABI = "m"
+PYTHON_BASEVERSION = "3.8"
+PYTHON_ABI = ""
 PYTHON_DIR = "python${PYTHON_BASEVERSION}"
 PYTHON_PN = "python3"
 PYTHON_SITEPACKAGES_DIR = "${libdir}/${PYTHON_DIR}/site-packages"
meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch +7 -7
index 09f279ba1d7..59592821d7f 100644
@@ -1,4 +1,4 @@
-From 23294c6ba6896115828293fdb7e67b47b38ba675 Mon Sep 17 00:00:00 2001
+From 039c53dd5baddec3359a05be0bff46a3b32bbb84 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Fri, 25 Jan 2019 19:04:13 +0100
 Subject: [PATCH] Do not add /usr/lib/termcap to linker flags to avoid host
@@ -12,14 +12,14 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  1 file changed, 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index b4357e3..fbec00d 100644
+index 20d7f35..ab18ff0 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -856,7 +856,6 @@ class PyBuildExt(build_ext):
+@@ -957,7 +957,6 @@ class PyBuildExt(build_ext):
                                                       'termcap'):
                  readline_libs.append('termcap')
-             exts.append( Extension('readline', ['readline.c'],
--                                   library_dirs=['/usr/lib/termcap'],
-                                    extra_link_args=readline_extra_link_args,
-                                    libraries=readline_libs) )
+             self.add(Extension('readline', ['readline.c'],
+-                               library_dirs=['/usr/lib/termcap'],
+                                extra_link_args=readline_extra_link_args,
+                                libraries=readline_libs))
          else:
meta/recipes-devtools/python/python3/0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch +87 -69

232 lines not on this page · raw message

meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch +8 -8
index e7af88654da..fe0aa8aabed 100644
@@ -1,4 +1,4 @@
-From 7535c39951b9d15dd64c4669092a8582ba555466 Mon Sep 17 00:00:00 2001
+From 2581ebe3cd9686089aed223651e1b8bf0b862b48 Mon Sep 17 00:00:00 2001
 From: Matthias Schoepfer <[email protected]>
 Date: Fri, 31 May 2019 15:34:34 +0200
 Subject: [PATCH] bpo-36852: proper detection of mips architecture for soft
@@ -12,15 +12,16 @@ to do this in a more autoconf/autotools manner.
 
 Upstream-Status: Submitted [https://github.com/python/cpython/pull/13196]
 Signed-off-by: Matthias Schoepfer <[email protected]>
+
 ---
- configure.ac | 169 ++++++---------------------------------------------
- 1 file changed, 17 insertions(+), 152 deletions(-)
+ configure.ac | 171 +++++----------------------------------------------
+ 1 file changed, 17 insertions(+), 154 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index a7de901e08..a73e2de51b 100644
+index 0f85486..0ca7e24 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -727,158 +727,23 @@ fi
+@@ -704,160 +704,23 @@ fi
  MULTIARCH=$($CC --print-multiarch 2>/dev/null)
  AC_SUBST(MULTIARCH)
  
@@ -163,6 +164,8 @@ index a7de901e08..a73e2de51b 100644
 -        i386-gnu
 -#elif defined(__APPLE__)
 -        darwin
+-#elif defined(__VXWORKS__)
+-        vxworks
 -#else
 -# error unknown platform triplet
 -#endif
@@ -196,6 +199,3 @@ index a7de901e08..a73e2de51b 100644
  
  if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
    if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
--- 
-2.21.0
-
meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch +4 -4
index 1709011be8a..03719cafcdf 100644
@@ -1,4 +1,4 @@
-From eff903c600f4c40f5753e95ab1557126fc6e0c9c Mon Sep 17 00:00:00 2001
+From 14eecf00459c0af698ed811e4f8bea460aada681 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Thu, 31 Jan 2019 16:46:30 +0100
 Subject: [PATCH] distutils/sysconfig: append
@@ -15,10 +15,10 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  2 files changed, 4 insertions(+)
 
 diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
-index 0a034ee..3dfd0a3 100644
+index b51629e..2df348c 100644
 --- a/Lib/distutils/sysconfig.py
 +++ b/Lib/distutils/sysconfig.py
-@@ -439,6 +439,8 @@ def _init_posix():
+@@ -438,6 +438,8 @@ def _init_posix():
          platform=sys.platform,
          multiarch=getattr(sys.implementation, '_multiarch', ''),
      ))
@@ -28,7 +28,7 @@ index 0a034ee..3dfd0a3 100644
      build_time_vars = _temp.build_time_vars
      global _config_vars
 diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index 87fa5e6..756a41c 100644
+index b2d790b..405273c 100644
 --- a/Lib/sysconfig.py
 +++ b/Lib/sysconfig.py
 @@ -419,6 +419,8 @@ def _init_posix(vars):
meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch deleted +0 -47

47 lines not on this page · raw message

meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch +19 -18
index a0ea897f4e8..fb10ca94b31 100644
@@ -1,4 +1,4 @@
-From 2645317fef09afe31b01bb2c1d4fe5b9afdbb11a Mon Sep 17 00:00:00 2001
+From 994783da5c21cab81b6589ed2d4275e665a946f9 Mon Sep 17 00:00:00 2001
 From: Changqing Li <[email protected]>
 Date: Mon, 22 Oct 2018 15:19:51 +0800
 Subject: [PATCH] python3: use cc_basename to replace CC for checking compiler
@@ -21,12 +21,13 @@ Signed-off-by: Li Zhou <[email protected]>
 patch originally from Li Zhou, I just rework it to new version
 
 Signed-off-by: Changqing Li <[email protected]>
+
 ---
  configure.ac | 19 ++++++++++---------
  1 file changed, 10 insertions(+), 9 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index a7de901..4a3681f 100644
+index a189d42..0f85486 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -54,6 +54,7 @@ AC_CONFIG_HEADER(pyconfig.h)
@@ -37,7 +38,7 @@ index a7de901..4a3681f 100644
  
  # pybuilddir.txt will be created by --generate-posix-vars in the Makefile
  rm -f pybuilddir.txt
-@@ -695,7 +696,7 @@ AC_MSG_RESULT($with_cxx_main)
+@@ -671,7 +672,7 @@ AC_MSG_RESULT($with_cxx_main)
  preset_cxx="$CXX"
  if test -z "$CXX"
  then
@@ -46,7 +47,7 @@ index a7de901..4a3681f 100644
          gcc)    AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;;
          cc)     AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;;
          clang|*/clang)     AC_PATH_TOOL(CXX, [clang++], [clang++], [notfound]) ;;
-@@ -979,7 +980,7 @@ rmdir CaseSensitiveTestDir
+@@ -957,7 +958,7 @@ rmdir CaseSensitiveTestDir
  
  case $ac_sys_system in
  hp*|HP*)
@@ -55,7 +56,7 @@ index a7de901..4a3681f 100644
      cc|*/cc) CC="$CC -Ae";;
      esac;;
  esac
-@@ -1336,7 +1337,7 @@ else
+@@ -1335,7 +1336,7 @@ else
  fi],
  [AC_MSG_RESULT(no)])
  if test "$Py_LTO" = 'true' ; then
@@ -64,7 +65,7 @@ index a7de901..4a3681f 100644
      *clang*)
        AC_SUBST(LLVM_AR)
        AC_PATH_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path})
-@@ -1426,7 +1427,7 @@ then
+@@ -1425,7 +1426,7 @@ then
    fi
  fi
  LLVM_PROF_ERR=no
@@ -73,16 +74,16 @@ index a7de901..4a3681f 100644
    *clang*)
      # Any changes made here should be reflected in the GCC+Darwin case below
      PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
-@@ -1500,7 +1501,7 @@ then
-            WRAP="-fwrapv"
-         fi
+@@ -1486,7 +1487,7 @@ esac
+ # compiler and platform.  BASECFLAGS tweaks need to be made even if the
+ # user set OPT.
  
--        case $CC in
-+        case $cc_basename in
-             *clang*)
-                 cc_is_clang=1
-                 ;;
-@@ -1623,7 +1624,7 @@ yes)
+-case $CC in
++case $cc_basename in
+     *clang*)
+         cc_is_clang=1
+         ;;
+@@ -1622,7 +1623,7 @@ yes)
  
      # ICC doesn't recognize the option, but only emits a warning
      ## XXX does it emit an unused result warning and can it be disabled?
@@ -91,7 +92,7 @@ index a7de901..4a3681f 100644
      *icc*)
      ac_cv_disable_unused_result_warning=no
      ;;
-@@ -1965,7 +1966,7 @@ yes)
+@@ -1943,7 +1944,7 @@ yes)
  esac
  
  # ICC needs -fp-model strict or floats behave badly
@@ -100,7 +101,7 @@ index a7de901..4a3681f 100644
  *icc*)
      CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict"
      ;;
-@@ -2727,7 +2728,7 @@ then
+@@ -2711,7 +2712,7 @@ then
  		then
  			LINKFORSHARED="-Wl,--export-dynamic"
  		fi;;
@@ -109,7 +110,7 @@ index a7de901..4a3681f 100644
  		  *gcc*)
  		    if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
  		    then
-@@ -5429,7 +5430,7 @@ if test "$have_gcc_asm_for_x87" = yes; then
+@@ -5362,7 +5363,7 @@ if test "$have_gcc_asm_for_x87" = yes; then
      # Some versions of gcc miscompile inline asm:
      # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491
      # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html
meta/recipes-devtools/python/python3/0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch renamed from meta/recipes-devtools/python/python3/0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch +15 -26

56 lines not on this page · raw message

meta/recipes-devtools/python/python3/0002-Don-t-do-runtime-test-to-get-float-byte-order.patch deleted +0 -199

199 lines not on this page · raw message

meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch +6 -5
index c15295c034c..4bd98f62fd6 100644
@@ -1,4 +1,4 @@
-From e3b59cb9658e1d3efa3535840939a0fa92a70a5a Mon Sep 17 00:00:00 2001
+From a2dd127b4163aff6cc35af0d0251321964232ad4 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Mon, 7 Oct 2019 13:22:14 +0200
 Subject: [PATCH] setup.py: do not report missing dependencies for disabled
@@ -10,22 +10,23 @@ build completeness checker which relies on the report.
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <[email protected]>
+
 ---
  setup.py | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/setup.py b/setup.py
-index 4b53668..0097643 100644
+index 7691258..ec3f2a4 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -365,6 +365,10 @@ class PyBuildExt(build_ext):
+@@ -408,6 +408,10 @@ class PyBuildExt(build_ext):
                  print("%-*s   %-*s   %-*s" % (longest, e, longest, f,
                                                longest, g))
  
 +        # There is no need to report missing module dependencies,
 +        # if the modules have been disabled in the first place.
-+        missing = list(set(missing) - set(sysconf_dis))
++        self.missing = list(set(self.missing) - set(sysconf_dis))
 +
-         if missing:
+         if self.missing:
              print()
              print("Python build finished successfully!")
meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +5 -5
index d49604ba4d9..3105f0d1760 100644
@@ -1,4 +1,4 @@
-From a274ba778838824efcacaba57c415b7262f779ec Mon Sep 17 00:00:00 2001
+From 6ca960869738fc89041a2e672d8e28b51e73d3c6 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Tue, 14 May 2013 15:00:26 -0700
 Subject: [PATCH] python3: Add target and native recipes
@@ -18,10 +18,10 @@ Upstream-Status: Inappropriate [embedded specific]
  1 file changed, 11 insertions(+), 3 deletions(-)
 
 diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
-index 3dfd0a3..6c6b09a 100644
+index 2df348c..4f8db84 100644
 --- a/Lib/distutils/sysconfig.py
 +++ b/Lib/distutils/sysconfig.py
-@@ -97,7 +97,9 @@ def get_python_inc(plat_specific=0, prefix=None):
+@@ -96,7 +96,9 @@ def get_python_inc(plat_specific=0, prefix=None):
      If 'prefix' is supplied, use it instead of sys.base_prefix or
      sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
      """
@@ -32,7 +32,7 @@ index 3dfd0a3..6c6b09a 100644
          prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
      if os.name == "posix":
          if python_build:
-@@ -140,7 +142,13 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
+@@ -139,7 +141,13 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
      If 'prefix' is supplied, use it instead of sys.base_prefix or
      sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
      """
@@ -47,7 +47,7 @@ index 3dfd0a3..6c6b09a 100644
          if standard_lib:
              prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
          else:
-@@ -148,7 +156,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
+@@ -147,7 +155,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
  
      if os.name == "posix":
          libpython = os.path.join(prefix,
meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch +14 -19
index 24e67b4ca14..184540e794c 100644
@@ -1,4 +1,4 @@
-From fead48c8b501a8d7c3db21df2e599f90f38f11d3 Mon Sep 17 00:00:00 2001
+From ba7202700578d435b07cfdfb7b57e83185752800 Mon Sep 17 00:00:00 2001
 From: Andrei Gherzan <[email protected]>
 Date: Mon, 28 Jan 2019 15:57:54 +0000
 Subject: [PATCH] _tkinter module needs tk module along with tcl. tk is not yet
@@ -11,26 +11,21 @@ Also simply disable the tk module since its not in DEPENDS.
 Signed-off-by: Andrei Gherzan <[email protected]>
 
 ---
- setup.py | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
+ setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index fbec00d..b7a36a6 100644
+index ab18ff0..7691258 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -1623,10 +1623,12 @@ class PyBuildExt(build_ext):
-         self.extensions.extend(exts)
+@@ -1706,8 +1706,8 @@ class PyBuildExt(build_ext):
+         self.detect_decimal()
+         self.detect_ctypes()
+         self.detect_multiprocessing()
+-        if not self.detect_tkinter():
+-            self.missing.append('_tkinter')
++#        if not self.detect_tkinter():
++#            self.missing.append('_tkinter')
+         self.detect_uuid()
  
-         # Call the method for detecting whether _tkinter can be compiled
--        self.detect_tkinter(inc_dirs, lib_dirs)
-+        # self.detect_tkinter(inc_dirs, lib_dirs)
- 
--        if '_tkinter' not in [e.name for e in self.extensions]:
--            missing.append('_tkinter')
-+        # tkinter module will not be avalaible as yocto
-+        # doesn't have tk integrated (yet)
-+        #if '_tkinter' not in [e.name for e in self.extensions]:
-+        #    missing.append('_tkinter')
- 
-         # Build the _uuid module if possible
-         uuid_incs = find_file("uuid.h", inc_dirs, ["/usr/include/uuid"])
+ ##         # Uncomment these lines if you want to play with xxmodule.c
meta/recipes-devtools/python/python3/python-config.patch +16 -8
index f23b8b7df06..c8a8f3d4aa3 100644
@@ -1,4 +1,7 @@
-python-config: Revert to using distutils.sysconfig
+From 07df0ae0d70cba6d1847fe1c24a71063930bec60 Mon Sep 17 00:00:00 2001
+From: Tyler Hall <[email protected]>
+Date: Sun, 4 May 2014 20:06:43 -0400
+Subject: [PATCH] python-config: Revert to using distutils.sysconfig
 
 The newer sysconfig module shares some code with distutils.sysconfig, but the same modifications as in
 
@@ -12,11 +15,16 @@ Upstream-Status: Inappropriate [Embedded Specific]
 
 Signed-off-by: Tyler Hall <[email protected]>
 :
-Index: Python-3.3.3/Misc/python-config.in
-===================================================================
---- Python-3.3.3.orig/Misc/python-config.in
-+++ Python-3.3.3/Misc/python-config.in
-@@ -4,7 +4,7 @@
+
+---
+ Misc/python-config.in | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Misc/python-config.in b/Misc/python-config.in
+index 727c4a8..c702829 100644
+--- a/Misc/python-config.in
++++ b/Misc/python-config.in
+@@ -6,7 +6,7 @@
  import getopt
  import os
  import sys
@@ -24,8 +32,8 @@ Index: Python-3.3.3/Misc/python-config.in
 +from distutils import sysconfig
  
  valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags',
-               'ldflags', 'extension-suffix', 'help', 'abiflags', 'configdir']
-@@ -32,14 +32,14 @@ if '--help' in opt_flags:
+               'ldflags', 'extension-suffix', 'help', 'abiflags', 'configdir',
+@@ -35,14 +35,14 @@ if '--help' in opt_flags:
  
  for opt in opt_flags:
      if opt == '--prefix':
meta/recipes-devtools/python/python3/python3-manifest.json +52 -54

319 lines not on this page · raw message

meta/recipes-devtools/python/python3_3.8.1.bb renamed from meta/recipes-devtools/python/python3_3.7.6.bb +14 -16
similarity index 92%
rename from meta/recipes-devtools/python/python3_3.7.6.bb
rename to meta/recipes-devtools/python/python3_3.8.1.bb
index 8a03260f3f9..a798f9828a6 100644
@@ -19,8 +19,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
            file://0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch \
            file://0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch \
            file://0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch \
-           file://0002-Don-t-do-runtime-test-to-get-float-byte-order.patch \
-           file://0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \
            file://0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch \
            file://0001-Makefile-fix-Issue36464-parallel-build-race-problem.patch \
            file://0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch \
@@ -29,18 +27,16 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
            file://0001-Use-FLAG_REF-always-for-interned-strings.patch \
            file://0001-test_locale.py-correct-the-test-output-format.patch \
            file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \
+           file://0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \
            "
 
 SRC_URI_append_class-native = " \
            file://0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch \
            file://12-distutils-prefix-is-inside-staging-area.patch \
            "
-SRC_URI_append_class-nativesdk = " \
-           file://0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch \
-           "
 
-SRC_URI[md5sum] = "c08fbee72ad5c2c95b0f4e44bf6fd72c"
-SRC_URI[sha256sum] = "55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f"
+SRC_URI[md5sum] = "b3fb85fd479c0bf950c626ef80cacb57"
+SRC_URI[sha256sum] = "75894117f6db7051c1b34f37410168844bbb357c139a8a10a352e9bf8be594e8"
 
 # exclude pre-releases for both python 2.x and 3.x
 UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
@@ -50,8 +46,7 @@ CVE_PRODUCT = "python"
 # This is not exploitable when glibc has CVE-2016-10739 fixed.
 CVE_CHECK_WHITELIST += "CVE-2019-18348"
 
-PYTHON_MAJMIN = "3.7"
-PYTHON_BINABI = "${PYTHON_MAJMIN}m"
+PYTHON_MAJMIN = "3.8"
 
 S = "${WORKDIR}/Python-${PV}"
 
@@ -62,8 +57,8 @@ inherit autotools pkgconfig qemu ptest multilib_header update-alternatives
 MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}"
 
 ALTERNATIVE_${PN}-dev = "python3-config"
-ALTERNATIVE_LINK_NAME[python3-config] = "${bindir}/python${PYTHON_BINABI}-config"
-ALTERNATIVE_TARGET[python3-config] = "${bindir}/python${PYTHON_BINABI}-config-${MULTILIB_SUFFIX}"
+ALTERNATIVE_LINK_NAME[python3-config] = "${bindir}/python${PYTHON_MAJMIN}-config"
+ALTERNATIVE_TARGET[python3-config] = "${bindir}/python${PYTHON_MAJMIN}-config-${MULTILIB_SUFFIX}"
 
 
 DEPENDS = "bzip2-replacement-native libffi bzip2 openssl sqlite3 zlib virtual/libintl xz virtual/crypt util-linux libtirpc libnsl2"
@@ -134,7 +129,7 @@ do_install_prepend() {
 }
 
 do_install_append_class-target() {
-        oe_multilib_header python${PYTHON_BINABI}/pyconfig.h
+        oe_multilib_header python${PYTHON_MAJMIN}/pyconfig.h
 }
 
 do_install_append_class-native() {
@@ -164,7 +159,7 @@ do_install_append() {
 }
 
 do_install_append_class-nativesdk () {
-    create_wrapper ${D}${bindir}/python${PYTHON_MAJMIN} OEPYTHON3HOME='${prefix}' TERMINFO_DIRS='${sysconfdir}/terminfo:/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo' PYTHONNOUSERSITE='1'
+    create_wrapper ${D}${bindir}/python${PYTHON_MAJMIN} TERMINFO_DIRS='${sysconfdir}/terminfo:/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo' PYTHONNOUSERSITE='1'
 }
 
 SSTATE_SCAN_FILES += "Makefile _sysconfigdata.py"
@@ -180,7 +175,7 @@ py_package_preprocess () {
                 -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \
                 ${PKGD}/${prefix}/lib/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}${PYTHON_ABI}*/Makefile \
                 ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py \
-                ${PKGD}/${bindir}/python${PYTHON_BINABI}-config
+                ${PKGD}/${bindir}/python${PYTHON_MAJMIN}-config
 
         # Reformat _sysconfigdata after modifying it so that it remains
         # reproducible
@@ -199,7 +194,7 @@ py_package_preprocess () {
              -c "from py_compile import compile; compile('$sysconfigfile', optimize=2)"
         cd -
 
-        mv ${PKGD}/${bindir}/python${PYTHON_BINABI}-config ${PKGD}/${bindir}/python${PYTHON_BINABI}-config-${MULTILIB_SUFFIX}
+        mv ${PKGD}/${bindir}/python${PYTHON_MAJMIN}-config ${PKGD}/${bindir}/python${PYTHON_MAJMIN}-config-${MULTILIB_SUFFIX}
         
         #Remove the unneeded copy of target sysconfig data
         rm -rf ${PKGD}/${libdir}/python-sysconfigdata
@@ -281,6 +276,7 @@ python(){
     packages = newpackages + packages
     d.setVar('PACKAGES', ' '.join(packages))
     d.setVar('ALLOW_EMPTY_${PN}-modules', '1')
+    d.setVar('ALLOW_EMPTY_${PN}-pkgutil', '1')
 }
 
 # Files needed to create a new manifest
@@ -325,7 +321,7 @@ RPROVIDES_${PN}-venv += "python3-pyvenv"
 # package libpython3
 PACKAGES =+ "libpython3 libpython3-staticdev"
 FILES_libpython3 = "${libdir}/libpython*.so.*"
-FILES_libpython3-staticdev += "${prefix}/lib/python${PYTHON_MAJMIN}/config-${PYTHON_BINABI}-*/libpython${PYTHON_BINABI}.a"
+FILES_libpython3-staticdev += "${prefix}/lib/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}-*/libpython${PYTHON_MAJMIN}.a"
 INSANE_SKIP_${PN}-dev += "dev-elf"
 
 # catch all the rest (unsorted)
@@ -346,3 +342,5 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = " locale-base-tr-tr.iso-8859-9"
 RDEPENDS_${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', 'tk tk-lib', '', d)}"
 RDEPENDS_${PN}-dev = ""
 
+RDEPENDS_${PN}-tests_append_class-target = " bash"
+RDEPENDS_${PN}-tests_append_class-nativesdk = " bash"
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/24 python3: do not compile .pyc in parallel during do_install()

---
 ...file-do-not-compile-.pyc-in-parallel.patch | 58 +++++++++++++++++++
 ...fig-append-STAGING_LIBDIR-python-sys.patch |  2 +-
 ...tutils-prefix-is-inside-staging-area.patch |  2 +-
 meta/recipes-devtools/python/python3_3.8.1.bb |  1 +
 4 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-devtools/python/python3/0001-Makefile-do-not-compile-.pyc-in-parallel.patch
meta/recipes-devtools/python/python3/0001-Makefile-do-not-compile-.pyc-in-parallel.patch new file +58 -0
new file mode 100644
index 00000000000..b1bceac512e
@@ -0,0 +1,58 @@
+From c501e121a872cbcef8ffe626c1de173a125be9f8 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Thu, 16 Jan 2020 12:34:20 +0100
+Subject: [PATCH] Makefile: do not compile .pyc in parallel
+
+This was found to break reproducibility, and produce strange file ownership
+races.
+
+The upstream commit introducing the change was:
+https://github.com/python/cpython/commit/1a2dd82f56bd813aacc570e172cefe55a8a41504
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ Makefile.pre.in | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 1241112..5dfdf44 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1457,30 +1457,30 @@ libinstall:	build_all $(srcdir)/Modules/xxmodule.c
+ 	fi
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST) -f \
++		-d $(LIBDEST) -f \
+ 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ 		$(DESTDIR)$(LIBDEST)
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST) -f \
++		-d $(LIBDEST) -f \
+ 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ 		$(DESTDIR)$(LIBDEST)
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST) -f \
++		-d $(LIBDEST) -f \
+ 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ 		$(DESTDIR)$(LIBDEST)
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST)/site-packages -f \
++		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST)/site-packages -f \
++		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST)/site-packages -f \
++		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch +1 -1
index 03719cafcdf..03f60088fe6 100644
@@ -1,4 +1,4 @@
-From 14eecf00459c0af698ed811e4f8bea460aada681 Mon Sep 17 00:00:00 2001
+From 77b7af7859bb925c31c5bcbf33f30569a0bc1d40 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Thu, 31 Jan 2019 16:46:30 +0100
 Subject: [PATCH] distutils/sysconfig: append
meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +1 -1
index 3105f0d1760..6fe9839f776 100644
@@ -1,4 +1,4 @@
-From 6ca960869738fc89041a2e672d8e28b51e73d3c6 Mon Sep 17 00:00:00 2001
+From b1f68fe102b289a10504fae716a9eaa8677e3c5b Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Tue, 14 May 2013 15:00:26 -0700
 Subject: [PATCH] python3: Add target and native recipes
meta/recipes-devtools/python/python3_3.8.1.bb +1 -0
index a798f9828a6..a71c207d9fa 100644
@@ -28,6 +28,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
            file://0001-test_locale.py-correct-the-test-output-format.patch \
            file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \
            file://0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \
+           file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \
            "
 
 SRC_URI_append_class-native = " \
Signature · 1 line
2.17.1
#2 lore raw

PATCH 3/24 python3: correctly process ptest output with sed

In reply to Alexander Kanavin

Particularly:

[ERROR|FAIL] was matching characters rather than strings.

Using (ERROR|FAIL) requires -r option.

---
 meta/recipes-devtools/python/python3/run-ptest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/python/python3/run-ptest +1 -1
index 3e45d3918cb..405b07f4959 100644
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-python3 -m test -v | sed -u -e '/\.\.\. ok/ s/^/PASS: /g' -e '/\.\.\. [ERROR|FAIL]/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. skipped//g'
+python3 -m test -v | sed -u -e '/\.\.\. ok/ s/^/PASS: /g' -r -e '/\.\.\. (ERROR|FAIL)/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. skipped//g'
Signature · 1 line
2.17.1
#3 lore raw

PATCH 4/24 gstreamer1.0-python: add a patch to fix python 3.8 builds

In reply to Alexander Kanavin
---
 ...son.build-fix-builds-with-python-3.8.patch | 24 +++++++++++++++++++
 .../gstreamer/gstreamer1.0-python_1.16.1.bb   |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch
meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch new file +24 -0
new file mode 100644
index 00000000000..053108ad50b
@@ -0,0 +1,24 @@
+From 61cfd1b49dc82baf14bb36d88b6c5be7b8c3d23a Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Mon, 2 Dec 2019 18:16:41 +0100
+Subject: [PATCH] meson.build: fix builds with python 3.8
+
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gst-python/merge_requests/14]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 1da81d5..3e0db38 100644
+--- a/meson.build
++++ b/meson.build
+@@ -24,7 +24,7 @@ pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_d
+ 
+ pymod = import('python')
+ python = pymod.find_installation(get_option('python'))
+-python_dep = python.dependency(required : true)
++python_dep = dependency('python3-embed', required : true)
+ 
+ python_abi_flags = python.get_variable('ABIFLAGS', '')
+ pylib_loc = get_option('libpython-dir')
meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb +3 -1
index b770ec060e1..0382360ec26 100644
@@ -5,7 +5,9 @@ SECTION = "multimedia"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740"
 
-SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz"
+SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz \
+           file://0001-meson.build-fix-builds-with-python-3.8.patch \
+           "
 SRC_URI[md5sum] = "499645fbd1790c5845c02a3998dccc1b"
 SRC_URI[sha256sum] = "b469c8955126f41b8ce0bf689b7029f182cd305f422b3a8df35b780bd8347489"
 
Signature · 1 line
2.17.1
#4 lore raw

PATCH 5/24 nss: update to 3.49.1

In reply to Alexander Kanavin

Drop a backport, and a patch that causes build errors with the new version.

Add a patch to make ARM HW crypto optional; upstream for some reason does not allow disabling it.

---
 ...ppc64-inline-assembler-for-clang-r-j.patch | 35 -------------------
 ...figure-option-to-disable-ARM-HW-cryp.patch | 35 +++++++++++++++++++
 .../nss/nss/nss-fix-nsinstall-build.patch     |  2 +-
 .../nss/{nss_3.45.bb => nss_3.49.1.bb}        | 13 ++++---
 4 files changed, 44 insertions(+), 41 deletions(-)
 delete mode 100644 meta/recipes-support/nss/nss/0001-Bug-1493916-Fix-ppc64-inline-assembler-for-clang-r-j.patch
 create mode 100644 meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
 rename meta/recipes-support/nss/{nss_3.45.bb => nss_3.49.1.bb} (95%)
meta/recipes-support/nss/nss/0001-Bug-1493916-Fix-ppc64-inline-assembler-for-clang-r-j.patch deleted +0 -35
deleted file mode 100644
index 59e44e68418..00000000000
@@ -1,35 +0,0 @@
-From 6b351dbb049b3b3ab6c0d51aa3c1c7fb3c9df80c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <[email protected]>
-Date: Mon, 22 Jul 2019 11:07:41 -0700
-Subject: [PATCH] Bug 1493916 - Fix ppc64 inline assembler for clang r=jcj
- Seems clang's inline assembler doesn't want registers to be prefixed with
- "r", while gcc accepts both - r0 and 0 for GPR0.
-
-tested with clang 6.0 and gcc 8.1
-
---HG--
-extra : amend_source : 87e09bb59c78bdb25b9573b9f29511e10b9db6fa
-extra : histedit_source : 9b3fad70ac2851bf7de14d42c34db4a5fba41710
-
-Upstream-Status: Backport [https://github.com/nss-dev/nss/commit/671d89b6c4a6f41707bb044534751098e2e3f211]
-Signed-off-by: Khem Raj <[email protected]>
----
- nss/lib/freebl/mpi/mpcpucache.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/nss/lib/freebl/mpi/mpcpucache.c b/nss/lib/freebl/mpi/mpcpucache.c
-index 336b4cc..2ad291f 100644
---- a/nss/lib/freebl/mpi/mpcpucache.c
-+++ b/nss/lib/freebl/mpi/mpcpucache.c
-@@ -727,7 +727,7 @@ static inline void
- dcbzl(char *array)
- {
-     register char *a asm("r2") = array;
--    __asm__ __volatile__("dcbzl %0,r0"
-+    __asm__ __volatile__("dcbzl %0,0"
-                          : "=r"(a)
-                          : "0"(a));
- }
--- 
-2.24.0
-
meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch new file +35 -0
new file mode 100644
index 00000000000..fe29d198820
@@ -0,0 +1,35 @@
+From 5595e9651aca39af945931c73eb524a0f8bd130d Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Wed, 18 Dec 2019 12:29:50 +0100
+Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto
+
+Not all current hardware supports it, particularly anything
+prior to armv8 does not.
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ nss/lib/freebl/Makefile | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
+index 06506f0..a8b015d 100644
+--- a/nss/lib/freebl/Makefile
++++ b/nss/lib/freebl/Makefile
+@@ -125,6 +125,8 @@ else
+         DEFINES += -DNSS_X86
+ endif
+ endif
++
++ifdef NSS_USE_ARM_HW_CRYPTO
+ ifeq ($(CPU_ARCH),aarch64)
+     DEFINES += -DUSE_HW_AES
+     EXTRA_SRCS += aes-armv8.c gcm-aarch64.c
+@@ -145,6 +147,7 @@ ifeq ($(CPU_ARCH),arm)
+         endif
+     endif
+ endif
++endif
+ 
+ ifeq ($(OS_TARGET),OSF1)
+     DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD
meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch +1 -1
index 181c69adb04..43c09d13eaf 100644
@@ -29,7 +29,7 @@ Index: nss-3.24/nss/coreconf/nsinstall/Makefile
 +# to clean the '-m64' from ARCHFLAG and LDFLAGS.
 +ARCHFLAG =
 +LDFLAGS =
-+CFLAGS =
++# CFLAGS =
 +
  ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
  PROGRAM		=
meta/recipes-support/nss/nss_3.49.1.bb renamed from meta/recipes-support/nss/nss_3.45.bb +8 -5
similarity index 95%
rename from meta/recipes-support/nss/nss_3.45.bb
rename to meta/recipes-support/nss/nss_3.49.1.bb
index c8005a5b3a5..94f4b88fa53 100644
@@ -25,17 +25,17 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
            file://0001-nss-fix-support-cross-compiling.patch \
            file://nss-no-rpath-for-cross-compiling.patch \
            file://nss-fix-incorrect-shebang-of-perl.patch \
-           file://nss-fix-nsinstall-build.patch \
            file://disable-Wvarargs-with-clang.patch \
            file://pqg.c-ULL_addend.patch \
-           file://0001-Bug-1493916-Fix-ppc64-inline-assembler-for-clang-r-j.patch \
            file://blank-cert9.db \
            file://blank-key4.db \
            file://system-pkcs11.txt \
+           file://nss-fix-nsinstall-build.patch \
+           file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
            "
 
-SRC_URI[md5sum] = "f1752d7223ee9d910d551e57264bafa8"
-SRC_URI[sha256sum] = "112f05223d1fde902c170966bfc6f011b24a838be16969b110ecf2bb7bc24e8b"
+SRC_URI[md5sum] = "6b92ac02dcf9e9e44df5390f6814c157"
+SRC_URI[sha256sum] = "d9aa42e49e02bb0dc0a2f164604cfc718e11a2a06ddb266cd676376ac21b026e"
 
 UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
 UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
@@ -69,7 +69,8 @@ do_compile_prepend_class-native() {
 do_compile() {
     export CROSS_COMPILE=1
     export NATIVE_CC="${BUILD_CC}"
-    export NATIVE_FLAGS="${BUILD_CFLAGS}"
+    # Additional defines needed on Centos 7
+    export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux"
     export BUILD_OPT=1
 
     export FREEBL_NO_DEPEND=1
@@ -81,6 +82,8 @@ do_compile() {
     export NSS_USE_SYSTEM_SQLITE=1
     export NSS_ENABLE_ECC=1
 
+    ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)}
+
     export OS_RELEASE=3.4
     export OS_TARGET=Linux
     export OS_ARCH=Linux
Signature · 1 line
2.17.1
#5 lore raw

Re: [PATCH 05/24] nss: update to 3.49.1

Quoted 6 lines · Alexander Kanavin

Drop a backport, and a patch that causes build errors with the new version.

Add a patch to make ARM HW crypto optional; upstream for some reason does not allow disabling it.

Thanks and FWIW - I tried to subscribe to their mailing list to ask if that was intended. To my surprise I received:

| Your request to the nss-dev mailing list
|
|    Subscription request
|
| has been rejected by the list moderator.  The moderator gave the
| following reason for rejecting your request:
|
| "Not an active NSS developer. Contact [email protected] to argue :)"

Wow...

Andreas

#6 lore raw

Re: [PATCH 05/24] nss: update to 3.49.1

Quoted 13 lines · Andreas Müller
Quoted 5 lines · Alexander Kanavin

Drop a backport, and a patch that causes build errors with the new version.

Add a patch to make ARM HW crypto optional; upstream for some reason does not allow disabling it.

Thanks and FWIW - I tried to subscribe to their mailing list to ask if
that was intended. To my surprise I received:

Quoted 2 lines

Your request to the nss-dev mailing list

Quoted 8 lines
Quoted 6 lines

Subscription request

has been rejected by the list moderator. The moderator gave the following reason for rejecting your request:

"Not an active NSS developer. Contact [email protected] to argue :)"

Wow...

That is surprising and rather sad :(

It may be worth mailing that person and pointing out you had a question and where it should be taken? It would be good to discuss with upstream rather than carrying the patch. We are making slow but steady progress in reducing out patch load.

Cheers,

Richard

#7 lore raw

Re: [PATCH 05/24] nss: update to 3.49.1

This is failing on qemuarm btw

http://errors.yoctoproject.org/Errors/Details/307410/

Quoted 41 lines · Richard Purdie
Quoted 13 lines · Andreas Müller
Quoted 5 lines · Alexander Kanavin

Drop a backport, and a patch that causes build errors with the new version.

Add a patch to make ARM HW crypto optional; upstream for some reason does not allow disabling it.

Thanks and FWIW - I tried to subscribe to their mailing list to ask if
that was intended. To my surprise I received:

Quoted 2 lines

Your request to the nss-dev mailing list

Quoted 8 lines
Quoted 6 lines

Subscription request

has been rejected by the list moderator. The moderator gave the following reason for rejecting your request:

"Not an active NSS developer. Contact [email protected] to argue :)"

Wow...

That is surprising and rather sad :(

It may be worth mailing that person and pointing out you had a question and where it should be taken? It would be good to discuss with upstream rather than carrying the patch. We are making slow but steady progress in reducing out patch load.

Cheers,

Richard

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#9 lore raw

Re: [PATCH 05/24] nss: update to 3.49.1

Quoted 8 lines · Richard Purdie
Quoted 3 lines · Khem Raj

This is failing on qemuarm btw

http://errors.yoctoproject.org/Errors/Details/307410/

That is odd as it passed testing on the autobuilder. It must be something tune specific :(

Thanks

While my builds are dealing with py2 things this seems not related but I do have gcc10 in my mix
So it could be future build break I need to triage it a bit more and see what’s going on

Quoted 5 lines

Cheers,

Richard

#10 lore raw

Re: [PATCH 05/24] nss: update to 3.49.1

Quoted 10 lines · Khem Raj
Quoted 6 lines · Richard Purdie
Quoted 3 lines · Khem Raj

This is failing on qemuarm btw

http://errors.yoctoproject.org/Errors/Details/307410/

Quoted 8 lines
Quoted 2 lines

That is odd as it passed testing on the autobuilder. It must be something tune specific :(

Thanks

While my builds are dealing with py2 things this seems not related but I do have gcc10 in my mix So it could be future build break I need to triage it a bit more and see what’s going on

It was not a compiler issue but another issue in the patch proposed to disable crypto, I have not sent a patch on
top of this one which should fix the problem and make the patch to disable crypto on arm disable it fully.

see
https://patchwork.openembedded.org/patch/169340/

Quoted 5 lines
Quoted 5 lines

Cheers,

Richard

#11 lore raw

PATCH 6/24 libcap: update to 2.31

In reply to Alexander Kanavin
---
 ...-tests-do-not-statically-link-a-test.patch | 26 +++++++++++++++
 ...-tests-do-not-run-target-executables.patch | 33 +++++++++++++++++++
 .../libcap/{libcap_2.27.bb => libcap_2.31.bb} |  6 ++--
 3 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
 create mode 100644 meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch
 rename meta/recipes-support/libcap/{libcap_2.27.bb => libcap_2.31.bb} (87%)
meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch new file +26 -0
new file mode 100644
index 00000000000..e568cc47c5f
@@ -0,0 +1,26 @@
+From 1179b423cce8d119b42cebfb3daa77c540fdca43 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Wed, 15 Jan 2020 17:16:28 +0100
+Subject: [PATCH] tests: do not statically link a test
+
+This fails on e.g. centos 7
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ tests/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/Makefile b/tests/Makefile
+index 7162cf0..6af47af 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -29,7 +29,7 @@ psx_test_wrap: psx_test.c $(DEPS)
+ run_libcap_psx_test: libcap_psx_test
+ 
+ libcap_psx_test: libcap_psx_test.c $(DEPS)
+-	$(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static
++	$(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create
+ 
+ clean:
+ 	rm -f psx_test psx_test_wrap libcap_psx_test
meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch new file +33 -0
new file mode 100644
index 00000000000..26d108c209e
@@ -0,0 +1,33 @@
+From 6309554225e05e76167eda4e0df383fb3d1a62c3 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Fri, 20 Dec 2019 16:54:05 +0100
+Subject: [PATCH] tests: do not run target executables
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <[email protected]>
+
+---
+ tests/Makefile | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/tests/Makefile b/tests/Makefile
+index 95e4ca6..7162cf0 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -19,8 +19,6 @@ sudotest: test
+ install: all
+ 
+ run_psx_test: psx_test psx_test_wrap
+-	./psx_test
+-	./psx_test_wrap
+ 
+ psx_test: psx_test.c $(DEPS)
+ 	$(CC) $(CFLAGS) $(IPATH) -DNOWRAP $< -o $@ $(LIBPSXLIB)
+@@ -29,7 +27,6 @@ psx_test_wrap: psx_test.c $(DEPS)
+ 	$(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create
+ 
+ run_libcap_psx_test: libcap_psx_test
+-	./libcap_psx_test
+ 
+ libcap_psx_test: libcap_psx_test.c $(DEPS)
+ 	$(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static
meta/recipes-support/libcap/libcap_2.31.bb renamed from meta/recipes-support/libcap/libcap_2.27.bb +4 -2
similarity index 87%
rename from meta/recipes-support/libcap/libcap_2.27.bb
rename to meta/recipes-support/libcap/libcap_2.31.bb
index 3f64ff76364..97959c1025b 100644
@@ -9,9 +9,11 @@ DEPENDS = "hostperl-runtime-native gperf-native"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz \
            file://0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch \
+           file://0002-tests-do-not-run-target-executables.patch \
+           file://0001-tests-do-not-statically-link-a-test.patch \
            "
-SRC_URI[md5sum] = "2e8f9fab32eb5ccb37969fe317fd17aa"
-SRC_URI[sha256sum] = "dac1792d0118bee6aae6ba7fb93ff1602c6a9bda812fd63916eee1435b9c486a"
+SRC_URI[md5sum] = "52120c05dc797b01f5a7ae70f4335e96"
+SRC_URI[sha256sum] = "c6088de41e1c97fa8047e2e7de0e4ee0cd13e6cc16538022230ae76727a87c46"
 
 UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/"
 
Signature · 1 line
2.17.1
#12 lore raw

PATCH 7/24 selftest: check maintainers.inc for entries without recipes

In reply to Alexander Kanavin

Also remove a couple of entries found by the test :)

---
 meta/conf/distro/include/maintainers.inc   |  6 ----
 meta/lib/oeqa/selftest/cases/distrodata.py | 34 ++++++++++++++++++++--
 2 files changed, 32 insertions(+), 8 deletions(-)
meta/conf/distro/include/maintainers.inc +0 -6
index ffb6da7dae9..01afc25b939 100644
@@ -183,7 +183,6 @@ RECIPE_MAINTAINER_pn-flex = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-font-alias = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-font-util = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-fontconfig = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-foomatic-filters = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-formfactor = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-freetype = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-fribidi = "Ross Burton <[email protected]>"
@@ -551,7 +550,6 @@ RECIPE_MAINTAINER_pn-pciutils = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-pcmanfm = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-perf = "Bruce Ashfield <[email protected]>"
 RECIPE_MAINTAINER_pn-perl = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-perl-native = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-piglit = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-pigz = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-pinentry = "Armin Kuster <[email protected]>"
@@ -574,9 +572,6 @@ RECIPE_MAINTAINER_pn-ptest-runner = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-pulseaudio = "Tanu Kaskinen <[email protected]>"
 RECIPE_MAINTAINER_pn-pulseaudio-client-conf-sato = "Tanu Kaskinen <[email protected]>"
 RECIPE_MAINTAINER_pn-puzzles = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-python = "Oleksandr Kravchuk <[email protected]>"
-RECIPE_MAINTAINER_pn-python-native = "Oleksandr Kravchuk <[email protected]>"
-RECIPE_MAINTAINER_pn-python-setuptools = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python3 = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-async = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-dbus = "Oleksandr Kravchuk <[email protected]>"
@@ -586,7 +581,6 @@ RECIPE_MAINTAINER_pn-python3-git = "Oleksandr Kravchuk <open.source@oleksandr-kr
 RECIPE_MAINTAINER_pn-python3-gitdb = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-iniparse = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-mako = "Oleksandr Kravchuk <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-native = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-nose = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-numpy = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-pbr = "Oleksandr Kravchuk <[email protected]>"
meta/lib/oeqa/selftest/cases/distrodata.py +32 -2
index 68ba556485e..5f7f488349a 100644
@@ -42,8 +42,9 @@ but their recipes claim otherwise by setting UPSTREAM_VERSION_UNKNOWN. Please re
 
     def test_maintainers(self):
         """
-        Summary:     Test that oe-core recipes have a maintainer
+        Summary:     Test that oe-core recipes have a maintainer and entries in maintainers list have a recipe
         Expected:    All oe-core recipes (except a few special static/testing ones) should have a maintainer listed in maintainers.inc file.
+        Expected:    All entries in maintainers list should have a recipe file that matches them
         Product:     oe-core
         Author:      Alexander Kanavin <[email protected]>
         """
@@ -54,7 +55,16 @@ but their recipes claim otherwise by setting UPSTREAM_VERSION_UNKNOWN. Please re
                      return True
             return False
 
-        feature = 'require conf/distro/include/maintainers.inc\n'
+        def is_maintainer_exception(entry):
+            exceptions = ["systemd", "musl", "libpam", "newlib", "linux-yocto", "opensbi", "linux-dummy",
+                          "mesa-gl", "libgfortran", "volatile-binds", "libgloss", "bsd-headers",
+                          "cve-update-db-native", "libssp-nonshared", "argp-standalone", "fts"]
+            for i in exceptions:
+                 if i in entry:
+                     return True
+            return False
+
+        feature = 'require conf/distro/include/maintainers.inc\nLICENSE_FLAGS_WHITELIST += " commercial"\n'
         self.write_config(feature)
 
         with bb.tinfoil.Tinfoil() as tinfoil:
@@ -62,6 +72,11 @@ but their recipes claim otherwise by setting UPSTREAM_VERSION_UNKNOWN. Please re
 
             with_maintainer_list = []
             no_maintainer_list = []
+
+            missing_recipes = []
+            recipes = []
+            prefix = "RECIPE_MAINTAINER_pn-"
+
             # We could have used all_recipes() here, but this method will find
             # every recipe if we ever move to setting RECIPE_MAINTAINER in recipe files
             # instead of maintainers.inc
@@ -71,6 +86,7 @@ but their recipes claim otherwise by setting UPSTREAM_VERSION_UNKNOWN. Please re
                     continue
                 rd = tinfoil.parse_recipe_file(fn, appends=False)
                 pn = rd.getVar('PN')
+                recipes.append(pn)
                 if is_exception(pn):
                     continue
                 if rd.getVar('RECIPE_MAINTAINER'):
@@ -78,6 +94,15 @@ but their recipes claim otherwise by setting UPSTREAM_VERSION_UNKNOWN. Please re
                 else:
                     no_maintainer_list.append((pn, fn))
 
+            maintainers = tinfoil.config_data.keys()
+            for key in maintainers:
+                 if key.startswith(prefix):
+                     recipe = tinfoil.config_data.expand(key[len(prefix):])
+                     if is_maintainer_exception(recipe):
+                         continue
+                     if recipe not in recipes:
+                         missing_recipes.append(recipe)
+
         if no_maintainer_list:
             self.fail("""
 The following recipes do not have a maintainer assigned to them. Please add an entry to meta/conf/distro/include/maintainers.inc file.
@@ -87,3 +112,8 @@ The following recipes do not have a maintainer assigned to them. Please add an e
             self.fail("""
 The list of oe-core recipes with maintainers is empty. This may indicate that the test has regressed and needs fixing.
 """)
+
+        if missing_recipes:
+                self.fail("""
+Unable to find recipes for the following entries in maintainers.inc:
+""" + "\n".join(['%s' % i for i in missing_recipes]))
Signature · 1 line
2.17.1
#13 lore raw

PATCH 8/24 core-image-sato-sdk-ptest: do not pull in ptest-pkgs

In reply to Alexander Kanavin

The lists of ptests are defined via PTESTS_FAST and PTESTS_SLOW; ptests-pkgs also pulls in additional items that are specifically excluded from those due to causing issues with ptesting.

---
 meta/recipes-sato/images/core-image-sato-sdk-ptest.bb | 2 --
 1 file changed, 2 deletions(-)
meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +0 -2
index ff297fe324c..7490b773d2e 100644
@@ -3,8 +3,6 @@ require conf/distro/include/ptest-packagelists.inc
 
 DESCRIPTION += "Also includes ptest packages."
 
-IMAGE_FEATURES += "ptest-pkgs"
-
 PROVIDES += "core-image-sato-ptest"
 
 # Also include ptests which may not otherwise be included in a sato image
Signature · 1 line
2.17.1
#14 lore raw

PATCH 9/24 ptests: exclude mdadm from ptesting

In reply to Alexander Kanavin

The are multiple failures, one is due to mdmon crashing in qemu, another is due to qemu kernel missing needed options, a third I couldn't figure out at all.

Rather then fight with them let's disable the whole thing for now.

---
 meta/conf/distro/include/ptest-packagelists.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/distro/include/ptest-packagelists.inc +1 -1
index 0a13bf0a6c1..49cb9046c6c 100644
@@ -57,6 +57,7 @@ PTESTS_FAST = "\
 #    lz4-ptest \ # Needs a rewrite
 #    rt-tests-ptest \ # Needs to be checked whether it runs at all
 #    bash-ptest \ # Test outcomes are non-deterministic by design
+#    mdadm-ptest \ # Multiple failures; mdmon crashes in at least one of the tests
 #"
 
 PTESTS_SLOW = "\
@@ -67,7 +68,6 @@ PTESTS_SLOW = "\
     gstreamer1.0-ptest \
     libevent-ptest \
     lttng-tools-ptest \
-    mdadm-ptest \
     openssh-ptest \
     openssl-ptest \
     perl-ptest \
Signature · 1 line
2.17.1
#15 lore raw

PATCH 10/24 ptests: exclude lttng-tools

In reply to Alexander Kanavin

These tests are producing failures that appear and disappear randomly. This requires investigation by someone with expertise, so let's disable until then.

---
 meta/conf/distro/include/ptest-packagelists.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/distro/include/ptest-packagelists.inc +1 -1
index 49cb9046c6c..f42e90bd187 100644
@@ -58,6 +58,7 @@ PTESTS_FAST = "\
 #    rt-tests-ptest \ # Needs to be checked whether it runs at all
 #    bash-ptest \ # Test outcomes are non-deterministic by design
 #    mdadm-ptest \ # Multiple failures; mdmon crashes in at least one of the tests
+#    lttng-tools-ptest \ # Random failures that are difficult to reproduce
 #"
 
 PTESTS_SLOW = "\
@@ -67,7 +68,6 @@ PTESTS_SLOW = "\
     glib-2.0-ptest \
     gstreamer1.0-ptest \
     libevent-ptest \
-    lttng-tools-ptest \
     openssh-ptest \
     openssl-ptest \
     perl-ptest \
Signature · 1 line
2.17.1
#16 lore raw

Re: [PATCH 10/24] ptests: exclude lttng-tools

Could you point me toward reports for the failing tests?

I just want to make sure they are not actual regression.

A yocto specific patch was dropped that allowed ptest to pass when lttng-ust is not present. This can be a source of problems. OE commit:015aea5d93614676decd18578a8ae2d68417cfc5

Also some tests required a minimum requirement for /tmp that could lead to problem for image/test setup with limited memory since AFAIK /tmp size is derived from the available memory (at least when using qemu test image).

Cheers

Quoted 37 lines · Alexander Kanavin

These tests are producing failures that appear and disappear randomly. This requires investigation by someone with expertise, so let's disable until then.

---
 meta/conf/distro/include/ptest-packagelists.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/distro/include/ptest-packagelists.inc +1 -1
index 49cb9046c6c..f42e90bd187 100644
@@ -58,6 +58,7 @@ PTESTS_FAST = "\
 #    rt-tests-ptest \ # Needs to be checked whether it runs at all
 #    bash-ptest \ # Test outcomes are non-deterministic by design
 #    mdadm-ptest \ # Multiple failures; mdmon crashes in at least one of the tests
+#    lttng-tools-ptest \ # Random failures that are difficult to reproduce
 #"
 
 PTESTS_SLOW = "\
@@ -67,7 +68,6 @@ PTESTS_SLOW = "\
     glib-2.0-ptest \
     gstreamer1.0-ptest \
     libevent-ptest \
-    lttng-tools-ptest \
     openssh-ptest \
     openssl-ptest \
     perl-ptest \
Signature · 7 lines
2.17.1

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 2 lines
Jonathan Rajotte-Julien
EfficiOS
#17 lore raw

Re: [PATCH 10/24] ptests: exclude lttng-tools

Basically you can view the history of the builds here:
https://autobuilder.yoctoproject.org/typhoon/#/builders/81

Click on any of the builds (identified by number), even green ones, then 'run-config - > step 1c -> view all lines
For example:
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/632/steps/8/logs/step1c

Alex

Quoted 60 lines · Jonathan Rajotte-Julien

Could you point me toward reports for the failing tests?

I just want to make sure they are not actual regression.

A yocto specific patch was dropped that allowed ptest to pass when lttng-ust is not present. This can be a source of problems. OE commit:015aea5d93614676decd18578a8ae2d68417cfc5

Also some tests required a minimum requirement for /tmp that could lead to problem for image/test setup with limited memory since AFAIK /tmp size is derived from the available memory (at least when using qemu test image).

Cheers

Review

Quoted 10 lines · Alexander Kanavin

These tests are producing failures that appear and disappear randomly. This requires investigation by someone with expertise, so let's disable until then.

---
 meta/conf/distro/include/ptest-packagelists.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/meta/conf/distro/include/ptest-packagelists.inc

meta/conf/distro/include/ptest-packagelists.inc PTESTS_FAST = "\ · line 60

Quoted 7 lines

index 49cb9046c6c..f42e90bd187 100644

meta/conf/distro/include/ptest-packagelists.inc +0 -0
@@ -58,6 +58,7 @@ PTESTS_FAST = "\
 #    rt-tests-ptest \ # Needs to be checked whether it runs at all
 #    bash-ptest \ # Test outcomes are non-deterministic by design
 #    mdadm-ptest \ # Multiple failures; mdmon crashes in at least one

of the tests

meta/conf/distro/include/ptest-packagelists.inc PTESTS_FAST = "\ · line 61

Quoted 1 line
meta/conf/distro/include/ptest-packagelists.inc +1 -0
+#    lttng-tools-ptest \ # Random failures that are difficult to

reproduce

Quoted 14 lines
meta/conf/distro/include/ptest-packagelists.inc +0 -2
 #"
 
 PTESTS_SLOW = "\
@@ -67,7 +68,6 @@ PTESTS_SLOW = "\
     glib-2.0-ptest \
     gstreamer1.0-ptest \
     libevent-ptest \
-    lttng-tools-ptest \
     openssh-ptest \
     openssl-ptest \
     perl-ptest \
--

2.17.1

Quoted 5 lines

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

--
Jonathan Rajotte-Julien
EfficiOS

#18 lore raw

Re: [PATCH 10/24] ptests: exclude lttng-tools

In reply to Jonathan Rajotte-Julien

I have traced the failing tests to missing supplementary shell scripts that apparently are newly added, and weren't packaged to the target.

Also, /tmp indeed wasn't big enough.

With those issues addressed (patch is coming), I am still having two failures:

# Failed test
(../../../../../lttng-tools-2.11.0/tests/regression/tools/live/live_test.c:main() at line 707)
# Got first packet index with offset 0 and len 4096
not ok 6 - Get metadata, received 0 bytes
FAIL: tools/live/test_ust_tracefile_count 6 - Get metadata, received 0 bytes

# Got first packet index with offset 0 and len 4096 not ok 6 - Get metadata, received 0 bytes
FAIL: tools/live/test_ust 6 - Get metadata, received 0 bytes

What's weird is that sometimes they pass. Could there be a race or some timing issue in the test?

Alex

Quoted 60 lines · Jonathan Rajotte-Julien

Could you point me toward reports for the failing tests?

I just want to make sure they are not actual regression.

A yocto specific patch was dropped that allowed ptest to pass when lttng-ust is not present. This can be a source of problems. OE commit:015aea5d93614676decd18578a8ae2d68417cfc5

Also some tests required a minimum requirement for /tmp that could lead to problem for image/test setup with limited memory since AFAIK /tmp size is derived from the available memory (at least when using qemu test image).

Cheers

Review

Quoted 10 lines · Alexander Kanavin

These tests are producing failures that appear and disappear randomly. This requires investigation by someone with expertise, so let's disable until then.

---
 meta/conf/distro/include/ptest-packagelists.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/meta/conf/distro/include/ptest-packagelists.inc

meta/conf/distro/include/ptest-packagelists.inc PTESTS_FAST = "\ · line 60

Quoted 7 lines

index 49cb9046c6c..f42e90bd187 100644

meta/conf/distro/include/ptest-packagelists.inc +0 -0
@@ -58,6 +58,7 @@ PTESTS_FAST = "\
 #    rt-tests-ptest \ # Needs to be checked whether it runs at all
 #    bash-ptest \ # Test outcomes are non-deterministic by design
 #    mdadm-ptest \ # Multiple failures; mdmon crashes in at least one

of the tests

meta/conf/distro/include/ptest-packagelists.inc PTESTS_FAST = "\ · line 61

Quoted 1 line
meta/conf/distro/include/ptest-packagelists.inc +1 -0
+#    lttng-tools-ptest \ # Random failures that are difficult to

reproduce

Quoted 14 lines
meta/conf/distro/include/ptest-packagelists.inc +0 -2
 #"
 
 PTESTS_SLOW = "\
@@ -67,7 +68,6 @@ PTESTS_SLOW = "\
     glib-2.0-ptest \
     gstreamer1.0-ptest \
     libevent-ptest \
-    lttng-tools-ptest \
     openssh-ptest \
     openssl-ptest \
     perl-ptest \
--

2.17.1

Quoted 5 lines

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

--
Jonathan Rajotte-Julien
EfficiOS

#19 lore raw

Re: [PATCH 10/24] ptests: exclude lttng-tools

Quoted 7 lines · Alexander Kanavin

I have traced the failing tests to missing supplementary shell scripts that apparently are newly added, and weren't packaged to the target.

Also, /tmp indeed wasn't big enough.

With those issues addressed (patch is coming), I am still having two failures:

Thanks for that effort.

Quoted 8 lines

# Failed test
(../../../../../lttng-tools-2.11.0/tests/regression/tools/live/live_test.c:main() at line 707)
# Got first packet index with offset 0 and len 4096
not ok 6 - Get metadata, received 0 bytes
FAIL: tools/live/test_ust_tracefile_count 6 - Get metadata, received 0 bytes

Quoted 6 lines

# Got first packet index with offset 0 and len 4096 not ok 6 - Get metadata, received 0 bytes
FAIL: tools/live/test_ust 6 - Get metadata, received 0 bytes

What's weird is that sometimes they pass. Could there be a race or some timing issue in the test?

This indeed seems suspicious. Are you able to reproduce it rather quickly? If so we can continue this in private for the instruction on the base setup so I can reproduce it and get working on it.

These tests have a lot of moving parts.

Cheers

Quoted 66 lines

Alex

Quoted 60 lines · Jonathan Rajotte-Julien

Could you point me toward reports for the failing tests?

I just want to make sure they are not actual regression.

A yocto specific patch was dropped that allowed ptest to pass when lttng-ust is not present. This can be a source of problems. OE commit:015aea5d93614676decd18578a8ae2d68417cfc5

Also some tests required a minimum requirement for /tmp that could lead to problem for image/test setup with limited memory since AFAIK /tmp size is derived from the available memory (at least when using qemu test image).

Cheers

Review

Quoted 10 lines · Alexander Kanavin

These tests are producing failures that appear and disappear randomly. This requires investigation by someone with expertise, so let's disable until then.

---
 meta/conf/distro/include/ptest-packagelists.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/meta/conf/distro/include/ptest-packagelists.inc

meta/conf/distro/include/ptest-packagelists.inc PTESTS_FAST = "\ · line 60

Quoted 7 lines

index 49cb9046c6c..f42e90bd187 100644

meta/conf/distro/include/ptest-packagelists.inc +0 -0
@@ -58,6 +58,7 @@ PTESTS_FAST = "\
 #    rt-tests-ptest \ # Needs to be checked whether it runs at all
 #    bash-ptest \ # Test outcomes are non-deterministic by design
 #    mdadm-ptest \ # Multiple failures; mdmon crashes in at least one

of the tests

meta/conf/distro/include/ptest-packagelists.inc PTESTS_FAST = "\ · line 61

Quoted 1 line
meta/conf/distro/include/ptest-packagelists.inc +1 -0
+#    lttng-tools-ptest \ # Random failures that are difficult to

reproduce

Quoted 14 lines
meta/conf/distro/include/ptest-packagelists.inc +0 -2
 #"
 
 PTESTS_SLOW = "\
@@ -67,7 +68,6 @@ PTESTS_SLOW = "\
     glib-2.0-ptest \
     gstreamer1.0-ptest \
     libevent-ptest \
-    lttng-tools-ptest \
     openssh-ptest \
     openssl-ptest \
     perl-ptest \
--

2.17.1

Quoted 5 lines

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

--
Jonathan Rajotte-Julien
EfficiOS

Signature · 2 lines
Jonathan Rajotte-Julien
EfficiOS
#20 lore raw

Re: [PATCH 10/24] ptests: exclude lttng-tools

In reply to Alexander Kanavin
Quoted 22 lines · Alexander Kanavin

These tests are producing failures that appear and disappear randomly. This requires investigation by someone with expertise, so let's disable until then.

---
 meta/conf/distro/include/ptest-packagelists.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/distro/include/ptest-packagelists.inc +1 -0
index 49cb9046c6c..f42e90bd187 100644
@@ -58,6 +58,7 @@ PTESTS_FAST = "\
 #    rt-tests-ptest \ # Needs to be checked whether it runs at all
 #    bash-ptest \ # Test outcomes are non-deterministic by design
 #    mdadm-ptest \ # Multiple failures; mdmon crashes in at least one of the tests
+#    lttng-tools-ptest \ # Random failures that are difficult to reproduce
 #"
 
 PTESTS_SLOW = "\

meta/conf/distro/include/ptest-packagelists.inc PTESTS_SLOW = "\ · line 73

Quoted 7 lines
meta/conf/distro/include/ptest-packagelists.inc +0 -1
@@ -67,7 +68,6 @@ PTESTS_SLOW = "\
     glib-2.0-ptest \
     gstreamer1.0-ptest \
     libevent-ptest \
-    lttng-tools-ptest \
     openssh-ptest \
     openssl-ptest \
     perl-ptest \

To put this in context I'd much rather have the bulk of these tests running than not running so I'm not taking this patch.

I worry one of the previously dropped patches introduced problems here as this was working quite reliably after help from upstream...

Cheers,

Richard

#21 lore raw

PATCH 11/24 openssh: applied upstream fix for "cert not yet valid" test

In reply to Alexander Kanavin

From: "Mingde (Matthew) Zeng" <[email protected]>

applied upstream fix for openssh's "cert not yet valid" test

Upstream Status: Backport:

    https://github.com/openssh/openssh-portable/commit/ff31f15773ee173502eec4d7861ec56f26bba381
---
 ...pplied-upstream-fix-for-openssh-test.patch | 60 +++++++++++++++++++
 .../openssh/openssh_8.1p1.bb                  |  1 +
 2 files changed, 61 insertions(+)
 create mode 100644 meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch
meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch new file +60 -0
new file mode 100644
index 00000000000..7171ec0834e
@@ -0,0 +1,60 @@
+From 0a68d6cfe255f8bcdd5f9db0d008a8f0a60b237a Mon Sep 17 00:00:00 2001
+From: "Mingde (Matthew) Zeng" <[email protected]>
+Date: Wed, 15 Jan 2020 15:51:42 -0500
+Subject: [PATCH] Manually applied upstream fix for openssh test
+
+Upstream Status: Backport:
+    https://github.com/openssh/openssh-portable/commit/ff31f15773ee173502eec4d7861ec56f26bba381
+
+Signed-off-by: Mingde (Matthew) Zeng<[email protected]>
+---
+ regress/cert-hostkey.sh | 4 ++--
+ regress/cert-userkey.sh | 5 ++---
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh
+index 86ea6250..60e3ec02 100644
+--- a/regress/cert-hostkey.sh
++++ b/regress/cert-hostkey.sh
+@@ -1,4 +1,4 @@
+-#	$OpenBSD: cert-hostkey.sh,v 1.18 2019/07/25 08:28:15 dtucker Exp $
++#	$OpenBSD: cert-hostkey.sh,v 1.23 2020/01/03 03:02:26 djm Exp $
+ #	Placed in the Public Domain.
+
+ tid="certified host keys"
+@@ -252,7 +252,7 @@ test_one() {
+ test_one "user-certificate"	failure "-n $HOSTS"
+ test_one "empty principals"	success "-h"
+ test_one "wrong principals"	failure "-h -n foo"
+-test_one "cert not yet valid"	failure "-h -V20200101:20300101"
++test_one "cert not yet valid"	failure "-h -V20300101:20320101"
+ test_one "cert expired"		failure "-h -V19800101:19900101"
+ test_one "cert valid interval"	success "-h -V-1w:+2w"
+ test_one "cert has constraints"	failure "-h -Oforce-command=false"
+diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh
+index 38c14a69..f0e30945 100644
+--- a/regress/cert-userkey.sh
++++ b/regress/cert-userkey.sh
+@@ -1,4 +1,4 @@
+-#	$OpenBSD: cert-userkey.sh,v 1.21 2019/07/25 08:28:15 dtucker Exp $
++#	$OpenBSD: cert-userkey.sh,v 1.25 2020/01/03 03:02:26 djm Exp $
+ #	Placed in the Public Domain.
+
+ tid="certified user keys"
+@@ -338,7 +338,7 @@ test_one() {
+ test_one "correct principal"	success "-n ${USER}"
+ test_one "host-certificate"	failure "-n ${USER} -h"
+ test_one "wrong principals"	failure "-n foo"
+-test_one "cert not yet valid"	failure "-n ${USER} -V20200101:20300101"
++test_one "cert not yet valid"	failure "-n ${USER} -V20300101:20320101"
+ test_one "cert expired"		failure "-n ${USER} -V19800101:19900101"
+ test_one "cert valid interval"	success "-n ${USER} -V-1w:+2w"
+ test_one "wrong source-address"	failure "-n ${USER} -Osource-address=10.0.0.0/8"
+@@ -399,4 +399,3 @@ done
+
+ rm -f $OBJ/authorized_keys_$USER $OBJ/user_ca_key* $OBJ/cert_user_key*
+ rm -f $OBJ/authorized_principals_$USER
+-
+--
+2.24.1
+
meta/recipes-connectivity/openssh/openssh_8.1p1.bb +1 -0
index f8be7ba178d..8e7896cf4a3 100644
@@ -26,6 +26,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
            file://add-test-support-for-busybox.patch \
            file://openssh-8.1p1-seccomp-nanosleep.patch \
            file://0001-seccomp-Allow-clock_gettime64-in-sandbox.patch \
+           file://0001-Manually-applied-upstream-fix-for-openssh-test.patch \
            "
 SRC_URI[md5sum] = "513694343631a99841e815306806edf0"
 SRC_URI[sha256sum] = "02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff"
Signature · 1 line
2.17.1
#22 lore raw

PATCH 12/24 openssh: explicitly skip unit tests

In reply to Alexander Kanavin

These tests are already implicitly excluded by not being built. This change avoids a confusing failure-but-not-really printed by run-ptest.

---
 meta/recipes-connectivity/openssh/openssh/run-ptest | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-connectivity/openssh/openssh/run-ptest +1 -0
index daf62cca5b1..ae03e929b24 100755
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 export TEST_SHELL=sh
+export SKIP_UNIT=1
 
 cd regress
 sed -i "/\t\tagent-ptrace /d" Makefile
Signature · 1 line
2.17.1
#23 lore raw

PATCH 13/24 parted: fix more ptests

In reply to Alexander Kanavin

Particularly parted is getting confused by udev's automounter mounting things in background.

---
 meta/recipes-extended/parted/files/run-ptest | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-extended/parted/files/run-ptest +2 -0
index b57c29400ab..f39c478ce6a 100644
@@ -1,3 +1,5 @@
 #!/bin/sh
 
+echo /dev/sda1 >> /etc/udev/mount.blacklist.d/parted-tmp
 make -C tests test-suite.log
+rm /etc/udev/mount.blacklist.d/parted-tmp
Signature · 1 line
2.17.1
#24 lore raw

PATCH 14/24 qemu.inc: add vfat to MACHINE_FEATURES

In reply to Alexander Kanavin

This is beneficial for parted ptests in particular as they make use of vfat, and fail otherwise.

---
 meta/conf/machine/include/qemu.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/machine/include/qemu.inc +1 -1
index 5050e41066e..8dedb1a42d3 100644
@@ -9,7 +9,7 @@ XSERVER ?= "xserver-xorg \
             xf86-video-fbdev \
             "
 
-MACHINE_FEATURES = "alsa bluetooth usbgadget screen"
+MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat"
 
 MACHINEOVERRIDES =. "qemuall:"
 
Signature · 1 line
2.17.1
#25 lore raw

PATCH 15/24 rt-tests: exclude another development version (1.6)

In reply to Alexander Kanavin
---
 meta/recipes-rt/rt-tests/rt-tests.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-rt/rt-tests/rt-tests.inc +1 -1
index 227eb99b98d..3ac39d90c3d 100644
@@ -4,7 +4,7 @@ PE = "1"
 
 SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git"
 # 1.2 to 1.5 seem to be development versions
-UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(?!1\.[2-5])(\d+(\.\d+)+))"
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(?!1\.[2-6])(\d+(\.\d+)+))"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.17.1
#26 lore raw

PATCH 16/24 btrfs-tools: upgrade 5.4 -> 5.4.1

In reply to Alexander Kanavin
---
 .../btrfs-tools/{btrfs-tools_5.4.bb => btrfs-tools_5.4.1.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_5.4.bb => btrfs-tools_5.4.1.bb} (97%)
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.4.1.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.4.bb +1 -1
similarity index 97%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.4.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_5.4.1.bb
index 86d88fbcbe5..cdc971cf5da 100644
@@ -14,7 +14,7 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl"
 DEPENDS_append_class-target = " udev"
 RDEPENDS_${PN} = "libgcc"
 
-SRCREV = "d39ab9fafeb425d28fcaac645f7d663555fa654d"
+SRCREV = "3fc2326d3474a5e4df2449f5e3043f7298501334"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
            file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
            "
Signature · 1 line
2.17.1
#27 lore raw

PATCH 17/24 libpipeline: upgrade 1.5.1 -> 1.5.2

In reply to Alexander Kanavin
---
 .../{libpipeline_1.5.1.bb => libpipeline_1.5.2.bb}            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/libpipeline/{libpipeline_1.5.1.bb => libpipeline_1.5.2.bb} (78%)
meta/recipes-extended/libpipeline/libpipeline_1.5.2.bb renamed from meta/recipes-extended/libpipeline/libpipeline_1.5.1.bb +2 -2
similarity index 78%
rename from meta/recipes-extended/libpipeline/libpipeline_1.5.1.bb
rename to meta/recipes-extended/libpipeline/libpipeline_1.5.2.bb
index a5802074b13..a1824616072 100644
@@ -7,8 +7,8 @@ LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 SRC_URI = "${SAVANNAH_GNU_MIRROR}/libpipeline/libpipeline-${PV}.tar.gz"
-SRC_URI[md5sum] = "4c8fe6cd85422baafd6e060f896c61bc"
-SRC_URI[sha256sum] = "d633706b7d845f08b42bc66ddbe845d57e726bf89298e2cee29f09577e2f902f"
+SRC_URI[md5sum] = "169de4cc1f6f7f7d430a5bed858b2fd3"
+SRC_URI[sha256sum] = "fd59c649c1ae9d67604d1644f116ad4d297eaa66f838e3dfab96b41e85b059fb"
 
 inherit pkgconfig autotools
 
Signature · 1 line
2.17.1
#28 lore raw

PATCH 18/24 msmtp: upgrade 1.8.6 -> 1.8.7

In reply to Alexander Kanavin
---
 .../recipes-extended/msmtp/{msmtp_1.8.6.bb => msmtp_1.8.7.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/msmtp/{msmtp_1.8.6.bb => msmtp_1.8.7.bb} (86%)
meta/recipes-extended/msmtp/msmtp_1.8.7.bb renamed from meta/recipes-extended/msmtp/msmtp_1.8.6.bb +2 -2
similarity index 86%
rename from meta/recipes-extended/msmtp/msmtp_1.8.6.bb
rename to meta/recipes-extended/msmtp/msmtp_1.8.7.bb
index 809144b7837..729d0ed146b 100644
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 UPSTREAM_CHECK_URI = "https://marlam.de/msmtp/download/"
 
 SRC_URI = "https://marlam.de/${BPN}/releases/${BP}.tar.xz"
-SRC_URI[md5sum] = "adff4a9992e1b47aa5468b974550304e"
-SRC_URI[sha256sum] = "6625f147430c65ba8527f52c4fe5d4d33552d3c0fb6d793ba7df819a3b3042e1"
+SRC_URI[md5sum] = "4cf3d000b24fc8769e9fd8ec8b3cf1fb"
+SRC_URI[sha256sum] = "9a53bcdc244ec5b1a806934ecc7746d9d09db581f587bedf597e9da2f48c51f1"
 
 inherit gettext autotools update-alternatives pkgconfig
 
Signature · 1 line
2.17.1
#29 lore raw

PATCH 19/24 ffmpeg: upgrade 4.2.1 -> 4.2.2

In reply to Alexander Kanavin
---
 .../ffmpeg/{ffmpeg_4.2.1.bb => ffmpeg_4.2.2.bb}               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/ffmpeg/{ffmpeg_4.2.1.bb => ffmpeg_4.2.2.bb} (98%)
meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb renamed from meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.1.bb +2 -2
similarity index 98%
rename from meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.1.bb
rename to meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb
index 5ac18ba3f1a..a3cf0c1a37c 100644
@@ -26,8 +26,8 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
            file://mips64_cpu_detection.patch \
            "
-SRC_URI[md5sum] = "67da904cf9fddeeb10a1308fc0dc39de"
-SRC_URI[sha256sum] = "cec7c87e9b60d174509e263ac4011b522385fd0775292e1670ecc1180c9bb6d4"
+SRC_URI[md5sum] = "348956fc2faa57a2f79bbb84ded9fbc3"
+SRC_URI[sha256sum] = "cb754255ab0ee2ea5f66f8850e1bd6ad5cac1cd855d0a2f4990fb8c668b0d29c"
 
 # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
 ARM_INSTRUCTION_SET_armv4 = "arm"
Signature · 1 line
2.17.1
#30 lore raw

PATCH 20/24 epiphany: upgrade 3.34.2 -> 3.34.3.1

In reply to Alexander Kanavin
---
 .../epiphany/{epiphany_3.34.2.bb => epiphany_3.34.3.1.bb}     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/epiphany/{epiphany_3.34.2.bb => epiphany_3.34.3.1.bb} (85%)
meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.34.2.bb +2 -2
similarity index 85%
rename from meta/recipes-gnome/epiphany/epiphany_3.34.2.bb
rename to meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb
index c6105b97066..7e1573348e2 100644
@@ -14,8 +14,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl"
 SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
            file://0002-help-meson.build-disable-the-use-of-yelp.patch \
            "
-SRC_URI[archive.md5sum] = "ae404e3a70ff904f5a23466727f8a90a"
-SRC_URI[archive.sha256sum] = "0eaa36fc7b73a23121a23b8a7ad3c18edaf5a8a6b7cdd6d630ba5b71d946a4a1"
+SRC_URI[archive.md5sum] = "c8010e7ef1b0fd2da1e613e17445062a"
+SRC_URI[archive.sha256sum] = "00e479fba108f44b1830370780b98116d87fc277eb1a4eed8e229dcdf04aea6d"
 
 FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo"
 RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"
Signature · 1 line
2.17.1
#31 lore raw

PATCH 21/24 libwebp: upgrade 1.0.3 -> 1.1.0

In reply to Alexander Kanavin
---
 .../webp/{libwebp_1.0.3.bb => libwebp_1.1.0.bb}               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/webp/{libwebp_1.0.3.bb => libwebp_1.1.0.bb} (93%)
meta/recipes-multimedia/webp/libwebp_1.1.0.bb renamed from meta/recipes-multimedia/webp/libwebp_1.0.3.bb +2 -2
similarity index 93%
rename from meta/recipes-multimedia/webp/libwebp_1.0.3.bb
rename to meta/recipes-multimedia/webp/libwebp_1.1.0.bb
index 5082bf03748..68e5ae2b3ce 100644
@@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6e8dee932c26f2dab503abf70c96d8bb \
                     file://PATENTS;md5=c6926d0cb07d296f886ab6e0cc5a85b7"
 
 SRC_URI = "http://downloads.webmproject.org/releases/webp/${BP}.tar.gz"
-SRC_URI[md5sum] = "906ad85daaaa2eac97c8aa2dec9e8b77"
-SRC_URI[sha256sum] = "e20a07865c8697bba00aebccc6f54912d6bc333bb4d604e6b07491c1a226b34f"
+SRC_URI[md5sum] = "7e047f2cbaf584dff7a8a7e0f8572f18"
+SRC_URI[sha256sum] = "98a052268cc4d5ece27f76572a7f50293f439c17a98e67c4ea0c7ed6f50ef043"
 
 UPSTREAM_CHECK_URI = "http://downloads.webmproject.org/releases/webp/index.html"
 
Signature · 1 line
2.17.1
#32 lore raw

PATCH 22/24 createrepo-c: upgrade 0.15.4 -> 0.15.5

In reply to Alexander Kanavin
---
 .../{createrepo-c_0.15.4.bb => createrepo-c_0.15.5.bb}          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/createrepo-c/{createrepo-c_0.15.4.bb => createrepo-c_0.15.5.bb} (95%)
meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb renamed from meta/recipes-devtools/createrepo-c/createrepo-c_0.15.4.bb +1 -1
similarity index 95%
rename from meta/recipes-devtools/createrepo-c/createrepo-c_0.15.4.bb
rename to meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb
index 75762b7fa52..9b6c89c3485 100644
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \
            file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
            "
 
-SRCREV = "8ac472e1267b2ca11d11418099ab923d319fa2dc"
+SRCREV = "db3a2da68842efd8a8f69c40a222dfb15bb1f4fe"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.17.1
#33 lore raw

PATCH 23/24 libsecret: upgrade 0.19.1 -> 0.20.0

In reply to Alexander Kanavin

Add a backported patch to fix musl builds.

---
 ...ection-Rename-internal-functions-to-.patch | 144 ++++++++++++++++++
 ...ibsecret_0.19.1.bb => libsecret_0.20.0.bb} |   5 +-
 2 files changed, 147 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch
 rename meta/recipes-gnome/libsecret/{libsecret_0.19.1.bb => libsecret_0.20.0.bb} (81%)
meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch new file +144 -0
new file mode 100644
index 00000000000..269c12b0107
@@ -0,0 +1,144 @@
+From 59bcb169c4777bb3b1a50fee2ae20e4e8574b749 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <[email protected]>
+Date: Tue, 14 Jan 2020 10:09:29 +0100
+Subject: [PATCH] secret-file-collection: Rename internal functions to avoid
+ conflicts
+
+As encrypt() is a standard POSIX function, its declaration had
+conflict with our own.  Let's be more verbose about naming of the
+internal crypto functions.
+
+Fixes #35.
+
+Upstream-Status: Backport [https://github.com/GNOME/libsecret/commit/cf21ad50b62f7c8e4b22ef374f0a73290a99bdb8]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ libsecret/secret-file-collection.c | 38 +++++++++++++++---------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/libsecret/secret-file-collection.c b/libsecret/secret-file-collection.c
+index 79863ea..8ffb542 100644
+--- a/libsecret/secret-file-collection.c
++++ b/libsecret/secret-file-collection.c
+@@ -68,7 +68,7 @@ enum {
+ };
+ 
+ static gboolean
+-derive (SecretFileCollection *self)
++do_derive_key (SecretFileCollection *self)
+ {
+ 	const gchar *password;
+ 	gsize n_password;
+@@ -93,9 +93,9 @@ derive (SecretFileCollection *self)
+ }
+ 
+ static gboolean
+-calculate_mac (SecretFileCollection *self,
+-	       const guint8 *value, gsize n_value,
+-	       guint8 *buffer)
++do_calculate_mac (SecretFileCollection *self,
++		  const guint8 *value, gsize n_value,
++		  guint8 *buffer)
+ {
+ 	gcry_mac_hd_t hd;
+ 	gcry_error_t gcry;
+@@ -130,9 +130,9 @@ calculate_mac (SecretFileCollection *self,
+ }
+ 
+ static gboolean
+-decrypt (SecretFileCollection *self,
+-	 guint8 *data,
+-	 gsize n_data)
++do_decrypt (SecretFileCollection *self,
++	    guint8 *data,
++	    gsize n_data)
+ {
+ 	gcry_cipher_hd_t hd;
+ 	gcry_error_t gcry;
+@@ -164,9 +164,9 @@ decrypt (SecretFileCollection *self,
+ }
+ 
+ static gboolean
+-encrypt (SecretFileCollection *self,
+-	 guint8 *data,
+-	 gsize n_data)
++do_encrypt (SecretFileCollection *self,
++	    guint8 *data,
++	    gsize n_data)
+ {
+ 	gcry_cipher_hd_t hd;
+ 	gcry_error_t gcry;
+@@ -311,7 +311,7 @@ on_load_contents (GObject *source_object,
+ 			self->modified = g_date_time_new_now_utc ();
+ 			self->usage_count = 0;
+ 
+-			if (!derive (self)) {
++			if (!do_derive_key (self)) {
+ 				g_task_return_new_error (task,
+ 							 SECRET_ERROR,
+ 							 SECRET_ERROR_PROTOCOL,
+@@ -375,7 +375,7 @@ on_load_contents (GObject *source_object,
+ 	g_assert (n_data == salt_size);
+ 
+ 	self->salt = g_bytes_new (data, n_data);
+-	if (!derive (self)) {
++	if (!do_derive_key (self)) {
+ 		g_task_return_new_error (task,
+ 					 SECRET_ERROR,
+ 					 SECRET_ERROR_PROTOCOL,
+@@ -442,7 +442,7 @@ hash_attributes (SecretFileCollection *self,
+ 		GVariant *variant;
+ 
+ 		value = g_hash_table_lookup (attributes, l->data);
+-		if (!calculate_mac (self, (guint8 *)value, strlen (value), buffer)) {
++		if (!do_calculate_mac (self, (guint8 *)value, strlen (value), buffer)) {
+ 			g_list_free (keys);
+ 			return NULL;
+ 		}
+@@ -485,7 +485,7 @@ hashed_attributes_match (SecretFileCollection *self,
+ 			return FALSE;
+ 		}
+ 
+-		if (!calculate_mac (self, value, strlen ((char *)value), buffer)) {
++		if (!do_calculate_mac (self, value, strlen ((char *)value), buffer)) {
+ 			g_variant_unref (hashed_attribute);
+ 			return FALSE;
+ 		}
+@@ -584,7 +584,7 @@ secret_file_collection_replace (SecretFileCollection *self,
+ 	g_variant_store (serialized_item, data);
+ 	g_variant_unref (serialized_item);
+ 	memset (data + n_data, n_padded - n_data, n_padded - n_data);
+-	if (!encrypt (self, data, n_padded)) {
++	if (!do_encrypt (self, data, n_padded)) {
+ 		egg_secure_free (data);
+ 		g_set_error (error,
+ 			     SECRET_ERROR,
+@@ -593,8 +593,8 @@ secret_file_collection_replace (SecretFileCollection *self,
+ 		return FALSE;
+ 	}
+ 
+-	if (!calculate_mac (self, data, n_padded + IV_SIZE,
+-			    data + n_padded + IV_SIZE)) {
++	if (!do_calculate_mac (self, data, n_padded + IV_SIZE,
++			       data + n_padded + IV_SIZE)) {
+ 		egg_secure_free (data);
+ 		g_set_error (error,
+ 			     SECRET_ERROR,
+@@ -681,7 +681,7 @@ _secret_file_item_decrypt (GVariant *encrypted,
+ 	}
+ 	n_padded -= IV_SIZE + MAC_SIZE;
+ 
+-	if (!calculate_mac (collection, data, n_padded + IV_SIZE, mac)) {
++	if (!do_calculate_mac (collection, data, n_padded + IV_SIZE, mac)) {
+ 		egg_secure_free (data);
+ 		g_set_error (error,
+ 			     SECRET_ERROR,
+@@ -699,7 +699,7 @@ _secret_file_item_decrypt (GVariant *encrypted,
+ 		return FALSE;
+ 	}
+ 
+-	if (!decrypt (collection, data, n_padded)) {
++	if (!do_decrypt (collection, data, n_padded)) {
+ 		egg_secure_free (data);
+ 		g_set_error (error,
+ 			     SECRET_ERROR,
meta/recipes-gnome/libsecret/libsecret_0.20.0.bb renamed from meta/recipes-gnome/libsecret/libsecret_0.19.1.bb +3 -2
similarity index 81%
rename from meta/recipes-gnome/libsecret/libsecret_0.19.1.bb
rename to meta/recipes-gnome/libsecret/libsecret_0.20.0.bb
index 3da2a4acac1..aa3dfab581d 100644
@@ -13,8 +13,9 @@ DEPENDS += "glib-2.0 libgcrypt gettext-native"
 
 PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native"
 
-SRC_URI[archive.md5sum] = "ea673119c00570d6434f8fd3636f1eb8"
-SRC_URI[archive.sha256sum] = "8583e10179456ae2c83075d95455f156dc08db6278b32bf4bd61819335a30e3a"
+SRC_URI += " file://0001-secret-file-collection-Rename-internal-functions-to-.patch"
+SRC_URI[archive.md5sum] = "335750caeed47f50496b3b0e6a1875ff"
+SRC_URI[archive.sha256sum] = "f1187370b453106af878e30c284a121ba0c513da8bb4170b329d66e250bdae43"
 
 # http://errors.yoctoproject.org/Errors/Details/20228/
 ARM_INSTRUCTION_SET_armv4 = "arm"
Signature · 1 line
2.17.1
#34 lore raw

PATCH 24/24 meson: update 0.52.1 -> 0.53.0

In reply to Alexander Kanavin
---
 meta/classes/meson.bbclass                       |  9 ++++++++-
 meta/recipes-devtools/meson/meson.inc            |  4 ++--
 .../0001-Make-CPU-family-warnings-fatal.patch    | 12 ++++++------
 ...-do-not-manipulate-the-environment-when.patch | 16 ++++++++--------
 ...-Support-building-allarch-recipes-again.patch |  6 +++---
 .../meson/meson/0003-native_bindir.patch         | 16 ++++++++--------
 .../meson/{meson_0.52.1.bb => meson_0.53.0.bb}   |  0
 ...meson_0.52.1.bb => nativesdk-meson_0.53.0.bb} |  0
 8 files changed, 35 insertions(+), 28 deletions(-)
 rename meta/recipes-devtools/meson/{meson_0.52.1.bb => meson_0.53.0.bb} (100%)
 rename meta/recipes-devtools/meson/{nativesdk-meson_0.52.1.bb => nativesdk-meson_0.53.0.bb} (100%)
meta/classes/meson.bbclass +8 -1
index 1ef34a999c8..1837c9468e6 100644
@@ -85,13 +85,16 @@ addtask write_config before do_configure
 do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS CXXFLAGS LDFLAGS"
 do_write_config() {
     # This needs to be Py to split the args into single-element lists
+
+    # Meson requires ld to be 'bfd, 'lld' or 'gold' from 0.53 onwards
+    # https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3
     cat >${WORKDIR}/meson.cross <<EOF
 [binaries]
 c = ${@meson_array('CC', d)}
 cpp = ${@meson_array('CXX', d)}
 ar = ${@meson_array('AR', d)}
 nm = ${@meson_array('NM', d)}
-ld = ${@meson_array('LD', d)}
+ld = 'bfd'
 strip = ${@meson_array('STRIP', d)}
 readelf = ${@meson_array('READELF', d)}
 pkgconfig = 'pkg-config'
@@ -122,6 +125,10 @@ EOF
 CONFIGURE_FILES = "meson.build"
 
 meson_do_configure() {
+    # Meson requires this to be 'bfd, 'lld' or 'gold' from 0.53 onwards
+    # https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3
+    unset LD
+
     # Work around "Meson fails if /tmp is mounted with noexec #2972"
     mkdir -p "${B}/meson-private/tmp"
     export TMPDIR="${B}/meson-private/tmp"
meta/recipes-devtools/meson/meson.inc +2 -2
index 881a14c7f0a..c0ce7d338bc 100644
@@ -17,8 +17,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
            file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
            file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
            "
-SRC_URI[sha256sum] = "0c277472e49950a5537e3de3e60c57b80dbf425788470a1a8ed27446128fc035"
-SRC_URI[md5sum] = "a5f0c99567d772508f649a28ded7f8ad"
+SRC_URI[sha256sum] = "035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6"
+SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3"
 
 SRC_URI_append_class-native = " \
     file://0001-Make-CPU-family-warnings-fatal.patch \
meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +6 -6
index d4264cee526..74d5b4ca66e 100644
@@ -1,4 +1,4 @@
-From cd980c763f11cfd928255346cc7e86f24add985e Mon Sep 17 00:00:00 2001
+From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Tue, 3 Jul 2018 13:59:09 +0100
 Subject: [PATCH] Make CPU family warnings fatal
@@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <[email protected]>
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 29d7422..5fb00a4 100644
+index 0f277a7..24578ea 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
-@@ -190,7 +190,7 @@ class MachineInfo:
+@@ -192,7 +192,7 @@ class MachineInfo:
  
          cpu_family = literal['cpu_family']
          if cpu_family not in known_cpu_families:
@@ -25,15 +25,15 @@ index 29d7422..5fb00a4 100644
          endian = literal['endian']
          if endian not in ('little', 'big'):
 diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index a9bc2b8..b91c8da 100644
+index dc8b14f..3aab71e 100644
 --- a/mesonbuild/environment.py
 +++ b/mesonbuild/environment.py
-@@ -348,9 +348,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
+@@ -354,9 +354,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
          trial = 'parisc'
  
      if trial not in known_cpu_families:
 -        mlog.warning('Unknown CPU family {!r}, please report this at '
--                     'https://github.com/mesonbuild/meson/issues/new with the'
+-                     'https://github.com/mesonbuild/meson/issues/new with the '
 -                     'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial))
 +        raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)
  
meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +8 -8
index bf715d1e9f4..eb0e90dbdda 100644
@@ -1,4 +1,4 @@
-From 3cb2c811dc6d4890342afa5b709cd30cf7b8f3ca Mon Sep 17 00:00:00 2001
+From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Mon, 19 Nov 2018 14:24:26 +0100
 Subject: [PATCH] python module: do not manipulate the environment when calling
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  1 file changed, 12 deletions(-)
 
 diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
-index 9cfbd6f..3ff687a 100644
+index 07be318..b770603 100644
 --- a/mesonbuild/modules/python.py
 +++ b/mesonbuild/modules/python.py
-@@ -75,11 +75,6 @@ class PythonDependency(ExternalDependency):
+@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
                  old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
                  old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
  
@@ -25,10 +25,10 @@ index 9cfbd6f..3ff687a 100644
 -                    os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
 -
                  try:
-                     self.pkgdep = PkgConfigDependency('python-{}'.format(pkg_version), environment, kwargs)
-                     mlog.debug('Found "python-{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_version, pkg_libdir))
-@@ -88,13 +83,6 @@ class PythonDependency(ExternalDependency):
-                     mlog.debug('"python-{}" could not be found in LIBPC ({})'.format(pkg_version, pkg_libdir))
+                     self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs)
+                     mlog.debug('Found "{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_name, pkg_libdir))
+@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
+                     mlog.debug('"{}" could not be found in LIBPC ({})'.format(pkg_name, pkg_libdir))
                      mlog.debug(e)
  
 -                if old_pkg_path is not None:
@@ -39,5 +39,5 @@ index 9cfbd6f..3ff687a 100644
 -                else:
 -                    os.environ.pop('PKG_CONFIG_LIBDIR', None)
              else:
-                 mlog.debug('"python-{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_version, pkg_libdir))
+                 mlog.debug('"{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_name, pkg_libdir))
  
meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +3 -3
index c8c7b298de3..1529ebe9fea 100644
@@ -1,4 +1,4 @@
-From 4d223562c3e510e0dd62b608d184604e2cab6198 Mon Sep 17 00:00:00 2001
+From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00 2001
 From: Peter Kjellerstedt <[email protected]>
 Date: Thu, 26 Jul 2018 16:32:49 +0200
 Subject: [PATCH] Support building allarch recipes again
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <[email protected]>
  1 file changed, 1 insertion(+)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 5fb00a4..f5702ba 100644
+index 24578ea..216e71f 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
 @@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
@@ -22,5 +22,5 @@ index 5fb00a4..f5702ba 100644
  known_cpu_families = (
 +    'allarch',
      'aarch64',
+     'alpha',
      'arc',
-     'arm',
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +8 -8
index 14a9a136664..76c1aa9ac1c 100644
@@ -1,4 +1,4 @@
-From baf7b94fec5a31b2d0cb162e43dbd28cc019f38e Mon Sep 17 00:00:00 2001
+From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001
 From: Ricardo Ribalda Delgado <[email protected]>
 Date: Wed, 15 Nov 2017 15:05:01 +0100
 Subject: [PATCH] native_bindir
@@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <[email protected]>
  2 files changed, 14 insertions(+), 11 deletions(-)
 
 diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
-index 35f0175..b39cba6 100644
+index f17b9f2..b5c9c92 100644
 --- a/mesonbuild/dependencies/base.py
 +++ b/mesonbuild/dependencies/base.py
 @@ -184,7 +184,7 @@ class Dependency:
@@ -43,7 +43,7 @@ index 35f0175..b39cba6 100644
          raise DependencyException('Method "get_pkgconfig_variable()" is '
                                    'invalid for an internal dependency')
  
-@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency):
+@@ -673,15 +673,18 @@ class PkgConfigDependency(ExternalDependency):
          return s.format(self.__class__.__name__, self.name, self.is_found,
                          self.version_reqs)
  
@@ -65,7 +65,7 @@ index 35f0175..b39cba6 100644
          # Always copy the environment since we're going to modify it
          # with pkg-config variables
          if env is None:
-@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -701,7 +704,7 @@ class PkgConfigDependency(ExternalDependency):
          targs = tuple(args)
          cache = PkgConfigDependency.pkgbin_cache
          if (self.pkgbin, targs, fenv) not in cache:
@@ -73,8 +73,8 @@ index 35f0175..b39cba6 100644
 +            cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native)
          return cache[(self.pkgbin, targs, fenv)]
  
-     def _convert_mingw_paths(self, args):
-@@ -885,7 +888,7 @@ class PkgConfigDependency(ExternalDependency):
+     def _convert_mingw_paths(self, args: List[str]) -> List[str]:
+@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
                                        (self.name, out_raw))
          self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
  
@@ -83,7 +83,7 @@ index 35f0175..b39cba6 100644
          options = ['--variable=' + variable_name, self.name]
  
          if 'define_variable' in kwargs:
-@@ -898,7 +901,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -920,7 +923,7 @@ class PkgConfigDependency(ExternalDependency):
  
              options = ['--define-variable=' + '='.join(definition)] + options
  
@@ -93,7 +93,7 @@ index 35f0175..b39cba6 100644
          if ret != 0:
              if self.required:
 diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
-index 6d784e6..73a9e13 100644
+index bdcc4a7..e2de847 100644
 --- a/mesonbuild/dependencies/ui.py
 +++ b/mesonbuild/dependencies/ui.py
 @@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency):
meta/recipes-devtools/meson/meson_0.53.0.bb renamed from meta/recipes-devtools/meson/meson_0.52.1.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.52.1.bb
rename to meta/recipes-devtools/meson/meson_0.53.0.bb
meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
Signature · 1 line
2.17.1
#35 lore raw

Re: [PATCH 24/24] meson: update 0.52.1 -> 0.53.0

Quoted 13 lines · Alexander Kanavin
---
 meta/classes/meson.bbclass                       |  9 ++++++++-
 meta/recipes-devtools/meson/meson.inc            |  4 ++--
 .../0001-Make-CPU-family-warnings-fatal.patch    | 12 ++++++------
 ...-do-not-manipulate-the-environment-when.patch | 16 ++++++++--------
 ...-Support-building-allarch-recipes-again.patch |  6 +++---
 .../meson/meson/0003-native_bindir.patch         | 16 ++++++++--------
 .../meson/{meson_0.52.1.bb => meson_0.53.0.bb}   |  0
 ...meson_0.52.1.bb => nativesdk-meson_0.53.0.bb} |  0
 8 files changed, 35 insertions(+), 28 deletions(-)
 rename meta/recipes-devtools/meson/{meson_0.52.1.bb => meson_0.53.0.bb} (100%)
 rename meta/recipes-devtools/meson/{nativesdk-meson_0.52.1.bb => nativesdk-meson_0.53.0.bb} (100%)

This breaks something in the SDK which then fails testing:

https://autobuilder.yoctoproject.org/typhoon/#/builders/62/builds/1475

(but many other similar failures).

Cheers,

Richard

#36 lore raw

Re: [PATCH 24/24] meson: update 0.52.1 -> 0.53.0

In reply to Alexander Kanavin
Quoted 24 lines · Alexander Kanavin
---
 meta/classes/meson.bbclass                       |  9 ++++++++-
 meta/recipes-devtools/meson/meson.inc            |  4 ++--
 .../0001-Make-CPU-family-warnings-fatal.patch    | 12 ++++++------
 ...-do-not-manipulate-the-environment-when.patch | 16 ++++++++--------
 ...-Support-building-allarch-recipes-again.patch |  6 +++---
 .../meson/meson/0003-native_bindir.patch         | 16 ++++++++--------
 .../meson/{meson_0.52.1.bb => meson_0.53.0.bb}   |  0
 ...meson_0.52.1.bb => nativesdk-meson_0.53.0.bb} |  0
 8 files changed, 35 insertions(+), 28 deletions(-)
 rename meta/recipes-devtools/meson/{meson_0.52.1.bb => meson_0.53.0.bb} (100%)
 rename meta/recipes-devtools/meson/{nativesdk-meson_0.52.1.bb => nativesdk-meson_0.53.0.bb} (100%)
meta/classes/meson.bbclass +1 -0
index 1ef34a999c8..1837c9468e6 100644
@@ -85,13 +85,16 @@ addtask write_config before do_configure
 do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS CXXFLAGS LDFLAGS"
 do_write_config() {
     # This needs to be Py to split the args into single-element lists
+

meta/classes/meson.bbclass addtask write_config before do_configure · line 97

Quoted 10 lines
meta/classes/meson.bbclass +3 -1
+    # Meson requires ld to be 'bfd, 'lld' or 'gold' from 0.53 onwards
+    # https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3
     cat >${WORKDIR}/meson.cross <<EOF
 [binaries]
 c = ${@meson_array('CC', d)}
 cpp = ${@meson_array('CXX', d)}
 ar = ${@meson_array('AR', d)}
 nm = ${@meson_array('NM', d)}
-ld = ${@meson_array('LD', d)}
+ld = 'bfd'

hardcoding to bfg would ignore gold or lld if users want to use those linkers. Since its a fallback
and this expects linker to be invoked by compiler driver, since its simply converting into -fuse-ld=<ld>
option to compiler, whereas in OE the var LD is set to represent bare linker. Perhaps leaving it unset is
better, we already have LD set in env.

Quoted 224 lines
meta/classes/meson.bbclass +4 -0
 strip = ${@meson_array('STRIP', d)}
 readelf = ${@meson_array('READELF', d)}
 pkgconfig = 'pkg-config'
@@ -122,6 +125,10 @@ EOF
 CONFIGURE_FILES = "meson.build"
 
 meson_do_configure() {
+    # Meson requires this to be 'bfd, 'lld' or 'gold' from 0.53 onwards
+    # https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3
+    unset LD
+
     # Work around "Meson fails if /tmp is mounted with noexec #2972"
     mkdir -p "${B}/meson-private/tmp"
     export TMPDIR="${B}/meson-private/tmp"
meta/recipes-devtools/meson/meson.inc +2 -2
index 881a14c7f0a..c0ce7d338bc 100644
@@ -17,8 +17,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
            file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
            file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
            "
-SRC_URI[sha256sum] = "0c277472e49950a5537e3de3e60c57b80dbf425788470a1a8ed27446128fc035"
-SRC_URI[md5sum] = "a5f0c99567d772508f649a28ded7f8ad"
+SRC_URI[sha256sum] = "035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6"
+SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3"
 
 SRC_URI_append_class-native = " \
     file://0001-Make-CPU-family-warnings-fatal.patch \
meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +6 -6
index d4264cee526..74d5b4ca66e 100644
@@ -1,4 +1,4 @@
-From cd980c763f11cfd928255346cc7e86f24add985e Mon Sep 17 00:00:00 2001
+From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Tue, 3 Jul 2018 13:59:09 +0100
 Subject: [PATCH] Make CPU family warnings fatal
@@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <[email protected]>
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 29d7422..5fb00a4 100644
+index 0f277a7..24578ea 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
-@@ -190,7 +190,7 @@ class MachineInfo:
+@@ -192,7 +192,7 @@ class MachineInfo:
 
          cpu_family = literal['cpu_family']
          if cpu_family not in known_cpu_families:
@@ -25,15 +25,15 @@ index 29d7422..5fb00a4 100644
          endian = literal['endian']
          if endian not in ('little', 'big'):
 diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index a9bc2b8..b91c8da 100644
+index dc8b14f..3aab71e 100644
 --- a/mesonbuild/environment.py
 +++ b/mesonbuild/environment.py
-@@ -348,9 +348,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
+@@ -354,9 +354,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
          trial = 'parisc'
 
      if trial not in known_cpu_families:
 -        mlog.warning('Unknown CPU family {!r}, please report this at '
--                     'https://github.com/mesonbuild/meson/issues/new with the'
+-                     'https://github.com/mesonbuild/meson/issues/new with the '
 -                     'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial))
 +        raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)
 
meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +8 -8
index bf715d1e9f4..eb0e90dbdda 100644
@@ -1,4 +1,4 @@
-From 3cb2c811dc6d4890342afa5b709cd30cf7b8f3ca Mon Sep 17 00:00:00 2001
+From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Mon, 19 Nov 2018 14:24:26 +0100
 Subject: [PATCH] python module: do not manipulate the environment when calling
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  1 file changed, 12 deletions(-)
 
 diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
-index 9cfbd6f..3ff687a 100644
+index 07be318..b770603 100644
 --- a/mesonbuild/modules/python.py
 +++ b/mesonbuild/modules/python.py
-@@ -75,11 +75,6 @@ class PythonDependency(ExternalDependency):
+@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
                  old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
                  old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
 
@@ -25,10 +25,10 @@ index 9cfbd6f..3ff687a 100644
 -                    os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
 -
                  try:
-                     self.pkgdep = PkgConfigDependency('python-{}'.format(pkg_version), environment, kwargs)
-                     mlog.debug('Found "python-{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_version, pkg_libdir))
-@@ -88,13 +83,6 @@ class PythonDependency(ExternalDependency):
-                     mlog.debug('"python-{}" could not be found in LIBPC ({})'.format(pkg_version, pkg_libdir))
+                     self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs)
+                     mlog.debug('Found "{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_name, pkg_libdir))
+@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
+                     mlog.debug('"{}" could not be found in LIBPC ({})'.format(pkg_name, pkg_libdir))
                      mlog.debug(e)
 
 -                if old_pkg_path is not None:
@@ -39,5 +39,5 @@ index 9cfbd6f..3ff687a 100644
 -                else:
 -                    os.environ.pop('PKG_CONFIG_LIBDIR', None)
              else:
-                 mlog.debug('"python-{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_version, pkg_libdir))
+                 mlog.debug('"{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_name, pkg_libdir))
 
meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +3 -3
index c8c7b298de3..1529ebe9fea 100644
@@ -1,4 +1,4 @@
-From 4d223562c3e510e0dd62b608d184604e2cab6198 Mon Sep 17 00:00:00 2001
+From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00 2001
 From: Peter Kjellerstedt <[email protected]>
 Date: Thu, 26 Jul 2018 16:32:49 +0200
 Subject: [PATCH] Support building allarch recipes again
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <[email protected]>
  1 file changed, 1 insertion(+)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 5fb00a4..f5702ba 100644
+index 24578ea..216e71f 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
 @@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
@@ -22,5 +22,5 @@ index 5fb00a4..f5702ba 100644
  known_cpu_families = (
 +    'allarch',
      'aarch64',
+     'alpha',
      'arc',
-     'arm',
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +8 -8
index 14a9a136664..76c1aa9ac1c 100644
@@ -1,4 +1,4 @@
-From baf7b94fec5a31b2d0cb162e43dbd28cc019f38e Mon Sep 17 00:00:00 2001
+From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001
 From: Ricardo Ribalda Delgado <[email protected]>
 Date: Wed, 15 Nov 2017 15:05:01 +0100
 Subject: [PATCH] native_bindir
@@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <[email protected]>
  2 files changed, 14 insertions(+), 11 deletions(-)
 
 diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
-index 35f0175..b39cba6 100644
+index f17b9f2..b5c9c92 100644
 --- a/mesonbuild/dependencies/base.py
 +++ b/mesonbuild/dependencies/base.py
 @@ -184,7 +184,7 @@ class Dependency:
@@ -43,7 +43,7 @@ index 35f0175..b39cba6 100644
          raise DependencyException('Method "get_pkgconfig_variable()" is '
                                    'invalid for an internal dependency')
 
-@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency):
+@@ -673,15 +673,18 @@ class PkgConfigDependency(ExternalDependency):
          return s.format(self.__class__.__name__, self.name, self.is_found,
                          self.version_reqs)
 
@@ -65,7 +65,7 @@ index 35f0175..b39cba6 100644
          # Always copy the environment since we're going to modify it
          # with pkg-config variables
          if env is None:
-@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -701,7 +704,7 @@ class PkgConfigDependency(ExternalDependency):
          targs = tuple(args)
          cache = PkgConfigDependency.pkgbin_cache
          if (self.pkgbin, targs, fenv) not in cache:
@@ -73,8 +73,8 @@ index 35f0175..b39cba6 100644
 +            cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native)
          return cache[(self.pkgbin, targs, fenv)]
 
-     def _convert_mingw_paths(self, args):
-@@ -885,7 +888,7 @@ class PkgConfigDependency(ExternalDependency):
+     def _convert_mingw_paths(self, args: List[str]) -> List[str]:
+@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
                                        (self.name, out_raw))
          self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
 
@@ -83,7 +83,7 @@ index 35f0175..b39cba6 100644
          options = ['--variable=' + variable_name, self.name]
 
          if 'define_variable' in kwargs:
-@@ -898,7 +901,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -920,7 +923,7 @@ class PkgConfigDependency(ExternalDependency):
 
              options = ['--define-variable=' + '='.join(definition)] + options
 
@@ -93,7 +93,7 @@ index 35f0175..b39cba6 100644
          if ret != 0:
              if self.required:
 diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
-index 6d784e6..73a9e13 100644
+index bdcc4a7..e2de847 100644
 --- a/mesonbuild/dependencies/ui.py
 +++ b/mesonbuild/dependencies/ui.py
 @@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency):
meta/recipes-devtools/meson/meson_0.53.0.bb renamed from meta/recipes-devtools/meson/meson_0.52.1.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.52.1.bb
rename to meta/recipes-devtools/meson/meson_0.53.0.bb
meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb +0 -1
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
--

2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#37 lore raw

Re: [PATCH 24/24] meson: update 0.52.1 -> 0.53.0

New meson more or less forces one of 'bfd', 'lfd' or 'gold' for that option (both as 'ld' in cross file and in LD from environment), as it is passed directly to -fuse-ld, and that option takes only the three variants.You can't place the actual binary name there.

There is a use case for letting meson recipes choose what they want for a linker, but that's an enhancement for some other time.

Alex

Quoted 324 lines · Khem Raj
Quoted 13 lines · Alexander Kanavin
---
 meta/classes/meson.bbclass                       |  9 ++++++++-
 meta/recipes-devtools/meson/meson.inc            |  4 ++--
 .../0001-Make-CPU-family-warnings-fatal.patch    | 12 ++++++------
 ...-do-not-manipulate-the-environment-when.patch | 16 ++++++++--------
 ...-Support-building-allarch-recipes-again.patch |  6 +++---
 .../meson/meson/0003-native_bindir.patch         | 16 ++++++++--------
 .../meson/{meson_0.52.1.bb => meson_0.53.0.bb}   |  0
 ...meson_0.52.1.bb => nativesdk-meson_0.53.0.bb} |  0
 8 files changed, 35 insertions(+), 28 deletions(-)
 rename meta/recipes-devtools/meson/{meson_0.52.1.bb => meson_0.53.0.bb}

(100%)

Quoted 1 line
 rename meta/recipes-devtools/meson/{nativesdk-meson_0.52.1.bb =>

nativesdk-meson_0.53.0.bb} (100%)

meta/classes/meson.bbclass addtask write_config before do_configure · line 85

Quoted 7 lines
meta/classes/meson.bbclass +0 -0
index 1ef34a999c8..1837c9468e6 100644
@@ -85,13 +85,16 @@ addtask write_config before do_configure
 do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS

CXXFLAGS LDFLAGS"

meta/classes/meson.bbclass addtask write_config before do_configure

Quoted 5 lines
meta/classes/meson.bbclass +3 -0
 do_write_config() {
     # This needs to be Py to split the args into single-element lists
+
+    # Meson requires ld to be 'bfd, 'lld' or 'gold' from 0.53 onwards
+    #

https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3

meta/classes/meson.bbclass addtask write_config before do_configure · line 97

Quoted 8 lines
meta/classes/meson.bbclass +1 -1
     cat >${WORKDIR}/meson.cross <<EOF
 [binaries]
 c = ${@meson_array('CC', d)}
 cpp = ${@meson_array('CXX', d)}
 ar = ${@meson_array('AR', d)}
 nm = ${@meson_array('NM', d)}
-ld = ${@meson_array('LD', d)}
+ld = 'bfd'

hardcoding to bfg would ignore gold or lld if users want to use those linkers. Since its a fallback
and this expects linker to be invoked by compiler driver, since its simply converting into -fuse-ld=<ld>
option to compiler, whereas in OE the var LD is set to represent bare linker. Perhaps leaving it unset is
better, we already have LD set in env.

meta/classes/meson.bbclass EOF · line 129

Quoted 9 lines
meta/classes/meson.bbclass +2 -0
 strip = ${@meson_array('STRIP', d)}
 readelf = ${@meson_array('READELF', d)}
 pkgconfig = 'pkg-config'
@@ -122,6 +125,10 @@ EOF
 CONFIGURE_FILES = "meson.build"
 
 meson_do_configure() {
+    # Meson requires this to be 'bfd, 'lld' or 'gold' from 0.53 onwards
+    #

https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3

Review

Quoted 6 lines
meta/classes/meson.bbclass +2 -0
+    unset LD
+
     # Work around "Meson fails if /tmp is mounted with noexec #2972"
     mkdir -p "${B}/meson-private/tmp"
     export TMPDIR="${B}/meson-private/tmp"
(quoted diff) +0 -0

b/meta/recipes-devtools/meson/meson.inc

meta/recipes-devtools/meson/meson.inc SRC_URI = "

Quoted 4 lines

index 881a14c7f0a..c0ce7d338bc 100644

meta/recipes-devtools/meson/meson.inc +0 -0
@@ -17,8 +17,8 @@ SRC_URI = "

https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P

Quoted 1 line

file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \

Quoted 1 line

file://0001-modules-python.py-do-not-substitute-python-s-install.patch \

Quoted 2 lines
            "

-SRC_URI[sha256sum] =

"0c277472e49950a5537e3de3e60c57b80dbf425788470a1a8ed27446128fc035"

meta/recipes-devtools/meson/meson.inc

Quoted 2 lines
meta/recipes-devtools/meson/meson.inc +1 -1
-SRC_URI[md5sum] = "a5f0c99567d772508f649a28ded7f8ad"
+SRC_URI[sha256sum] =

"035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6"

Quoted 5 lines

+SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3"

 SRC_URI_append_class-native = " \
     file://0001-Make-CPU-family-warnings-fatal.patch \

diff --git

a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch

Quoted 2 lines

index d4264cee526..74d5b4ca66e 100644
---

a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch

Quoted 1 line

+++

b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch

Quoted 20 lines
meta/recipes-devtools/meson/meson.inc +3 -3
@@ -1,4 +1,4 @@
-From cd980c763f11cfd928255346cc7e86f24add985e Mon Sep 17 00:00:00 2001
+From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Tue, 3 Jul 2018 13:59:09 +0100
 Subject: [PATCH] Make CPU family warnings fatal
@@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <[email protected]>
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 29d7422..5fb00a4 100644
+index 0f277a7..24578ea 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
-@@ -190,7 +190,7 @@ class MachineInfo:
+@@ -192,7 +192,7 @@ class MachineInfo:
 
          cpu_family = literal['cpu_family']
          if cpu_family not in known_cpu_families:

meta/recipes-devtools/meson/meson.inc index 29d7422..5fb00a4 100644 · line 31

Quoted 8 lines
meta/recipes-devtools/meson/meson.inc +1 -2
@@ -25,15 +25,15 @@ index 29d7422..5fb00a4 100644
          endian = literal['endian']
          if endian not in ('little', 'big'):
 diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index a9bc2b8..b91c8da 100644
+index dc8b14f..3aab71e 100644
 --- a/mesonbuild/environment.py
 +++ b/mesonbuild/environment.py
-@@ -348,9 +348,7 @@ def detect_cpu_family(compilers: CompilersDict) ->

str:

meta/recipes-devtools/meson/meson.inc index 29d7422..5fb00a4 100644 · line 31

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +1 -0
+@@ -354,9 +354,7 @@ def detect_cpu_family(compilers: CompilersDict) ->

str:

meta/recipes-devtools/meson/meson.inc index 29d7422..5fb00a4 100644 · line 36

Quoted 5 lines
meta/recipes-devtools/meson/meson.inc +0 -1
          trial = 'parisc'
 
      if trial not in known_cpu_families:
 -        mlog.warning('Unknown CPU family {!r}, please report this at '
--                     'https://github.com/mesonbuild/meson/issues/new

with the'

meta/recipes-devtools/meson/meson.inc index 29d7422..5fb00a4 100644 · line 36

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +1 -0
+-                     'https://github.com/mesonbuild/meson/issues/new

with the '

meta/recipes-devtools/meson/meson.inc index 29d7422..5fb00a4 100644 · line 37

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +0 -0
 -                     'output of `uname -a` and `cat

/proc/cpuinfo`'.format(trial))

meta/recipes-devtools/meson/meson.inc index 29d7422..5fb00a4 100644 · line 38

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +0 -0
 +        raise EnvironmentException('Unknown CPU family %s, see

https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)

Quoted 2 lines

diff --git

a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch

Quoted 2 lines

index bf715d1e9f4..eb0e90dbdda 100644
---

a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch

Quoted 1 line

+++

b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch

meta/recipes-devtools/meson/meson.inc line 4

Quoted 6 lines
meta/recipes-devtools/meson/meson.inc +1 -1
@@ -1,4 +1,4 @@
-From 3cb2c811dc6d4890342afa5b709cd30cf7b8f3ca Mon Sep 17 00:00:00 2001
+From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Mon, 19 Nov 2018 14:24:26 +0100
 Subject: [PATCH] python module: do not manipulate the environment when

calling

meta/recipes-devtools/meson/meson.inc Signed-off-by: Alexander Kanavin <

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +0 -0
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <

[email protected]>

Quoted 13 lines
meta/recipes-devtools/meson/meson.inc +2 -2
  1 file changed, 12 deletions(-)
 
 diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
-index 9cfbd6f..3ff687a 100644
+index 07be318..b770603 100644
 --- a/mesonbuild/modules/python.py
 +++ b/mesonbuild/modules/python.py
-@@ -75,11 +75,6 @@ class PythonDependency(ExternalDependency):
+@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
                  old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
                  old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
 

meta/recipes-devtools/meson/meson.inc index 9cfbd6f..3ff687a 100644 · line 28

Quoted 4 lines
meta/recipes-devtools/meson/meson.inc +0 -1
@@ -25,10 +25,10 @@ index 9cfbd6f..3ff687a 100644
 -                    os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
 -
                  try:
-                     self.pkgdep =

PkgConfigDependency('python-{}'.format(pkg_version), environment, kwargs)

meta/recipes-devtools/meson/meson.inc index 9cfbd6f..3ff687a 100644 · line 29

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +0 -1
-                     mlog.debug('Found "python-{}" via pkgconfig lookup

in LIBPC ({})'.format(pkg_version, pkg_libdir))

meta/recipes-devtools/meson/meson.inc index 9cfbd6f..3ff687a 100644 · line 31

Quoted 2 lines
meta/recipes-devtools/meson/meson.inc +0 -2
-@@ -88,13 +83,6 @@ class PythonDependency(ExternalDependency):
-                     mlog.debug('"python-{}" could not be found in

LIBPC ({})'.format(pkg_version, pkg_libdir))

meta/recipes-devtools/meson/meson.inc index 9cfbd6f..3ff687a 100644 · line 28

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +1 -0
+                     self.pkgdep = PkgConfigDependency(pkg_name,

environment, kwargs)

meta/recipes-devtools/meson/meson.inc index 9cfbd6f..3ff687a 100644 · line 29

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +1 -0
+                     mlog.debug('Found "{}" via pkgconfig lookup in

LIBPC ({})'.format(pkg_name, pkg_libdir))

meta/recipes-devtools/meson/meson.inc index 9cfbd6f..3ff687a 100644 · line 31

Quoted 2 lines
meta/recipes-devtools/meson/meson.inc +2 -0
+@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
+                     mlog.debug('"{}" could not be found in LIBPC

({})'.format(pkg_name, pkg_libdir))

meta/recipes-devtools/meson/meson.inc index 9cfbd6f..3ff687a 100644 · line 42

Quoted 8 lines
meta/recipes-devtools/meson/meson.inc +0 -1
                      mlog.debug(e)
 
 -                if old_pkg_path is not None:
@@ -39,5 +39,5 @@ index 9cfbd6f..3ff687a 100644
 -                else:
 -                    os.environ.pop('PKG_CONFIG_LIBDIR', None)
              else:
-                 mlog.debug('"python-{}" could not be found in LIBPC

({}), this is likely due to a relocated python
installation'.format(pkg_version, pkg_libdir))

meta/recipes-devtools/meson/meson.inc index 9cfbd6f..3ff687a 100644 · line 42

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +1 -0
+                 mlog.debug('"{}" could not be found in LIBPC ({}),

this is likely due to a relocated python installation'.format(pkg_name, pkg_libdir))

Quoted 2 lines

diff --git

a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch

Quoted 2 lines

index c8c7b298de3..1529ebe9fea 100644
---

a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch

Quoted 1 line

+++

b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch

meta/recipes-devtools/meson/meson.inc Signed-off-by: Peter Kjellerstedt <

Quoted 7 lines
meta/recipes-devtools/meson/meson.inc +1 -1
@@ -1,4 +1,4 @@
-From 4d223562c3e510e0dd62b608d184604e2cab6198 Mon Sep 17 00:00:00 2001
+From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00 2001
 From: Peter Kjellerstedt <[email protected]>
 Date: Thu, 26 Jul 2018 16:32:49 +0200
 Subject: [PATCH] Support building allarch recipes again
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <

[email protected]>

Review

Quoted 16 lines
meta/recipes-devtools/meson/meson.inc +2 -2
  1 file changed, 1 insertion(+)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 5fb00a4..f5702ba 100644
+index 24578ea..216e71f 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
 @@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
@@ -22,5 +22,5 @@ index 5fb00a4..f5702ba 100644
  known_cpu_families = (
 +    'allarch',
      'aarch64',
+     'alpha',
      'arc',
-     'arm',
(quoted diff) +0 -0

b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch

meta/recipes-devtools/meson/meson/0003-native_bindir.patch Signed-off-by: Ricardo Ribalda Delgado <

Quoted 10 lines

index 14a9a136664..76c1aa9ac1c 100644

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -1
@@ -1,4 +1,4 @@
-From baf7b94fec5a31b2d0cb162e43dbd28cc019f38e Mon Sep 17 00:00:00 2001
+From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001
 From: Ricardo Ribalda Delgado <[email protected]>
 Date: Wed, 15 Nov 2017 15:05:01 +0100
 Subject: [PATCH] native_bindir
@@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <

[email protected]>

meta/recipes-devtools/meson/meson/0003-native_bindir.patch Signed-off-by: Ricardo Ribalda Delgado <[email protected]>

Quoted 3 lines
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -0
  2 files changed, 14 insertions(+), 11 deletions(-)
 
 diff --git a/mesonbuild/dependencies/base.py

b/mesonbuild/dependencies/base.py

meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 35f0175..b39cba6 100644 · line 43

Quoted 7 lines
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -1
-index 35f0175..b39cba6 100644
+index f17b9f2..b5c9c92 100644
 --- a/mesonbuild/dependencies/base.py
 +++ b/mesonbuild/dependencies/base.py
 @@ -184,7 +184,7 @@ class Dependency:
@@ -43,7 +43,7 @@ index 35f0175..b39cba6 100644
          raise DependencyException('Method "get_pkgconfig_variable()"

is '

meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 35f0175..b39cba6 100644

Quoted 5 lines
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -1
                                    'invalid for an internal dependency')
 
-@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency):
+@@ -673,15 +673,18 @@ class PkgConfigDependency(ExternalDependency):
          return s.format(self.__class__.__name__, self.name,

self.is_found,

meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 35f0175..b39cba6 100644 · line 73

Quoted 13 lines
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -1
                          self.version_reqs)
 
@@ -65,7 +65,7 @@ index 35f0175..b39cba6 100644
          # Always copy the environment since we're going to modify it
          # with pkg-config variables
          if env is None:
-@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -701,7 +704,7 @@ class PkgConfigDependency(ExternalDependency):
          targs = tuple(args)
          cache = PkgConfigDependency.pkgbin_cache
          if (self.pkgbin, targs, fenv) not in cache:
@@ -73,8 +73,8 @@ index 35f0175..b39cba6 100644
 +            cache[(self.pkgbin, targs, fenv)] =

self._call_pkgbin_real(args, env, use_native)

meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 35f0175..b39cba6 100644

Quoted 8 lines
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +2 -2
          return cache[(self.pkgbin, targs, fenv)]
 
-     def _convert_mingw_paths(self, args):
-@@ -885,7 +888,7 @@ class PkgConfigDependency(ExternalDependency):
+     def _convert_mingw_paths(self, args: List[str]) -> List[str]:
+@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
                                        (self.name, out_raw))
          self.link_args, self.raw_link_args = self._search_libs(out,

out_raw)

meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 35f0175..b39cba6 100644 · line 88

Quoted 9 lines
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -1
@@ -83,7 +83,7 @@ index 35f0175..b39cba6 100644
          options = ['--variable=' + variable_name, self.name]
 
          if 'define_variable' in kwargs:
-@@ -898,7 +901,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -920,7 +923,7 @@ class PkgConfigDependency(ExternalDependency):
 
              options = ['--define-variable=' + '='.join(definition)] +

options

meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 35f0175..b39cba6 100644 · line 95

Quoted 5 lines
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -0
@@ -93,7 +93,7 @@ index 35f0175..b39cba6 100644
          if ret != 0:
              if self.required:
 diff --git a/mesonbuild/dependencies/ui.py

b/mesonbuild/dependencies/ui.py

Review

Quoted 6 lines
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -1
-index 6d784e6..73a9e13 100644
+index bdcc4a7..e2de847 100644
 --- a/mesonbuild/dependencies/ui.py
 +++ b/mesonbuild/dependencies/ui.py
 @@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency):
(quoted diff) +0 -0

b/meta/recipes-devtools/meson/meson_0.53.0.bb

Review

Quoted 4 lines

similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.52.1.bb rename to meta/recipes-devtools/meson/meson_0.53.0.bb

(quoted diff) +0 -0

b/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb

Quoted 11 lines

similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb rename to meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb --
2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#38 lore raw

Re: [PATCH 24/24] meson: update 0.52.1 -> 0.53.0

Quoted 5 lines · Alexander Kanavin

New meson more or less forces one of 'bfd', 'lfd' or 'gold' for that option (both as 'ld' in cross file and in LD from environment), as it is passed directly to -fuse-ld, and that option takes only the three variants.You can't place the actual binary name there.

That’s fine I guess we don’t need to set it here then
Perhaps. If meson expect compiler driver to be always called as LD that would be a problem for packages which currently might be using bare linker but perhaps those packages don’t use meson so it would be fine

Quoted 334 lines

There is a use case for letting meson recipes choose what they want for a linker, but that's an enhancement for some other time.

Alex

Quoted 326 lines · Khem Raj
Quoted 13 lines · Alexander Kanavin
---
 meta/classes/meson.bbclass                       |  9 ++++++++-
 meta/recipes-devtools/meson/meson.inc            |  4 ++--
 .../0001-Make-CPU-family-warnings-fatal.patch    | 12 ++++++------
 ...-do-not-manipulate-the-environment-when.patch | 16 ++++++++--------
 ...-Support-building-allarch-recipes-again.patch |  6 +++---
 .../meson/meson/0003-native_bindir.patch         | 16 ++++++++--------
 .../meson/{meson_0.52.1.bb => meson_0.53.0.bb}   |  0
 ...meson_0.52.1.bb => nativesdk-meson_0.53.0.bb} |  0
 8 files changed, 35 insertions(+), 28 deletions(-)
 rename meta/recipes-devtools/meson/{meson_0.52.1.bb => meson_0.53.0.bb}

(100%)

Quoted 1 line
 rename meta/recipes-devtools/meson/{nativesdk-meson_0.52.1.bb =>

nativesdk-meson_0.53.0.bb} (100%)

meta/classes/meson.bbclass addtask write_config before do_configure · line 85

Quoted 7 lines
meta/classes/meson.bbclass +0 -0
index 1ef34a999c8..1837c9468e6 100644
@@ -85,13 +85,16 @@ addtask write_config before do_configure
 do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS

CXXFLAGS LDFLAGS"

meta/classes/meson.bbclass addtask write_config before do_configure

Quoted 5 lines
meta/classes/meson.bbclass +3 -0
 do_write_config() {
     # This needs to be Py to split the args into single-element lists
+
+    # Meson requires ld to be 'bfd, 'lld' or 'gold' from 0.53 onwards
+    #

https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3

meta/classes/meson.bbclass addtask write_config before do_configure · line 97

Quoted 8 lines
meta/classes/meson.bbclass +1 -1
     cat >${WORKDIR}/meson.cross <<EOF
 [binaries]
 c = ${@meson_array('CC', d)}
 cpp = ${@meson_array('CXX', d)}
 ar = ${@meson_array('AR', d)}
 nm = ${@meson_array('NM', d)}
-ld = ${@meson_array('LD', d)}
+ld = 'bfd'

hardcoding to bfg would ignore gold or lld if users want to use those linkers. Since its a fallback
and this expects linker to be invoked by compiler driver, since its simply converting into -fuse-ld=<ld>
option to compiler, whereas in OE the var LD is set to represent bare linker. Perhaps leaving it unset is
better, we already have LD set in env.

meta/classes/meson.bbclass EOF · line 129

Quoted 9 lines
meta/classes/meson.bbclass +2 -0
 strip = ${@meson_array('STRIP', d)}
 readelf = ${@meson_array('READELF', d)}
 pkgconfig = 'pkg-config'
@@ -122,6 +125,10 @@ EOF
 CONFIGURE_FILES = "meson.build"
 
 meson_do_configure() {
+    # Meson requires this to be 'bfd, 'lld' or 'gold' from 0.53 onwards
+    #

https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3

Review

Quoted 6 lines
meta/classes/meson.bbclass +2 -0
+    unset LD
+
     # Work around "Meson fails if /tmp is mounted with noexec #2972"
     mkdir -p "${B}/meson-private/tmp"
     export TMPDIR="${B}/meson-private/tmp"
(quoted diff) +0 -0

b/meta/recipes-devtools/meson/meson.inc

meta/recipes-devtools/meson/meson.inc SRC_URI = "

Quoted 4 lines

index 881a14c7f0a..c0ce7d338bc 100644

meta/recipes-devtools/meson/meson.inc +0 -0
@@ -17,8 +17,8 @@ SRC_URI = "

https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P

Quoted 1 line

file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \

Quoted 1 line

file://0001-modules-python.py-do-not-substitute-python-s-install.patch \

Quoted 2 lines
            "

-SRC_URI[sha256sum] =

"0c277472e49950a5537e3de3e60c57b80dbf425788470a1a8ed27446128fc035"

meta/recipes-devtools/meson/meson.inc

Quoted 2 lines
meta/recipes-devtools/meson/meson.inc +1 -1
-SRC_URI[md5sum] = "a5f0c99567d772508f649a28ded7f8ad"
+SRC_URI[sha256sum] =

"035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6"

Quoted 5 lines

+SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3"

 SRC_URI_append_class-native = " \
     file://0001-Make-CPU-family-warnings-fatal.patch \

diff --git

a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch

Quoted 2 lines

index d4264cee526..74d5b4ca66e 100644
---

a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch

Quoted 1 line

+++

b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch

Quoted 20 lines
meta/recipes-devtools/meson/meson.inc +3 -3
@@ -1,4 +1,4 @@
-From cd980c763f11cfd928255346cc7e86f24add985e Mon Sep 17 00:00:00 2001
+From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Tue, 3 Jul 2018 13:59:09 +0100
 Subject: [PATCH] Make CPU family warnings fatal
@@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <[email protected]>
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 29d7422..5fb00a4 100644
+index 0f277a7..24578ea 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
-@@ -190,7 +190,7 @@ class MachineInfo:
+@@ -192,7 +192,7 @@ class MachineInfo:
 
          cpu_family = literal['cpu_family']
          if cpu_family not in known_cpu_families:

meta/recipes-devtools/meson/meson.inc index 29d7422..5fb00a4 100644 · line 31

Quoted 8 lines
meta/recipes-devtools/meson/meson.inc +1 -2
@@ -25,15 +25,15 @@ index 29d7422..5fb00a4 100644
          endian = literal['endian']
          if endian not in ('little', 'big'):
 diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index a9bc2b8..b91c8da 100644
+index dc8b14f..3aab71e 100644
 --- a/mesonbuild/environment.py
 +++ b/mesonbuild/environment.py
-@@ -348,9 +348,7 @@ def detect_cpu_family(compilers: CompilersDict) ->

str:

meta/recipes-devtools/meson/meson.inc index 29d7422..5fb00a4 100644 · line 31

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +1 -0
+@@ -354,9 +354,7 @@ def detect_cpu_family(compilers: CompilersDict) ->

str:

meta/recipes-devtools/meson/meson.inc index 29d7422..5fb00a4 100644 · line 36

Quoted 5 lines
meta/recipes-devtools/meson/meson.inc +0 -1
          trial = 'parisc'
 
      if trial not in known_cpu_families:
 -        mlog.warning('Unknown CPU family {!r}, please report this at '
--                     'https://github.com/mesonbuild/meson/issues/new

with the'

meta/recipes-devtools/meson/meson.inc index 29d7422..5fb00a4 100644 · line 36

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +1 -0
+-                     'https://github.com/mesonbuild/meson/issues/new

with the '

meta/recipes-devtools/meson/meson.inc index 29d7422..5fb00a4 100644 · line 37

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +0 -0
 -                     'output of `uname -a` and `cat

/proc/cpuinfo`'.format(trial))

meta/recipes-devtools/meson/meson.inc index 29d7422..5fb00a4 100644 · line 38

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +0 -0
 +        raise EnvironmentException('Unknown CPU family %s, see

https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)

Quoted 2 lines

diff --git

a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch

Quoted 2 lines

index bf715d1e9f4..eb0e90dbdda 100644
---

a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch

Quoted 1 line

+++

b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch

meta/recipes-devtools/meson/meson.inc line 4

Quoted 6 lines
meta/recipes-devtools/meson/meson.inc +1 -1
@@ -1,4 +1,4 @@
-From 3cb2c811dc6d4890342afa5b709cd30cf7b8f3ca Mon Sep 17 00:00:00 2001
+From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Mon, 19 Nov 2018 14:24:26 +0100
 Subject: [PATCH] python module: do not manipulate the environment when

calling

meta/recipes-devtools/meson/meson.inc Signed-off-by: Alexander Kanavin <

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +0 -0
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <

[email protected]>

meta/recipes-devtools/meson/meson.inc Signed-off-by: Alexander Kanavin < · line 14

Quoted 3 lines
meta/recipes-devtools/meson/meson.inc +0 -0
  1 file changed, 12 deletions(-)
 
 diff --git a/mesonbuild/modules/python.py

b/mesonbuild/modules/python.py

Quoted 10 lines
meta/recipes-devtools/meson/meson.inc +2 -2
-index 9cfbd6f..3ff687a 100644
+index 07be318..b770603 100644
 --- a/mesonbuild/modules/python.py
 +++ b/mesonbuild/modules/python.py
-@@ -75,11 +75,6 @@ class PythonDependency(ExternalDependency):
+@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
                  old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
                  old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
 

meta/recipes-devtools/meson/meson.inc index 9cfbd6f..3ff687a 100644 · line 28

Quoted 4 lines
meta/recipes-devtools/meson/meson.inc +0 -1
@@ -25,10 +25,10 @@ index 9cfbd6f..3ff687a 100644
 -                    os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
 -
                  try:
-                     self.pkgdep =

PkgConfigDependency('python-{}'.format(pkg_version), environment, kwargs)

meta/recipes-devtools/meson/meson.inc index 9cfbd6f..3ff687a 100644 · line 29

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +0 -1
-                     mlog.debug('Found "python-{}" via pkgconfig

lookup in LIBPC ({})'.format(pkg_version, pkg_libdir))

meta/recipes-devtools/meson/meson.inc index 9cfbd6f..3ff687a 100644 · line 31

Quoted 2 lines
meta/recipes-devtools/meson/meson.inc +0 -2
-@@ -88,13 +83,6 @@ class PythonDependency(ExternalDependency):
-                     mlog.debug('"python-{}" could not be found in

LIBPC ({})'.format(pkg_version, pkg_libdir))

meta/recipes-devtools/meson/meson.inc index 9cfbd6f..3ff687a 100644 · line 28

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +1 -0
+                     self.pkgdep = PkgConfigDependency(pkg_name,

environment, kwargs)

meta/recipes-devtools/meson/meson.inc index 9cfbd6f..3ff687a 100644 · line 29

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +1 -0
+                     mlog.debug('Found "{}" via pkgconfig lookup in

LIBPC ({})'.format(pkg_name, pkg_libdir))

meta/recipes-devtools/meson/meson.inc index 9cfbd6f..3ff687a 100644 · line 31

Quoted 2 lines
meta/recipes-devtools/meson/meson.inc +2 -0
+@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
+                     mlog.debug('"{}" could not be found in LIBPC

({})'.format(pkg_name, pkg_libdir))

meta/recipes-devtools/meson/meson.inc index 9cfbd6f..3ff687a 100644 · line 42

Quoted 8 lines
meta/recipes-devtools/meson/meson.inc +0 -1
                      mlog.debug(e)
 
 -                if old_pkg_path is not None:
@@ -39,5 +39,5 @@ index 9cfbd6f..3ff687a 100644
 -                else:
 -                    os.environ.pop('PKG_CONFIG_LIBDIR', None)
              else:
-                 mlog.debug('"python-{}" could not be found in LIBPC

({}), this is likely due to a relocated python
installation'.format(pkg_version, pkg_libdir))

meta/recipes-devtools/meson/meson.inc index 9cfbd6f..3ff687a 100644 · line 42

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +1 -0
+                 mlog.debug('"{}" could not be found in LIBPC ({}),

this is likely due to a relocated python installation'.format(pkg_name, pkg_libdir))

Quoted 2 lines

diff --git

a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch

Quoted 2 lines

index c8c7b298de3..1529ebe9fea 100644
---

a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch

Quoted 1 line

+++

b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch

meta/recipes-devtools/meson/meson.inc Signed-off-by: Peter Kjellerstedt <

Quoted 7 lines
meta/recipes-devtools/meson/meson.inc +1 -1
@@ -1,4 +1,4 @@
-From 4d223562c3e510e0dd62b608d184604e2cab6198 Mon Sep 17 00:00:00 2001
+From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00 2001
 From: Peter Kjellerstedt <[email protected]>
 Date: Thu, 26 Jul 2018 16:32:49 +0200
 Subject: [PATCH] Support building allarch recipes again
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <

[email protected]>

Review

Quoted 16 lines
meta/recipes-devtools/meson/meson.inc +2 -2
  1 file changed, 1 insertion(+)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 5fb00a4..f5702ba 100644
+index 24578ea..216e71f 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
 @@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
@@ -22,5 +22,5 @@ index 5fb00a4..f5702ba 100644
  known_cpu_families = (
 +    'allarch',
      'aarch64',
+     'alpha',
      'arc',
-     'arm',
(quoted diff) +0 -0

b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch

meta/recipes-devtools/meson/meson/0003-native_bindir.patch Signed-off-by: Ricardo Ribalda Delgado <

Quoted 10 lines

index 14a9a136664..76c1aa9ac1c 100644

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -1
@@ -1,4 +1,4 @@
-From baf7b94fec5a31b2d0cb162e43dbd28cc019f38e Mon Sep 17 00:00:00 2001
+From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001
 From: Ricardo Ribalda Delgado <[email protected]>
 Date: Wed, 15 Nov 2017 15:05:01 +0100
 Subject: [PATCH] native_bindir
@@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <

[email protected]>

meta/recipes-devtools/meson/meson/0003-native_bindir.patch Signed-off-by: Ricardo Ribalda Delgado <[email protected]>

Quoted 3 lines
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -0
  2 files changed, 14 insertions(+), 11 deletions(-)
 
 diff --git a/mesonbuild/dependencies/base.py

b/mesonbuild/dependencies/base.py

meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 35f0175..b39cba6 100644 · line 43

Quoted 7 lines
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -1
-index 35f0175..b39cba6 100644
+index f17b9f2..b5c9c92 100644
 --- a/mesonbuild/dependencies/base.py
 +++ b/mesonbuild/dependencies/base.py
 @@ -184,7 +184,7 @@ class Dependency:
@@ -43,7 +43,7 @@ index 35f0175..b39cba6 100644
          raise DependencyException('Method "get_pkgconfig_variable()"

is '

meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 35f0175..b39cba6 100644 · line 44

Quoted 1 line
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -0
                                    'invalid for an internal

dependency')

meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 35f0175..b39cba6 100644

Quoted 4 lines
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -1
-@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency):
+@@ -673,15 +673,18 @@ class PkgConfigDependency(ExternalDependency):
          return s.format(self.__class__.__name__, self.name,

self.is_found,

meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 35f0175..b39cba6 100644 · line 73

Quoted 13 lines
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -1
                          self.version_reqs)
 
@@ -65,7 +65,7 @@ index 35f0175..b39cba6 100644
          # Always copy the environment since we're going to modify it
          # with pkg-config variables
          if env is None:
-@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -701,7 +704,7 @@ class PkgConfigDependency(ExternalDependency):
          targs = tuple(args)
          cache = PkgConfigDependency.pkgbin_cache
          if (self.pkgbin, targs, fenv) not in cache:
@@ -73,8 +73,8 @@ index 35f0175..b39cba6 100644
 +            cache[(self.pkgbin, targs, fenv)] =

self._call_pkgbin_real(args, env, use_native)

meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 35f0175..b39cba6 100644

Quoted 8 lines
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +2 -2
          return cache[(self.pkgbin, targs, fenv)]
 
-     def _convert_mingw_paths(self, args):
-@@ -885,7 +888,7 @@ class PkgConfigDependency(ExternalDependency):
+     def _convert_mingw_paths(self, args: List[str]) -> List[str]:
+@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
                                        (self.name, out_raw))
          self.link_args, self.raw_link_args = self._search_libs(out,

out_raw)

meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 35f0175..b39cba6 100644 · line 88

Quoted 9 lines
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -1
@@ -83,7 +83,7 @@ index 35f0175..b39cba6 100644
          options = ['--variable=' + variable_name, self.name]
 
          if 'define_variable' in kwargs:
-@@ -898,7 +901,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -920,7 +923,7 @@ class PkgConfigDependency(ExternalDependency):
 
              options = ['--define-variable=' + '='.join(definition)] +

options

meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 35f0175..b39cba6 100644 · line 95

Quoted 5 lines
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -0
@@ -93,7 +93,7 @@ index 35f0175..b39cba6 100644
          if ret != 0:
              if self.required:
 diff --git a/mesonbuild/dependencies/ui.py

b/mesonbuild/dependencies/ui.py

Review

Quoted 6 lines
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -1
-index 6d784e6..73a9e13 100644
+index bdcc4a7..e2de847 100644
 --- a/mesonbuild/dependencies/ui.py
 +++ b/mesonbuild/dependencies/ui.py
 @@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency):
(quoted diff) +0 -0

b/meta/recipes-devtools/meson/meson_0.53.0.bb

Review

Quoted 4 lines

similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.52.1.bb rename to meta/recipes-devtools/meson/meson_0.53.0.bb

(quoted diff) +0 -0

b/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb

Quoted 11 lines

similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb rename to meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb --
2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#39 lore raw

✗ patchtest: failure for "python3: update to 3.8.1..." and 23 more

In reply to Alexander Kanavin

== Series Details ==

Series: "python3: update to 3.8.1..." and 23 more
Revision: 1
URL : https://patchwork.openembedded.org/series/22164/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Upstream-Status is in incorrect format [test_upstream_status_presence_format]

  Suggested fix    Fix Upstream-Status format in 0001-Manually-applied-upstream-fix-for-openssh-test.patch
  Current          Upstream Status: Backport:
  Standard format  Upstream-Status: <Valid status>
  Valid status     Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where]

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe