Skip to contentSkip to conversation

webkit/wpe: only check even versions

PATCH In review Alexander Kanavin 6 participants 55 messages Feb 28, 2021 – Mar 9, 2021 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/24 webkit/wpe: only check even versions

---
 meta/recipes-sato/webkit/libwpe_1.8.0.bb         | 4 ++++
 meta/recipes-sato/webkit/wpebackend-fdo_1.8.0.bb | 3 +++
 2 files changed, 7 insertions(+)
meta/recipes-sato/webkit/libwpe_1.8.0.bb +4 -0
index a81e6960b2..164831be39 100644
@@ -15,3 +15,7 @@ REQUIRED_DISTRO_FEATURES = "opengl"
 
 SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
 SRC_URI[sha256sum] = "a6f00a7d091cbd4db57fe7ee3b4c12c6350921d654ed79812800a26c888481d2"
+
+# This is a tweak of upstream-version-is-even needed because
+# ipstream directory contains tarballs for other components as well.
+UPSTREAM_CHECK_REGEX = "libwpe-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar"
meta/recipes-sato/webkit/wpebackend-fdo_1.8.0.bb +3 -0
index 69d6098d36..344aa9717c 100644
@@ -15,3 +15,6 @@ REQUIRED_DISTRO_FEATURES = "opengl"
 SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
 SRC_URI[sha256sum] = "9652a99c75fe1c6eab0585b6395f4e104b2427e4d1f42969f1f77df29920d253"
 
+# This is a tweak of upstream-version-is-even needed because
+# ipstream directory contains tarballs for other components as well.
+UPSTREAM_CHECK_REGEX = "wpebackend-fdo-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar"
Signature · 1 line
2.29.2
#1 lore raw

PATCH 2/24 bmap-tools: upgrade 3.5 -> 3.6

---
 .../bmap-tools/{bmap-tools_3.5.bb => bmap-tools_3.6.bb}       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/bmap-tools/{bmap-tools_3.5.bb => bmap-tools_3.6.bb} (89%)
meta/recipes-support/bmap-tools/bmap-tools_3.6.bb renamed from meta/recipes-support/bmap-tools/bmap-tools_3.5.bb +2 -2
similarity index 89%
rename from meta/recipes-support/bmap-tools/bmap-tools_3.5.bb
rename to meta/recipes-support/bmap-tools/bmap-tools_3.6.bb
index fd57f8f7f0..95cf00804d 100644
@@ -11,13 +11,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://github.com/intel/${BPN}"
 
-SRCREV = "a17f0e3ff8669dd3b1c44a741ae4f8162155faed"
+SRCREV = "c0673962a8ec1624b5189dc1d24f33fe4f06785a"
 S = "${WORKDIR}/git"
 PV .= "+git${SRCPV}"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
-RDEPENDS_${PN} = "python3-core python3-compression python3-mmap python3-setuptools python3-fcntl python3-six"
+RDEPENDS_${PN} = "python3-core python3-compression python3-mmap python3-setuptools python3-fcntl python3-six coreutils"
 
 inherit python3native
 inherit setuptools3
Signature · 1 line
2.29.2
#2 lore raw

Re: [OE-core] [PATCH 02/24] bmap-tools: upgrade 3.5 -> 3.6

Quoted 16 lines · Alexander Kanavin
---
  .../bmap-tools/{bmap-tools_3.5.bb => bmap-tools_3.6.bb}       | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

rename meta/recipes-support/bmap-tools/{bmap-tools_3.5.bb => bmap-tools_3.6.bb} (89%)

meta/recipes-support/bmap-tools/bmap-tools_3.6.bb renamed from meta/recipes-support/bmap-tools/bmap-tools_3.5.bb +0 -0
similarity index 89%
rename from meta/recipes-support/bmap-tools/bmap-tools_3.5.bb
rename to meta/recipes-support/bmap-tools/bmap-tools_3.6.bb
index fd57f8f7f0..95cf00804d 100644
@@ -11,13 +11,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
  SRC_URI = "git://github.com/intel/${BPN}"

meta/recipes-support/bmap-tools/bmap-tools_3.6.bb LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" · line 20

Quoted 10 lines
meta/recipes-support/bmap-tools/bmap-tools_3.6.bb renamed from meta/recipes-support/bmap-tools/bmap-tools_3.5.bb +2 -2
 
-SRCREV = "a17f0e3ff8669dd3b1c44a741ae4f8162155faed"
+SRCREV = "c0673962a8ec1624b5189dc1d24f33fe4f06785a"
  S = "${WORKDIR}/git"
  PV .= "+git${SRCPV}"
 
  UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
-RDEPENDS_${PN} = "python3-core python3-compression python3-mmap python3-setuptools python3-fcntl python3-six"
+RDEPENDS_${PN} = "python3-core python3-compression python3-mmap python3-setuptools python3-fcntl python3-six coreutils"

what needs coreutils at runtime ? and which utilities

Quoted 8 lines
meta/recipes-support/bmap-tools/bmap-tools_3.6.bb renamed from meta/recipes-support/bmap-tools/bmap-tools_3.5.bb +0 -0
  inherit python3native
  inherit setuptools3
 
#3 lore raw

Re: [OE-core] [PATCH 02/24] bmap-tools: upgrade 3.5 -> 3.6

Quoted 8 lines · Khem Raj
Quoted 2 lines

-RDEPENDS_${PN} = "python3-core python3-compression python3-mmap

python3-setuptools python3-fcntl python3-six"

Quoted 1 line

+RDEPENDS_${PN} = "python3-core python3-compression python3-mmap

python3-setuptools python3-fcntl python3-six coreutils"

what needs coreutils at runtime ? and which utilities

df, introduced here:
https://github.com/intel/bmap-tools/commit/f1cd6ec8ef29beb556f1b725aaf6916ba29a61fe

Alex

#4 lore raw

Re: [OE-core] [PATCH 02/24] bmap-tools: upgrade 3.5 -> 3.6

Quoted 8 lines · Alexander Kanavin

On Sun, 28 Feb 2021 at 19:35, Khem Raj <[email protected] <mailto:[email protected]>> wrote:

> -RDEPENDS_${PN} = "python3-core python3-compression python3-mmap
python3-setuptools python3-fcntl python3-six"
> +RDEPENDS_${PN} = "python3-core python3-compression python3-mmap
python3-setuptools python3-fcntl python3-six coreutils"

Quoted 5 lines

what needs coreutils at runtime ? and which utilities

df, introduced here: https://github.com/intel/bmap-tools/commit/f1cd6ec8ef29beb556f1b725aaf6916ba29a61fe <https://github.com/intel/bmap-tools/commit/f1cd6ec8ef29beb556f1b725aaf6916ba29a61fe>

OK, df is also provided by busybox so I think we will always have df in rootfs, unless it specifically need df from coreutils, perhaps we dont need to be specific about the rdep

Quoted 1 line

Alex

#5 lore raw

Re: [OE-core] [PATCH 02/24] bmap-tools: upgrade 3.5 -> 3.6

Quoted 4 lines · Khem Raj

OK, df is also provided by busybox so I think we will always have df in rootfs, unless it specifically need df from coreutils, perhaps we dont need to be specific about the rdep

This was added because otherwise I was getting errors with bmap-tools-native.

Alex

#6 lore raw

PATCH 3/24 dnf: upgrade 4.5.2 -> 4.6.0

In reply to Alexander Kanavin
---
 meta/recipes-devtools/dnf/{dnf_4.5.2.bb => dnf_4.6.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/dnf/{dnf_4.5.2.bb => dnf_4.6.0.bb} (98%)
meta/recipes-devtools/dnf/dnf_4.6.0.bb renamed from meta/recipes-devtools/dnf/dnf_4.5.2.bb +1 -1
similarity index 98%
rename from meta/recipes-devtools/dnf/dnf_4.5.2.bb
rename to meta/recipes-devtools/dnf/dnf_4.6.0.bb
index c746dc30db..6651e64352 100644
@@ -18,7 +18,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \
            file://0001-dnf-write-the-log-lock-to-root.patch \
            "
 
-SRCREV = "36a3ffaee4db76a7efe7d40f4e42ce679b6a6920"
+SRCREV = "c826d7db401ebf9b59b2fa74570a919e4af2673e"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.29.2
#7 lore raw

PATCH 4/24 ccache: update 4.1 -> 4.2

In reply to Alexander Kanavin

Drop patches:
0001-Improve-SIMD-detection-735.patch is a backport 0002-Always-use-64bit-to-print-time_t.patch merged upstream 0001-blake3-Remove-asm-checks-for-sse-avx.patch is superseded by upstream fixing the issue differently.

License-Update: copyright years

---
 .../0001-Improve-SIMD-detection-735.patch     | 121 ------------------
 ...blake3-Remove-asm-checks-for-sse-avx.patch |  35 -----
 ...002-Always-use-64bit-to-print-time_t.patch |  33 -----
 .../ccache/{ccache_4.1.bb => ccache_4.2.bb}   |  10 +-
 4 files changed, 3 insertions(+), 196 deletions(-)
 delete mode 100644 meta/recipes-devtools/ccache/ccache/0001-Improve-SIMD-detection-735.patch
 delete mode 100644 meta/recipes-devtools/ccache/ccache/0001-blake3-Remove-asm-checks-for-sse-avx.patch
 delete mode 100644 meta/recipes-devtools/ccache/ccache/0002-Always-use-64bit-to-print-time_t.patch
 rename meta/recipes-devtools/ccache/{ccache_4.1.bb => ccache_4.2.bb} (60%)
meta/recipes-devtools/ccache/ccache/0001-Improve-SIMD-detection-735.patch deleted +0 -121
deleted file mode 100644
index 12d4ebc4bc..0000000000
@@ -1,121 +0,0 @@
-From 05d290165a3b61da09b715e6c8e62cebebab57cc Mon Sep 17 00:00:00 2001
-From: Erik Flodin <[email protected]>
-Date: Mon, 7 Dec 2020 19:20:31 +0100
-Subject: [PATCH 1/2] Improve SIMD detection (#735)
-
-* Try to compile code to detect SSE/AVX support. Just checking if the compiler
-  supports the flag isn't enough as e.g. Clang on Apple's new ARM silicon seems
-  to accept the flag but then fails when building.
-* Try to detect and enable BLAKE3's Neon support.
-* Improve detection of AVX2 target attribute support and remove the explicit
-  compiler version check that hopefully shouldn't be needed.
-
-Fixes #734.
-Upstream-Status: Backport [https://github.com/ccache/ccache/commit/b438f50388dd00285083260f60450e6237b7d58f]
-Signed-off-by: Khem Raj <[email protected]>
----
- cmake/GenerateConfigurationFile.cmake | 25 +++++++++---------
- src/third_party/blake3/CMakeLists.txt | 38 ++++++++++++++++++++-------
- 2 files changed, 42 insertions(+), 21 deletions(-)
-
-diff --git a/cmake/GenerateConfigurationFile.cmake b/cmake/GenerateConfigurationFile.cmake
-index a21861f4..836ff9bb 100644
---- a/cmake/GenerateConfigurationFile.cmake
-+++ b/cmake/GenerateConfigurationFile.cmake
-@@ -67,18 +67,19 @@ check_struct_has_member("struct stat" st_mtim sys/stat.h
- check_struct_has_member("struct statfs" f_fstypename sys/mount.h
-                         HAVE_STRUCT_STATFS_F_FSTYPENAME)
- 
--include(CheckCXXCompilerFlag)
--
--# Old GCC versions don't have the required header support.
--# Old Apple Clang versions seem to support -mavx2 but not the target
--# attribute that's used to enable AVX2 for a certain function.
--if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
--   OR (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0))
--  message(STATUS "Detected unsupported compiler for HAVE_AVX2 - disabled")
--  set(HAVE_AVX2 FALSE)
--else()
--  check_cxx_compiler_flag(-mavx2 HAVE_AVX2)
--endif()
-+include(CheckCXXSourceCompiles)
-+check_cxx_source_compiles(
-+  [=[
-+    #include <immintrin.h>
-+    void func() __attribute__((target("avx2")));
-+    void func() { _mm256_abs_epi8(_mm256_set1_epi32(42)); }
-+    int main()
-+    {
-+      func();
-+      return 0;
-+    }
-+  ]=]
-+  HAVE_AVX2)
- 
- list(APPEND CMAKE_REQUIRED_LIBRARIES ws2_32)
- list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES ws2_32)
-diff --git a/src/third_party/blake3/CMakeLists.txt b/src/third_party/blake3/CMakeLists.txt
-index a75e5611..cc24253c 100644
---- a/src/third_party/blake3/CMakeLists.txt
-+++ b/src/third_party/blake3/CMakeLists.txt
-@@ -13,9 +13,9 @@ else()
- endif()
- 
- include(CheckAsmCompilerFlag)
--include(CheckCCompilerFlag)
-+include(CheckCSourceCompiles)
- 
--function(add_source_if_enabled feature compile_flags)
-+function(add_source_if_enabled feature compile_flags intrinsic)
-   string(TOUPPER "have_${blake_source_type}_${feature}" have_feature)
- 
-   # AVX512 support fails to compile with old Apple Clang versions even though
-@@ -28,7 +28,14 @@ function(add_source_if_enabled feature compile_flags)
-   elseif(${blake_source_type} STREQUAL "asm")
-     check_asm_compiler_flag(${compile_flags} ${have_feature})
-   else()
--    check_c_compiler_flag(${compile_flags} ${have_feature})
-+    set(CMAKE_REQUIRED_FLAGS ${compile_flags})
-+    check_c_source_compiles(
-+      [=[
-+        #include <immintrin.h>
-+        int main() { ${intrinsic}; return 0; }
-+      ]=]
-+      ${have_feature})
-+    unset(CMAKE_REQUIRED_FLAGS)
-   endif()
- 
-   if(${have_feature})
-@@ -42,10 +49,23 @@ function(add_source_if_enabled feature compile_flags)
-   endif()
- endfunction()
- 
--add_source_if_enabled(sse2 "-msse2")
--add_source_if_enabled(sse41 "-msse4.1")
--add_source_if_enabled(avx2 "-mavx2")
--add_source_if_enabled(avx512 "-mavx512f -mavx512vl")
-+# https://software.intel.com/sites/landingpage/IntrinsicsGuide/
-+add_source_if_enabled(sse2 "-msse2" "_mm_set1_epi32(42)")
-+add_source_if_enabled(sse41 "-msse4.1" "_mm_test_all_ones(_mm_set1_epi32(42))")
-+add_source_if_enabled(avx2 "-mavx2" "_mm256_abs_epi8(_mm256_set1_epi32(42))")
-+add_source_if_enabled(avx512 "-mavx512f -mavx512vl" "_mm256_abs_epi64(_mm256_set1_epi32(42))")
- 
--# TODO: how to detect ARM NEON support?
--# If NEON, define BLAKE3_USE_NEON and build blake3_neon.c
-+# Neon is always available on AArch64
-+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-+  # https://developer.arm.com/architectures/instruction-sets/simd-isas/neon/intrinsics
-+  check_c_source_compiles(
-+    [=[
-+      #include <arm_neon.h>
-+      int main() { vdupq_n_s32(42); return 0; }
-+    ]=]
-+    HAVE_NEON)
-+  if(HAVE_NEON)
-+    target_sources(blake3 PRIVATE blake3_neon.c)
-+    target_compile_definitions(blake3 PRIVATE BLAKE3_USE_NEON)
-+  endif()
-+endif()
--- 
-2.30.0
-
meta/recipes-devtools/ccache/ccache/0001-blake3-Remove-asm-checks-for-sse-avx.patch deleted +0 -35
deleted file mode 100644
index bdabb381aa..0000000000
@@ -1,35 +0,0 @@
-From 0448eddcf2863ebf911e7dd445bca1c7eee2a239 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Tue, 5 Jan 2021 13:55:34 -0800
-Subject: [PATCH] blake3: Remove asm checks for sse/avx
-
-This ends up passing on clang/linux wrongly when building for aarch64
-the check in else part is good to detect the feature support and this
-check can be removed, it was setting
-
-HAVE_ASM_AVX* and HAVE_ASM_SSE* macros which are not used in the build
-anyway
-
-Upstream-Status: Submitted [https://github.com/ccache/ccache/pull/768]
-
-Signed-off-by: Khem Raj <[email protected]>
----
- src/third_party/blake3/CMakeLists.txt | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/third_party/blake3/CMakeLists.txt b/src/third_party/blake3/CMakeLists.txt
-index cc24253c..856b5721 100644
---- a/src/third_party/blake3/CMakeLists.txt
-+++ b/src/third_party/blake3/CMakeLists.txt
-@@ -25,8 +25,6 @@ function(add_source_if_enabled feature compile_flags intrinsic)
-       AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
-     message(STATUS "Detected unsupported compiler for ${have_feature} - disabled")
-     set(${have_feature} FALSE)
--  elseif(${blake_source_type} STREQUAL "asm")
--    check_asm_compiler_flag(${compile_flags} ${have_feature})
-   else()
-     set(CMAKE_REQUIRED_FLAGS ${compile_flags})
-     check_c_source_compiles(
--- 
-2.30.0
-
meta/recipes-devtools/ccache/ccache/0002-Always-use-64bit-to-print-time_t.patch deleted +0 -33
deleted file mode 100644
index 85ce2b762d..0000000000
@@ -1,33 +0,0 @@
-From fa360ca8a457dafcae1d22df2b342d3ee291e8af Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Thu, 31 Dec 2020 14:28:39 -0800
-Subject: [PATCH 2/2] Always use 64bit to print time_t
-
-some 32bit architectures e.g. RISCV32 use 64bit time_t from beginning
-which does not fit into long int size on LP32 systems
-
-Upstream-Status: Submitted [https://github.com/ccache/ccache/pull/762]
-Signed-off-by: Khem Raj <[email protected]>
----
- src/Logging.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/Logging.cpp b/src/Logging.cpp
-index 9a5d99b7..1a6e6264 100644
---- a/src/Logging.cpp
-+++ b/src/Logging.cpp
-@@ -88,7 +88,10 @@ do_log(string_view message, bool bulk)
-     if (tm) {
-       strftime(timestamp, sizeof(timestamp), "%Y-%m-%dT%H:%M:%S", &*tm);
-     } else {
--      snprintf(timestamp, sizeof(timestamp), "%lu", tv.tv_sec);
-+      snprintf(timestamp,
-+               sizeof(timestamp),
-+               "%llu",
-+               (long long unsigned int)tv.tv_sec);
-     }
-     snprintf(prefix,
-              sizeof(prefix),
--- 
-2.30.0
-
meta/recipes-devtools/ccache/ccache_4.2.bb renamed from meta/recipes-devtools/ccache/ccache_4.1.bb +3 -7
similarity index 60%
rename from meta/recipes-devtools/ccache/ccache_4.1.bb
rename to meta/recipes-devtools/ccache/ccache_4.2.bb
index 6bd46b1017..9957bc7e65 100644
@@ -7,16 +7,12 @@ HOMEPAGE = "http://ccache.samba.org"
 SECTION = "devel"
 
 LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=a66c581f855c1c408730fe5d171e3013"
+LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=28afb89f649f309e7ac1aab554564637"
 
 DEPENDS = "zstd"
 
-SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz \
-           file://0001-Improve-SIMD-detection-735.patch \
-           file://0002-Always-use-64bit-to-print-time_t.patch \
-           file://0001-blake3-Remove-asm-checks-for-sse-avx.patch \
-           "
-SRC_URI[sha256sum] = "cdeefb827b3eef3b42b5454858123881a4a90abbd46cc72cf8c20b3bd039deb7"
+SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz"
+SRC_URI[sha256sum] = "dbf139ff32031b54cb47f2d7983269f328df14b5a427882f89f7721e5c411b7e"
 
 UPSTREAM_CHECK_URI = "https://github.com/ccache/ccache/releases/"
 
Signature · 1 line
2.29.2
#8 lore raw

PATCH 5/24 dosfstools: update 4.1 -> 4.2

In reply to Alexander Kanavin

udev support had been dropped upstream.

---
 .../{dosfstools_4.1.bb => dosfstools_4.2.bb}         | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
 rename meta/recipes-devtools/dosfstools/{dosfstools_4.1.bb => dosfstools_4.2.bb} (68%)
meta/recipes-devtools/dosfstools/dosfstools_4.2.bb renamed from meta/recipes-devtools/dosfstools/dosfstools_4.1.bb +4 -8
similarity index 68%
rename from meta/recipes-devtools/dosfstools/dosfstools_4.1.bb
rename to meta/recipes-devtools/dosfstools/dosfstools_4.2.bb
index 4bd4aef099..e1d1734b99 100644
@@ -9,24 +9,20 @@ SECTION = "base"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-SRC_URI = "https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${BP}.tar.xz \
+SRC_URI = "https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${BP}.tar.gz \
           "
-SRC_URI[md5sum] = "07a1050db1a898e9a2e03b0c4569c4bd"
-SRC_URI[sha256sum] = "e6b2aca70ccc3fe3687365009dd94a2e18e82b688ed4e260e04b7412471cc173"
+SRC_URI[sha256sum] = "64926eebf90092dca21b14259a5301b7b98e7b1943e8a201c7d726084809b527"
 
 UPSTREAM_CHECK_URI = "https://github.com/dosfstools/dosfstools/releases"
 
-inherit autotools pkgconfig update-alternatives
+inherit autotools gettext pkgconfig update-alternatives
 
-EXTRA_OECONF = "--without-udev --enable-compat-symlinks"
+EXTRA_OECONF = "--enable-compat-symlinks"
 
 CFLAGS += "-D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 
 BBCLASSEXTEND = "native nativesdk"
 
-# Add codepage437 to avoid error from `dosfsck -l`
-RRECOMMENDS_${PN}_append_libc-glibc = " glibc-gconv-ibm437"
-
 ALTERNATIVE_PRIORITY = "100"
 ALTERNATIVE_${PN} = "mkfs.vfat"
 ALTERNATIVE_LINK_NAME[mkfs.vfat] = "${sbindir}/mkfs.vfat"
Signature · 1 line
2.29.2
#9 lore raw

Re: [OE-core] [PATCH 05/24] dosfstools: update 4.1 -> 4.2

Quoted 20 lines · Alexander Kanavin

udev support had been dropped upstream.

---
  .../{dosfstools_4.1.bb => dosfstools_4.2.bb}         | 12 ++++--------
  1 file changed, 4 insertions(+), 8 deletions(-)

rename meta/recipes-devtools/dosfstools/{dosfstools_4.1.bb => dosfstools_4.2.bb} (68%)

meta/recipes-devtools/dosfstools/dosfstools_4.2.bb renamed from meta/recipes-devtools/dosfstools/dosfstools_4.1.bb +0 -1
similarity index 68%
rename from meta/recipes-devtools/dosfstools/dosfstools_4.1.bb
rename to meta/recipes-devtools/dosfstools/dosfstools_4.2.bb
index 4bd4aef099..e1d1734b99 100644
@@ -9,24 +9,20 @@ SECTION = "base"
  LICENSE = "GPLv3"
  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-SRC_URI = "https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${BP}.tar.xz \

meta/recipes-devtools/dosfstools/dosfstools_4.2.bb SECTION = "base" · line 18

Quoted 10 lines
meta/recipes-devtools/dosfstools/dosfstools_4.2.bb renamed from meta/recipes-devtools/dosfstools/dosfstools_4.1.bb +3 -3
+SRC_URI = "https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${BP}.tar.gz \
            "
-SRC_URI[md5sum] = "07a1050db1a898e9a2e03b0c4569c4bd"
-SRC_URI[sha256sum] = "e6b2aca70ccc3fe3687365009dd94a2e18e82b688ed4e260e04b7412471cc173"
+SRC_URI[sha256sum] = "64926eebf90092dca21b14259a5301b7b98e7b1943e8a201c7d726084809b527"
 
  UPSTREAM_CHECK_URI = "https://github.com/dosfstools/dosfstools/releases"
 
-inherit autotools pkgconfig update-alternatives
+inherit autotools gettext pkgconfig update-alternatives

is gettext new dependency ? or is it enabling something we did not do before

Quoted 19 lines
meta/recipes-devtools/dosfstools/dosfstools_4.2.bb renamed from meta/recipes-devtools/dosfstools/dosfstools_4.1.bb +1 -4
-EXTRA_OECONF = "--without-udev --enable-compat-symlinks"
+EXTRA_OECONF = "--enable-compat-symlinks"
 
  CFLAGS += "-D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 
  BBCLASSEXTEND = "native nativesdk"
 
-# Add codepage437 to avoid error from `dosfsck -l`
-RRECOMMENDS_${PN}_append_libc-glibc = " glibc-gconv-ibm437"
-
  ALTERNATIVE_PRIORITY = "100"
  ALTERNATIVE_${PN} = "mkfs.vfat"
  ALTERNATIVE_LINK_NAME[mkfs.vfat] = "${sbindir}/mkfs.vfat"
 
#10 lore raw

Re: [OE-core] [PATCH 05/24] dosfstools: update 4.1 -> 4.2

Quoted 3 lines · Khem Raj

meta/recipes-devtools/dosfstools/dosfstools_4.2.bb SECTION = "base" · line 18

Quoted 2 lines
meta/recipes-devtools/dosfstools/dosfstools_4.2.bb renamed from meta/recipes-devtools/dosfstools/dosfstools_4.1.bb +1 -1
-inherit autotools pkgconfig update-alternatives
+inherit autotools gettext pkgconfig update-alternatives

The new release supports gettext in a standard way, so the class adds a dependency on gettext-native.

Alex

#11 lore raw

Re: [OE-core] [PATCH 05/24] dosfstools: update 4.1 -> 4.2

Quoted 8 lines · Alexander Kanavin

On Sun, 28 Feb 2021 at 19:40, Khem Raj <[email protected] <mailto:[email protected]>> wrote:

> -inherit autotools pkgconfig update-alternatives > +inherit autotools gettext pkgconfig update-alternatives

The new release supports gettext in a standard way, so the class adds a dependency on gettext-native.

ok thanks. A note in commit would be good to have

Quoted 1 line

Alex

#12 lore raw

Re: [PATCH 05/24] dosfstools: update 4.1 -> 4.2

That comes two days after my patch: https://lists.openembedded.org/g/openembedded-core/topic/patch_dosfstools_upgrade/80928608

I would highly recommend the "--without-iconv" option I've added, to prevent error messages about non-existing conversion tables followed by "Using internal CP850 conversion table" (which it does all the time using --without-iconv).

Apart from that, I urge you to backport the fixed version at least down to dunfell, maybe even to earlier releases.
dosfsck 4.2 no longer marks directory entries created by mtools <= 4.0.19 as bad, which previously rendered lots of FAT boot partitions (Raspberry Pi/UEFI) unbootable. mtools <= 4.0.19 is part of "warrior" and earlier and used by e.g. meta-mender during build. Therefore, many affected FAT partitions can be found in the wild.

Best regards,

Colin Finck

#13 lore raw

Re: [OE-core] [PATCH 05/24] dosfstools: update 4.1 -> 4.2

Can you send a followup patch please, on top of master-next?

Alex

Quoted 24 lines · Colin Finck

That comes two days after my patch:
https://lists.openembedded.org/g/openembedded-core/topic/patch_dosfstools_upgrade/80928608

I would highly recommend the "--without-iconv" option I've added, to prevent error messages about non-existing conversion tables followed by "Using internal CP850 conversion table" (which it does all the time using --without-iconv).

Apart from that, I urge you to backport the fixed version at least down to dunfell, maybe even to earlier releases.
dosfsck 4.2 no longer marks directory entries created by mtools <= 4.0.19 as bad, which previously rendered lots of FAT boot partitions (Raspberry Pi/UEFI) unbootable.
mtools <= 4.0.19 is part of "warrior" and earlier and used by e.g. meta-mender during build. Therefore, many affected FAT partitions can be found in the wild.

Best regards,

Colin Finck

#14 lore raw

Re: [PATCH 05/24] dosfstools: update 4.1 -> 4.2

Quoted 1 line · Alexander Kanavin

Can you send a followup patch please, on top of master-next?

Here we go: https://lists.openembedded.org/g/openembedded-core/topic/patch_dosfstools_build/81024606

Who decides about backporting or not backporting dosfstools 4.2 to Dunfell?
I can only stress again that a large number of devices in the wild are currently running on FAT boot partitions, and come with a dosfschk version that likes to destroy these boot partitions.

Colin

#15 lore raw

Re: [OE-core] [PATCH 05/24] dosfstools: update 4.1 -> 4.2

Quoted 11 lines · Colin Finck
Quoted 1 line · Alexander Kanavin

Can you send a followup patch please, on top of master-next?

Here we go:
https://lists.openembedded.org/g/openembedded-core/topic/patch_dosfstools_build/81024606

Who decides about backporting or not backporting dosfstools 4.2 to Dunfell? I can only stress again that a large number of devices in the wild are currently running on FAT boot partitions, and come with a dosfschk version that likes to destroy these boot partitions.

That would be Steve. It's best if you cherry-pick the needed patches into current dunfell tip, and send them here with [dunfell] prefix, adding the rationale to the commit messages.

Alex

#16 lore raw

Re: [OE-core] [PATCH 05/24] dosfstools: update 4.1 -> 4.2

Steve, Colin:

keep in mind that this version also introduces some new restrictions, e.g. rpi-sdimg IMAGE_FSTYPE in meta-raspberrypi is now failing with:

mkfs.vfat: Label can be no longer than 11 characters

not sure how common this will be in other BSPs, but people might be surprised with such failures in LTS (like they were from the need to update oe-core/dunfell checkout to get python3targetconfig.bbclass recently when other layers started to require it).

Quoted 24 lines · Alexander Kanavin
Quoted 12 lines · Colin Finck
Quoted 1 line · Alexander Kanavin

Can you send a followup patch please, on top of master-next?

Here we go:
https://lists.openembedded.org/g/openembedded-core/topic/patch_dosfstools_build/81024606

Who decides about backporting or not backporting dosfstools 4.2 to Dunfell?
I can only stress again that a large number of devices in the wild are currently running on FAT boot partitions, and come with a dosfschk version that likes to destroy these boot partitions.

That would be Steve. It's best if you cherry-pick the needed patches into current dunfell tip, and send them here with [dunfell] prefix, adding the rationale to the commit messages.

Alex

#17 lore raw

Re: [OE-core] [PATCH 05/24] dosfstools: update 4.1 -> 4.2

Quoted 8 lines · Martin Jansa

Steve, Colin:

keep in mind that this version also introduces some new restrictions, e.g. rpi-sdimg IMAGE_FSTYPE in meta-raspberrypi is now failing with:

mkfs.vfat: Label can be no longer than 11 characters

not sure how common this will be in other BSPs, but people might be surprised with such failures in LTS (like they were from the need to update oe-core/dunfell checkout to get python3targetconfig.bbclass recently when other layers started to require it).

thanks for this info Martin, 4.1 was released in 2017, so 4.2 is not a bugfix only release by any means. It should be out of policy for LTS backport. since we have different tools and techniques to partition storage media
this tool plays a vital role and we should be very careful making changes to it, especially in releases.

Quoted 23 lines · Alexander Kanavin
Quoted 18 lines · Colin Finck
Quoted 8 lines · Alexander Kanavin
Quoted 1 line

Can you send a followup patch please, on top of master-next?

Here we go: https://lists.openembedded.org/g/openembedded-core/topic/patch_dosfstools_build/81024606

Who decides about backporting or not backporting dosfstools 4.2 to Dunfell?
I can only stress again that a large number of devices in the wild are currently running on FAT boot partitions, and come with a dosfschk version that likes to destroy these boot partitions.

That would be Steve. It's best if you cherry-pick the needed patches into current dunfell tip, and send them here with [dunfell] prefix, adding the rationale to the commit messages.

Alex

#18 lore raw

Re: [OE-core] [PATCH 05/24] dosfstools: update 4.1 -> 4.2

Quoted 8 lines · Khem Raj
Quoted 7 lines · Martin Jansa

Steve, Colin:

keep in mind that this version also introduces some new restrictions, e.g. rpi-sdimg IMAGE_FSTYPE in meta-raspberrypi is now failing with:

mkfs.vfat: Label can be no longer than 11 characters

Quoted 8 lines
Quoted 1 line

not sure how common this will be in other BSPs, but people might be surprised with such failures in LTS (like they were from the need to update oe-core/dunfell checkout to get python3targetconfig.bbclass recently when other layers started to require it).

thanks for this info Martin, 4.1 was released in 2017, so 4.2 is not a bugfix only release by any means. It should be out of policy for LTS backport. since we have different tools and techniques to partition storage media
this tool plays a vital role and we should be very careful making changes to it, especially in releases.

For reference this is the fix for meta-raspberrypi:
https://github.com/agherzan/meta-raspberrypi/pull/822
and this is the change in upstream which enforced this (it was checking it in fatlabel for long time), but not in mkfs.vfat until recently:
https://github.com/dosfstools/dosfstools/commit/c598354

This mkfs.vfat error is relatively easy to spot (as it will usually happen during build for us) and relatively easy to fix.

If I understood Colin correctly, then older dosfstools would break even
older partitions created by mtools (e.g. if you (let automatically) run fsck.vfat from dunfell based image on device with /boot partition originally created with mtools from warrior days), but it's not clear to me from what Colin said or from mtools mentions in:
https://github.com/dosfstools/dosfstools/releases/tag/v4.2

Some demonstration of this issue would be nice in the backport request to persuade people it's worth an exception of backport policy or maybe only the actual fix should be backported to v4.1.

Cheers,

Quoted 22 lines
Quoted 22 lines · Alexander Kanavin
Quoted 18 lines · Colin Finck
Quoted 8 lines · Alexander Kanavin
Quoted 1 line

Can you send a followup patch please, on top of master-next?

Here we go: https://lists.openembedded.org/g/openembedded-core/topic/patch_dosfstools_build/81024606

Who decides about backporting or not backporting dosfstools 4.2 to Dunfell?
I can only stress again that a large number of devices in the wild are currently running on FAT boot partitions, and come with a dosfschk version that likes to destroy these boot partitions.

That would be Steve. It's best if you cherry-pick the needed patches into current dunfell tip, and send them here with [dunfell] prefix, adding the rationale to the commit messages.

Alex

#19 lore raw

Re: [OE-core] [PATCH 05/24] dosfstools: update 4.1 -> 4.2

Am 03.03.2021 um 17:58 schrieb Martin Jansa:> If I understood Colin correctly, then older dosfstools would break even

Quoted 3 lines

older partitions created by mtools (e.g. if you (let automatically) run fsck.vfat from dunfell based image on device with /boot partition originally created with mtools from warrior days)

Exactly. Let me quote from the bug I reported to Mender: https://tracker.mender.io/browse/MEN-4497

===========================================================================
* Mender is using mcopy from the mtools package to create the boot partition for Raspberry Pi and UEFI images: https://github.com/mendersoftware/meta-mender/blob/50e8188f6c69d5e16363a37c2bb6e3abf9542bbb/meta-mender-core/classes/mender-bootimg.bbclass#L35
* mtools had a bug until 4.0.20, where it wrote uninitialized bytes into newly created entries: https://svn.savannah.gnu.org/viewvc/mtools/trunk/direntry.c?r1=363&r2=452
* dosfsck from the dosfstools package had another bug until 4.2, where it regarded unexpected bytes in the reserved part of the entry as bad and "corrected" this by removing affected directories: https://github.com/dosfstools/dosfstools/commit/87a8f29785bb605350821f1638a42e6cf3e49ce3

The combination of all 3 renders devices unbootable once dosfsck is used on the boot partition created by an affected mtools version (= created by Yocto Warrior and earlier).
This is also a problem for newer Yocto releases, because the boot partition stays unchanged when upgrading a Warrior device to Zeus or Dunfell.
This problem is especially crucial considering that Mender reenabled automatic filesystem repairs in Zeus and Dunfell during boot: https://github.com/mendersoftware/meta-mender/commit/0552891c504ecacb0d99f4618694c03f5bc08f83
===========================================================================

The meta-raspberrypi crate you just linked also uses mcopy, so the same applies to it.

I have linked some related commits in my bug report, but I cannot and will not guarantee that these commits alone fix the problem. Which is why I still favor a full upgrade to dosfstools 4.2.

Cheers,

Colin

#20 lore raw

Re: [OE-core] [PATCH 05/24] dosfstools: update 4.1 -> 4.2

In reply to Khem Raj

Am 03.03.2021 um 17:34 schrieb Khem Raj:

Quoted 8 lines · Martin Jansa
Quoted 7 lines

Steve, Colin:

keep in mind that this version also introduces some new restrictions, e.g. rpi-sdimg IMAGE_FSTYPE in meta-raspberrypi is now failing with:

mkfs.vfat: Label can be no longer than 11 characters

Quoted 8 lines
Quoted 1 line

not sure how common this will be in other BSPs, but people might be surprised with such failures in LTS (like they were from the need to update oe-core/dunfell checkout to get python3targetconfig.bbclass recently when other layers started to require it).

thanks for this info Martin, 4.1 was released in 2017, so 4.2 is not a bugfix only release by any means. It should be out of policy for LTS backport. since we have different tools and techniques to partition storage media
this tool plays a vital role and we should be very careful making changes to it, especially in releases.

Thanks for all your feedback!
I understand that an upgrade from 4.1 to 4.2 may look like a risky undertaking. On the other hand, who else except for the original author is qualified to decide if a single change can be cherry-picked and backported to 4.1?

I have been advocating for a full upgrade to dosfstools 4.2 not in spite but actually because filesystem creation and checking is crucial, and should not be performed by our own frankenstein build of dosfstools.

Cheers,

Colin

#21 lore raw

Re: [OE-core] [PATCH 05/24] dosfstools: update 4.1 -> 4.2

In reply to Alexander Kanavin
Quoted 6 lines · Alexander Kanavin
Quoted 2 lines · Colin Finck

Who decides about backporting or not backporting dosfstools 4.2 to Dunfell?
I can only stress again that a large number of devices in the wild are currently running on FAT boot partitions, and come with a dosfschk version that likes to destroy these boot partitions.

That would be Steve. It's best if you cherry-pick the needed patches into current dunfell tip, and send them here with [dunfell] prefix, adding the rationale to the commit messages.

Yes, please cherry-pick the required patches onto dunfell and send to the list with as much justification as possible (and highlight any downsides). SInce this may result in failures in other layers I want this proposed change to get as much review as possible.

Thanks!

Steve

#22 lore raw

PATCH 6/24 e2fsprogs: update 1.45.7 -> 1.46.1

In reply to Alexander Kanavin

Drop gettext patches; upstream has fixed the issues.

---
 meta/recipes-devtools/e2fsprogs/e2fsprogs.inc |  2 +-
 ...-configure.ac-correct-AM_GNU_GETTEXT.patch | 26 ------------------
 ...to-use-gettext-defines-that-no-longe.patch | 27 -------------------
 ...-missing-check-for-permission-denied.patch |  2 +-
 .../e2fsprogs/e2fsprogs/mkdir_p.patch         | 17 +++++++++---
 .../e2fsprogs/e2fsprogs/quiet-debugfs.patch   |  6 ++---
 ...2fsprogs_1.45.7.bb => e2fsprogs_1.46.1.bb} |  5 ++--
 7 files changed, 20 insertions(+), 65 deletions(-)
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-configure.ac-correct-AM_GNU_GETTEXT.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.45.7.bb => e2fsprogs_1.46.1.bb} (96%)
meta/recipes-devtools/e2fsprogs/e2fsprogs.inc +1 -1
index 009f5ed807..2f113c5e8d 100644
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=d50be0580c0b0a7fbc7a4830bbe6c12b \
                       file://lib/et/et_name.c;beginline=1;endline=11;md5=ead236447dac7b980dbc5b4804d8c836 \
                       file://lib/ss/ss.h;beginline=1;endline=20;md5=6e89ad47da6e75fecd2b5e0e81e1d4a6"
 SECTION = "base"
-DEPENDS = "util-linux attr"
+DEPENDS = "util-linux attr autoconf-archive"
 
 SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git"
 S = "${WORKDIR}/git"
meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-configure.ac-correct-AM_GNU_GETTEXT.patch deleted +0 -26
deleted file mode 100644
index 2719594c2f..0000000000
@@ -1,26 +0,0 @@
-From f907fea9ea053d5433b5199ce74008664141f753 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Tue, 19 Nov 2019 17:32:33 +0100
-Subject: [PATCH] configure.ac: correct AM_GNU_GETTEXT
-
-New version of gettext require the 'external' argument.
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 654ff43d..4772b97b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -873,7 +873,7 @@ AC_SUBST(GETTEXT_PACKAGE)
- AC_SUBST(PACKAGE)
- AC_SUBST(VERSION)
- 
--AM_GNU_GETTEXT
-+AM_GNU_GETTEXT([external])
- dnl @MKDIR_P@ is expanded in AM_GNU_GETTEXT
- AC_SUBST([mkdir_p],['$(MKDIR_P)'])
- dnl
meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch deleted +0 -27
deleted file mode 100644
index 31b585fc9a..0000000000
@@ -1,27 +0,0 @@
-From d034239f05cfba849f6ad16eb3f1ea37efbe4f95 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Tue, 19 Nov 2019 18:34:00 +0100
-Subject: [PATCH] intl: do not try to use gettext defines that no longer exist
-
-Newer version of gettext no longer define this in m4 files,
-so patch it out until e2fsprogs upstream sorts the situation.
-
-Upstream-Status: Inappropriate [hardcodes a choice]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- intl/Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/intl/Makefile.in b/intl/Makefile.in
-index e037e23c..89a876b8 100644
---- a/intl/Makefile.in
-+++ b/intl/Makefile.in
-@@ -175,7 +175,7 @@ libgnuintl.h.msvc-static libgnuintl.h.msvc-shared README.woe32 Makefile.msvc
- DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
- COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h
- 
--all: all-@USE_INCLUDED_LIBINTL@
-+all:
- all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
- all-no: all-no-@BUILD_INCLUDED_LIBINTL@
- all-no-yes: libgnuintl.$la
meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch +1 -1
index 284ac90196..d7c07c3b0f 100644
@@ -1,4 +1,4 @@
-From b55dfb4b62e507ae4f0814aec7597b56f9d6292a Mon Sep 17 00:00:00 2001
+From 9263b8764702f2b26ddaaf80808ebab31a1dba3b Mon Sep 17 00:00:00 2001
 From: Jackie Huang <[email protected]>
 Date: Wed, 10 Aug 2016 11:19:44 +0800
 Subject: [PATCH] Fix missing check for permission denied.
meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir_p.patch +13 -4
index b0fa4b8cc5..f6916a1112 100644
@@ -1,18 +1,27 @@
-e2fsprogs: expand @mkdir_p@
+From e3a30baa5c1e2f0ac7e246539db1c7db5a2fe302 Mon Sep 17 00:00:00 2001
+From: Joe Slater <[email protected]>
+Date: Tue, 7 Mar 2017 14:53:19 -0800
+Subject: [PATCH] e2fsprogs: expand @mkdir_p@
 
 Add AC_SUBST to configure.ac.  @mkdir_p@ is currently
-not expanded so no locale data is written into usr/share/locale. 
+not expanded so no locale data is written into usr/share/locale.
 
 Upstream-Status: Pending
 
 Signed-off-by: Joe Slater <[email protected]>
 
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 4c4b5523..3475c707 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -811,6 +811,8 @@ AC_SUBST(PACKAGE)
+@@ -919,6 +919,8 @@ AC_SUBST(PACKAGE)
  AC_SUBST(VERSION)
  
- AM_GNU_GETTEXT
+ AM_GNU_GETTEXT([external])
 +dnl @MKDIR_P@ is expanded in AM_GNU_GETTEXT
 +AC_SUBST([mkdir_p],['$(MKDIR_P)'])
  dnl
meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch +3 -3
index aac88eed98..88d0ae77c9 100644
@@ -1,4 +1,4 @@
-From 9aa68ad81b97847dda3493145f4b0a7cc580c551 Mon Sep 17 00:00:00 2001
+From 6e4c1644a3a8cacf7c1f5953cc378589bb046d5a Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Mon, 23 Dec 2013 13:38:34 +0000
 Subject: [PATCH] e2fsprogs: silence debugfs
@@ -14,10 +14,10 @@ Signed-off-by: Ross Burton <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
-index 15b01214..15164df2 100644
+index 132c5f9d..98063727 100644
 --- a/debugfs/debugfs.c
 +++ b/debugfs/debugfs.c
-@@ -2492,7 +2492,7 @@ static int source_file(const char *cmd_file, int ss_idx)
+@@ -2510,7 +2510,7 @@ static int source_file(const char *cmd_file, int ss_idx)
  		cp = strchr(buf, '\r');
  		if (cp)
  			*cp = 0;
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.1.bb renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb +2 -3
similarity index 96%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.1.bb
index 1a00807757..be8b67c35d 100644
@@ -4,15 +4,14 @@ SRC_URI += "file://remove.ldconfig.call.patch \
            file://run-ptest \
            file://ptest.patch \
            file://mkdir_p.patch \
-           file://0001-configure.ac-correct-AM_GNU_GETTEXT.patch \
-           file://0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch \
            "
 
 SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \
                                 file://quiet-debugfs.patch \
 "
 
-SRCREV = "5403970e44241cec26f98aaa0124b9881b4bbf4f"
+
+SRCREV = "3114c623f56b0d61f5f34b85f7b23d28f6c848c0"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
 
 EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
Signature · 1 line
2.29.2
#23 lore raw

PATCH 7/24 elfutils: update 0.182 -> 0.183

In reply to Alexander Kanavin

Drop 0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch Drop 0001-musl-obstack-fts.patch
(upstream has fixed the issues).

Drop a few other chunks where upstream has fixed the issues or removed the code being patched.

Adjust ptests to pass again.

---
 .../{elfutils_0.182.bb => elfutils_0.183.bb}  |   8 +-
 ...d-support-for-ipkg-to-debuginfod.cxx.patch |   7 +-
 .../elfutils/files/0001-dso-link-change.patch |   8 +-
 ...libasm-may-link-with-libbz2-if-found.patch |   4 +-
 ...-check-data_list.data.d.d_buf-before.patch |   2 +-
 .../files/0001-musl-obstack-fts.patch         | 124 ------------------
 ...cliude-asm-ptrace.h-for-pt_regs-defi.patch |  32 -----
 ...-skip-the-test-when-gcc-not-deployed.patch |  24 ++--
 ...m-compile-test_nlist-with-standard-C.patch |   6 +-
 ...cvt_gunhash-if-dest-and-src-are-same.patch |   2 +-
 .../elfutils/files/0002-musl-libs.patch       |  30 +----
 .../elfutils/files/0003-fixheadercheck.patch  |   6 +-
 .../elfutils/files/0003-musl-utils.patch      |  91 ++-----------
 ...4-Disable-the-test-to-convert-euc-jp.patch |  12 +-
 .../files/0004-Fix-error-on-musl.patch        |   4 +-
 .../0006-Fix-build-on-aarch64-musl.patch      |   2 +-
 .../0015-config-eu.am-do-not-use-Werror.patch |   2 +-
 .../elfutils/files/ptest.patch                |  61 ++++-----
 .../recipes-devtools/elfutils/files/run-ptest |   2 +-
 19 files changed, 85 insertions(+), 342 deletions(-)
 rename meta/recipes-devtools/elfutils/{elfutils_0.182.bb => elfutils_0.183.bb} (95%)
 delete mode 100644 meta/recipes-devtools/elfutils/files/0001-musl-obstack-fts.patch
 delete mode 100644 meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch
meta/recipes-devtools/elfutils/elfutils_0.183.bb renamed from meta/recipes-devtools/elfutils/elfutils_0.182.bb +5 -3
similarity index 95%
rename from meta/recipes-devtools/elfutils/elfutils_0.182.bb
rename to meta/recipes-devtools/elfutils/elfutils_0.183.bb
index 1123a34bfe..16ed7c9ddb 100644
@@ -19,20 +19,18 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
            file://0001-libasm-may-link-with-libbz2-if-found.patch \
            file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \
            file://0001-skip-the-test-when-gcc-not-deployed.patch \
-           file://0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch \
            file://run-ptest \
            file://ptest.patch \
            file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \
            file://0001-add-support-for-ipkg-to-debuginfod.cxx.patch \
            "
 SRC_URI_append_libc-musl = " \
-           file://0001-musl-obstack-fts.patch \
            file://0002-musl-libs.patch \
            file://0003-musl-utils.patch \
            file://0004-Fix-error-on-musl.patch \
            file://0015-config-eu.am-do-not-use-Werror.patch \
            "
-SRC_URI[sha256sum] = "ecc406914edf335f0b7fc084ebe6c460c4d6d5175bfdd6688c1c78d9146b8858"
+SRC_URI[sha256sum] = "c3637c208d309d58714a51e61e63f1958808fead882e9b607506a29e5474f2c5"
 
 inherit autotools gettext ptest pkgconfig
 
@@ -68,6 +66,8 @@ do_install_ptest() {
 		install -d -m 755                       ${D}${PTEST_PATH}/libdwfl
 		install -d -m 755                       ${D}${PTEST_PATH}/libdwelf
 		install -d -m 755                       ${D}${PTEST_PATH}/libasm
+		install -d -m 755                       ${D}${PTEST_PATH}/libcpu
+		install -d -m 755                       ${D}${PTEST_PATH}/libebl
 		for test_file in ${TEST_FILES}; do
 			if [ -f ${B}/src/${test_file} ]; then
 				cp -r ${B}/src/${test_file} ${D}${PTEST_PATH}/src
@@ -76,6 +76,8 @@ do_install_ptest() {
 		cp ${D}${libdir}/libelf-${PV}.so ${D}${PTEST_PATH}/libelf/libelf.so
 		cp ${D}${libdir}/libdw-${PV}.so ${D}${PTEST_PATH}/libdw/libdw.so
 		cp ${D}${libdir}/libasm-${PV}.so ${D}${PTEST_PATH}/libasm/libasm.so
+		cp ${B}/libcpu/libcpu.a ${D}${PTEST_PATH}/libcpu/
+		cp ${B}/libebl/libebl.a ${D}${PTEST_PATH}/libebl/
 		cp ${S}/libelf/*.h             ${D}${PTEST_PATH}/libelf/
 		cp ${S}/libdw/*.h              ${D}${PTEST_PATH}/libdw/
 		cp ${S}/libdwfl/*.h            ${D}${PTEST_PATH}/libdwfl/
meta/recipes-devtools/elfutils/files/0001-add-support-for-ipkg-to-debuginfod.cxx.patch +4 -3
index f15eacbe72..5f82afef0c 100644
@@ -1,4 +1,4 @@
-From b647d1df55c20772a9cc7ce96fcf323c500481bf Mon Sep 17 00:00:00 2001
+From 571416bf5b5ef319df6d9c79e46680920487e4a7 Mon Sep 17 00:00:00 2001
 From: dorindabassey <[email protected]>
 Date: Sat, 19 Dec 2020 01:11:46 +0100
 Subject: [PATCH] add support for ipkg to debuginfod.cxx
@@ -8,15 +8,16 @@ added support for ipkg to the debuginfod scanner. 0.182 only supports RPM and sc
 Upstream-status: Submitted [https://sourceware.org/pipermail/elfutils-devel/2020q4/003357.html]
 
 Signed-off-by: dorindabassey <[email protected]>
+
 ---
  debuginfod/debuginfod.cxx | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
-index 5621030..cc78c93 100644
+index b34eacc..a8915f2 100644
 --- a/debuginfod/debuginfod.cxx
 +++ b/debuginfod/debuginfod.cxx
-@@ -442,11 +442,13 @@ parse_opt (int key, char *arg,
+@@ -484,11 +484,13 @@ parse_opt (int key, char *arg,
          {
            scan_archives[".deb"]="dpkg-deb --fsys-tarfile";
            scan_archives[".ddeb"]="dpkg-deb --fsys-tarfile";
meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch +4 -4
index 62031073e3..6acc036406 100644
@@ -1,4 +1,4 @@
-From ec9a7742734aae5417c0ebbffce66ac353e6cae7 Mon Sep 17 00:00:00 2001
+From c5fb59ac0819b5b6d8244c613cbcf92cb09840c1 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
 Date: Tue, 15 Aug 2017 17:10:57 +0800
 Subject: [PATCH] dso link change
@@ -23,7 +23,7 @@ Signed-off-by: Hongxu Jia <[email protected]>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index e462e7d..ea1215b 100644
+index 88d0ac8..c28d81f 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -45,7 +45,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread
@@ -36,10 +36,10 @@ index e462e7d..ea1215b 100644
  endif
  libebl = ../libebl/libebl.a ../backends/libebl_backends.a ../libcpu/libcpu.a
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index eab4ae6..f59a01f 100644
+index c145720..72afd0e 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
-@@ -516,7 +516,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread
+@@ -554,7 +554,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread
  libelf = ../libelf/libelf.a -lz
  libasm = ../libasm/libasm.a
  else
meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch +2 -2
index 73ead6d412..09c9d3ea24 100644
@@ -1,4 +1,4 @@
-From 8e5fff8b1d819e0870fb22b27950bb5f10c7a272 Mon Sep 17 00:00:00 2001
+From ed1975deeaa47f98d212fd144c8bda075b1a5d36 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 4 Oct 2017 22:30:46 -0700
 Subject: [PATCH] libasm may link with libbz2 if found
@@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <[email protected]>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index ea1215b..13d9bda 100644
+index c28d81f..951e978 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -40,11 +40,11 @@ EXTRA_DIST += make-debug-archive.in
meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch +1 -1
index b26ed99f65..c8d55d583a 100644
@@ -1,4 +1,4 @@
-From e571cbd0c20085ec71969971f19280b5de95cfb7 Mon Sep 17 00:00:00 2001
+From f40cbd43acdb1fefef4fa53a6034296d83cbff7d Mon Sep 17 00:00:00 2001
 From: Robert Yang <[email protected]>
 Date: Thu, 16 Aug 2018 09:58:26 +0800
 Subject: [PATCH] libelf/elf_end.c: check data_list.data.d.d_buf before free it
meta/recipes-devtools/elfutils/files/0001-musl-obstack-fts.patch deleted +0 -124

124 lines not on this page · raw message

meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch deleted +0 -32
deleted file mode 100644
index 3303333c45..0000000000
@@ -1,32 +0,0 @@
-From 2e2232d0935bf8ef6e66ebffba3be68a73b5b3e5 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sun, 8 Sep 2019 15:57:59 -0700
-Subject: [PATCH] ppc_initreg.c: Incliude asm/ptrace.h for pt_regs definition
-
-Fixes
-| ../../elfutils-0.176/backends/ppc_initreg.c:79:22: error: field 'r' has incomplete type
-|       struct pt_regs r;
-|                      ^
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
----
- backends/ppc_initreg.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/backends/ppc_initreg.c b/backends/ppc_initreg.c
-index 0e0d359..e5cca7e 100644
---- a/backends/ppc_initreg.c
-+++ b/backends/ppc_initreg.c
-@@ -33,6 +33,7 @@
- #include <stdlib.h>
- #if defined(__powerpc__) && defined(__linux__)
- # include <sys/ptrace.h>
-+# include <asm/ptrace.h>
- # include <sys/user.h>
- #endif
- 
--- 
-2.23.0
-
meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch +11 -13
index de8c05f11e..114ca63cb5 100644
@@ -1,7 +1,7 @@
-From e82a055f85e398cb03a4eaf5faf351a3a1f19344 Mon Sep 17 00:00:00 2001
+From 2fa52d61b1abdf4a3f3b153c771fb2081666430c Mon Sep 17 00:00:00 2001
 From: Mingli Yu <[email protected]>
 Date: Tue, 21 May 2019 15:20:34 +0800
-Subject: [PATCH v2] skip the test when gcc not deployed
+Subject: [PATCH] skip the test when gcc not deployed
 
 Skip the tests which depend on gcc when
 gcc not deployed.
@@ -9,6 +9,7 @@ gcc not deployed.
 Upstream-Status: Submitted[https://sourceware.org/ml/elfutils-devel/2019-q2/msg00091.html]
 
 Signed-off-by: Mingli Yu <[email protected]>
+
 ---
  tests/run-disasm-x86-64.sh | 2 ++
  tests/run-disasm-x86.sh    | 2 ++
@@ -17,7 +18,7 @@ Signed-off-by: Mingli Yu <[email protected]>
  4 files changed, 8 insertions(+)
 
 diff --git a/tests/run-disasm-x86-64.sh b/tests/run-disasm-x86-64.sh
-index a6be62b..c3ef238 100755
+index 07b612b..7a32996 100755
 --- a/tests/run-disasm-x86-64.sh
 +++ b/tests/run-disasm-x86-64.sh
 @@ -22,6 +22,8 @@ case "`uname -m`" in
@@ -26,11 +27,11 @@ index a6be62b..c3ef238 100755
      testfiles testfile45.S testfile45.expect
 +    # skip the case if no gcc deployed
 +    which gcc || exit 77
-     gcc -m64 -c -o testfile45.o testfile45.S
+     ${CC} -m64 -c -o testfile45.o testfile45.S
      testrun_compare ${abs_top_builddir}/src/objdump -d testfile45.o < testfile45.expect
      ;;
 diff --git a/tests/run-disasm-x86.sh b/tests/run-disasm-x86.sh
-index 28a3df7..544fc28 100755
+index 7ac73ad..f0d4796 100755
 --- a/tests/run-disasm-x86.sh
 +++ b/tests/run-disasm-x86.sh
 @@ -22,6 +22,8 @@ case "`uname -m`" in
@@ -39,11 +40,11 @@ index 28a3df7..544fc28 100755
      testfiles testfile44.S testfile44.expect
 +    # skip the case if no gcc deployed
 +    which gcc || exit 77
-     gcc -m32 -c -o testfile44.o testfile44.S
+     ${CC} -m32 -c -o testfile44.o testfile44.S
      testrun_compare ${abs_top_builddir}/src/objdump -d testfile44.o < testfile44.expect
      ;;
 diff --git a/tests/run-strip-g.sh b/tests/run-strip-g.sh
-index 1303819..a943dec 100755
+index 1592121..9b8157e 100755
 --- a/tests/run-strip-g.sh
 +++ b/tests/run-strip-g.sh
 @@ -24,6 +24,8 @@
@@ -53,10 +54,10 @@ index 1303819..a943dec 100755
 +# skip the test if gcc deployed
 +which gcc || exit 77
  echo Create debug a.out.
- echo "int main() { return 1; }" | gcc -g -xc -
+ echo "int main() { return 1; }" | ${CC} -g -xc -
  
 diff --git a/tests/run-strip-nothing.sh b/tests/run-strip-nothing.sh
-index 914fdfb..d03f734 100755
+index 710c200..3a81d8e 100755
 --- a/tests/run-strip-nothing.sh
 +++ b/tests/run-strip-nothing.sh
 @@ -22,6 +22,8 @@
@@ -66,8 +67,5 @@ index 914fdfb..d03f734 100755
 +# skip the case if no gcc deployed
 +which gcc || exit 77
  # Create no-debug a.out.
- echo "int main() { return 1; }" | gcc -s -xc -
+ echo "int main() { return 1; }" | ${CC} -s -xc -
  
--- 
-2.7.4
-
meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch +3 -3
index d7b382fd94..c494d7f2e5 100644
@@ -1,4 +1,4 @@
-From fa265ff686cb60e19aa607bda3752b6b2ee87a14 Mon Sep 17 00:00:00 2001
+From 22e0e1c01ec680a2970f4d5ca9e47f90259cbdcf Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Tue, 23 Jun 2020 07:49:35 +0000
 Subject: [PATCH] tests/Makefile.am: compile test_nlist with standard CFLAGS
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 05fc9b4..11de0fc 100644
+index a2dfd43..40a0228 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
-@@ -92,7 +92,7 @@ endif
+@@ -90,7 +90,7 @@ endif
  test-nlist$(EXEEXT): test-nlist.c
  	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	  $(AM_CPPFLAGS) $(CPPFLAGS) \
meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch +1 -1
index 96c2565e3e..be48ef010b 100644
@@ -1,4 +1,4 @@
-From f8e4118b60a9b54950437006a82b4047f38f5347 Mon Sep 17 00:00:00 2001
+From 1643d793761216252bb654e28aaa5b8eb1536bca Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
 Date: Tue, 15 Aug 2017 17:13:59 +0800
 Subject: [PATCH] Fix elf_cvt_gunhash if dest and src are same.
meta/recipes-devtools/elfutils/files/0002-musl-libs.patch +4 -26
index c6f766f680..b373940d37 100644
@@ -1,4 +1,4 @@
-From f4ca9db9d38f865505322595a8a1e8f69d5bb87c Mon Sep 17 00:00:00 2001
+From 18c527991deee93170a887b6da622560d5606913 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
 Date: Fri, 23 Aug 2019 10:18:47 +0800
 Subject: [PATCH] musl-libs
@@ -19,10 +19,9 @@ Signed-off-by: Hongxu Jia <[email protected]>
  lib/error.h                    | 27 +++++++++++++++++++++++++++
  lib/fixedsizehash.h            |  1 -
  lib/libeu.h                    |  1 +
- libdwfl/dwfl_error.c           |  9 +++++++++
  libdwfl/linux-kernel-modules.c |  1 +
  libelf/elf.h                   |  7 +++++++
- 6 files changed, 45 insertions(+), 1 deletion(-)
+ 5 files changed, 36 insertions(+), 1 deletion(-)
  create mode 100644 lib/error.h
 
 diff --git a/lib/error.h b/lib/error.h
@@ -82,27 +81,6 @@ index ecb4d01..edc85e3 100644
  #include <stddef.h>
  #include <stdint.h>
  
-diff --git a/libdwfl/dwfl_error.c b/libdwfl/dwfl_error.c
-index 7bcf61c..11dcc8b 100644
---- a/libdwfl/dwfl_error.c
-+++ b/libdwfl/dwfl_error.c
-@@ -154,7 +154,16 @@ dwfl_errmsg (int error)
-   switch (error &~ 0xffff)
-     {
-     case OTHER_ERROR (ERRNO):
-+#if defined(__GLIBC__)
-       return strerror_r (error & 0xffff, "bad", 0);
-+#else
-+      {
-+        static __thread char buf[128] = "";
-+        if (strerror_r (error & 0xffff, buf, sizeof(buf)) == 0)
-+          return buf;
-+      }
-+      return "strerror_r() failed";
-+#endif
-     case OTHER_ERROR (LIBELF):
-       return elf_errmsg (error & 0xffff);
-     case OTHER_ERROR (LIBDW):
 diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c
 index 6edb27f..f331e3c 100644
 --- a/libdwfl/linux-kernel-modules.c
@@ -116,7 +94,7 @@ index 6edb27f..f331e3c 100644
  /* If fts.h is included before config.h, its indirect inclusions may not
     give us the right LFS aliases of these functions, so map them manually.  */
 diff --git a/libelf/elf.h b/libelf/elf.h
-index 6439c1a..a87c589 100644
+index 8e3e618..1353890 100644
 --- a/libelf/elf.h
 +++ b/libelf/elf.h
 @@ -19,6 +19,10 @@
@@ -130,7 +108,7 @@ index 6439c1a..a87c589 100644
  /* Standard ELF types.  */
  
  #include <stdint.h>
-@@ -4101,4 +4105,7 @@ enum
+@@ -4102,4 +4106,7 @@ enum
  #define R_ARC_TLS_LE_S9		0x4a
  #define R_ARC_TLS_LE_32		0x4b
  
meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch +3 -3
index e36d3f44dd..212b358dc2 100644
@@ -1,4 +1,4 @@
-From dd7c8c730457def5f62ebd43022b2f06df8c6ed9 Mon Sep 17 00:00:00 2001
+From 7e1f91c42ef5b0bf10afefec10dd08588df3ab1f Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
 Date: Tue, 15 Aug 2017 17:17:20 +0800
 Subject: [PATCH] fixheadercheck
@@ -22,10 +22,10 @@ Signed-off-by: Hongxu Jia <[email protected]>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/libelf/elf32_updatenull.c b/libelf/elf32_updatenull.c
-index 3e9ef61..5351518 100644
+index d0d4d1e..4ecf5a5 100644
 --- a/libelf/elf32_updatenull.c
 +++ b/libelf/elf32_updatenull.c
-@@ -339,8 +339,8 @@ __elfw2(LIBELFBITS,updatenull_wrlock) (Elf *elf, int *change_bop, size_t shnum)
+@@ -354,8 +354,8 @@ __elfw2(LIBELFBITS,updatenull_wrlock) (Elf *elf, int *change_bop, size_t shnum)
  		     we test for the alignment of the section being large
  		     enough for the largest alignment required by a data
  		     block.  */
meta/recipes-devtools/elfutils/files/0003-musl-utils.patch +12 -79

121 lines not on this page · raw message

meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch +6 -6
index 5dee61210a..f407bdd0be 100644
@@ -1,4 +1,4 @@
-From e4ede22e28eaa38d81667ddcb19541ece1a83cf8 Mon Sep 17 00:00:00 2001
+From cd36f34c722dd0babd7beb13c968aa0780c9f726 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
 Date: Tue, 15 Aug 2017 17:24:06 +0800
 Subject: [PATCH] Disable the test to convert euc-jp
@@ -21,10 +21,10 @@ Signed-off-by: Hongxu Jia <[email protected]>
  1 file changed, 2 insertions(+)
 
 diff --git a/m4/iconv.m4 b/m4/iconv.m4
-index a503646..299f1eb 100644
+index aa159c5..d16312b 100644
 --- a/m4/iconv.m4
 +++ b/m4/iconv.m4
-@@ -159,6 +159,7 @@ int main ()
+@@ -165,6 +165,7 @@ AC_DEFUN([AM_ICONV_LINK],
        }
    }
  #endif
@@ -32,11 +32,11 @@ index a503646..299f1eb 100644
    /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
       provided.  */
    if (/* Try standardized names.  */
-@@ -170,6 +171,7 @@ int main ()
+@@ -176,6 +177,7 @@ AC_DEFUN([AM_ICONV_LINK],
        /* Try HP-UX names.  */
        && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
      result |= 16;
 +#endif
    return result;
- }]])],
-         [am_cv_func_iconv_works=yes],
+ ]])],
+           [am_cv_func_iconv_works=yes], ,
meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch +2 -2
index 0d162ebe1b..8e1e97041f 100644
@@ -1,4 +1,4 @@
-From ed87f11f7297c0edb3ca8950de1cc23e9b96217c Mon Sep 17 00:00:00 2001
+From ce3b1403bd88261b5461a9dcb7d6d6be9185703e Mon Sep 17 00:00:00 2001
 From: Richard Purdie <[email protected]>
 Date: Wed, 1 May 2019 22:15:03 +0100
 Subject: [PATCH] Fix error on musl:
@@ -19,7 +19,7 @@ Signed-off-by: Richard Purdie <[email protected]>
  1 file changed, 5 insertions(+)
 
 diff --git a/tests/elfstrmerge.c b/tests/elfstrmerge.c
-index ba0d68d..1d2447f 100644
+index abbdf3f..bd90f4d 100644
 --- a/tests/elfstrmerge.c
 +++ b/tests/elfstrmerge.c
 @@ -33,6 +33,11 @@
meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch +1 -1
index 6f7956c5ae..8942ad7828 100644
@@ -1,4 +1,4 @@
-From 578f370c7e7a9f056aefa062b34590b0aa13bce5 Mon Sep 17 00:00:00 2001
+From 2396fd67d81e54e18fbad67a5ff67d5684a01013 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
 Date: Tue, 15 Aug 2017 17:27:30 +0800
 Subject: [PATCH] Fix build on aarch64/musl
meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch +1 -1
index ec1b927c2e..205362626d 100644
@@ -1,4 +1,4 @@
-From 574ac484c01125a97ba8737cf7292ca926897310 Mon Sep 17 00:00:00 2001
+From dfe11e043cd8ea0b0f0252bcff9f5a6b98c0ecd3 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Mon, 22 Jun 2020 21:35:16 +0000
 Subject: [PATCH] config/eu.am: do not use -Werror
meta/recipes-devtools/elfutils/files/ptest.patch +24 -37

81 lines not on this page · raw message

meta/recipes-devtools/elfutils/files/run-ptest +1 -1
index 81b81f2f5d..d5776fdb53 100644
@@ -3,4 +3,4 @@
 #This script is used to run elfutils test suites
 cd tests
 
-make -k runtest-TESTS abs_srcdir=$PWD abs_builddir=$PWD srcdir=$PWD top_srcdir=$PWD/../ abs_top_builddir=$PWD/../ elfutils_testrun=installed elfutils_tests_rpath=no program_transform_name=s,^,eu-,
+make -k installcheck-local CC=gcc abs_srcdir=$PWD abs_builddir=$PWD srcdir=$PWD top_srcdir=$PWD/../ abs_top_builddir=$PWD/../ elfutils_testrun=installed elfutils_tests_rpath=no program_transform_name=s,^,eu-,
Signature · 1 line
2.29.2
#24 lore raw

PATCH 8/24 libdnf: update 0.55.2 -> 0.58.0

In reply to Alexander Kanavin

Sdd a patch to fix musl builds.

---
 ...h-include-the-correct-header-on-musl.patch | 31 +++++++++++++++++++
 .../{libdnf_0.55.2.bb => libdnf_0.58.0.bb}    |  3 +-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-include-the-correct-header-on-musl.patch
 rename meta/recipes-devtools/libdnf/{libdnf_0.55.2.bb => libdnf_0.58.0.bb} (93%)
meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-include-the-correct-header-on-musl.patch new file +31 -0
new file mode 100644
index 0000000000..734521bb3f
@@ -0,0 +1,31 @@
+From 8cc7ada0161a7af38351d1e70516975402f3c5c5 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Fri, 26 Feb 2021 18:37:41 +0000
+Subject: [PATCH] libdnf/config.h: include the correct header on musl
+
+Problem reported at https://github.com/rpm-software-management/libdnf/issues/1146,
+but this patch isn't quite the fix.
+
+Upstream-Status: Inappropriate
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ libdnf/config.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libdnf/config.h b/libdnf/config.h
+index 16121f6f..51623ce4 100644
+--- a/libdnf/config.h
++++ b/libdnf/config.h
+@@ -18,7 +18,12 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#include <features.h>
++#ifdef __GLIBC__
+ #include <bits/wordsize.h>
++#else
++#include <bits/reg.h>
++#endif
+ 
+ #if __WORDSIZE == 32
+ #include "config-32.h"
meta/recipes-devtools/libdnf/libdnf_0.58.0.bb renamed from meta/recipes-devtools/libdnf/libdnf_0.55.2.bb +2 -1
similarity index 93%
rename from meta/recipes-devtools/libdnf/libdnf_0.55.2.bb
rename to meta/recipes-devtools/libdnf/libdnf_0.58.0.bb
index b34bb5de01..eea410af4c 100644
@@ -11,9 +11,10 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \
            file://0001-Add-WITH_TESTS-option.patch \
            file://0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch \
            file://enable_test_data_dir_set.patch \
+           file://0001-libdnf-config.h-include-the-correct-header-on-musl.patch \
            "
 
-SRCREV = "d2d0ec98fd2e0a2623123fb1ddf8fdd8936c6046"
+SRCREV = "85278894f21bc1957dc47a2a09ddacf59bc3cda8"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.29.2
#25 lore raw

Re: [OE-core] [PATCH 08/24] libdnf: update 0.55.2 -> 0.58.0

Quoted 2 lines · Alexander Kanavin

Sdd a patch to fix musl builds.

^^^
typo here

Quoted 32 lines
---
  ...h-include-the-correct-header-on-musl.patch | 31 +++++++++++++++++++
  .../{libdnf_0.55.2.bb => libdnf_0.58.0.bb}    |  3 +-
  2 files changed, 33 insertions(+), 1 deletion(-)

create mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-include-the-correct-header-on-musl.patch rename meta/recipes-devtools/libdnf/{libdnf_0.55.2.bb => libdnf_0.58.0.bb} (93%)

meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-include-the-correct-header-on-musl.patch new file +18 -0
new file mode 100644
index 0000000000..734521bb3f
@@ -0,0 +1,31 @@
+From 8cc7ada0161a7af38351d1e70516975402f3c5c5 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Fri, 26 Feb 2021 18:37:41 +0000
+Subject: [PATCH] libdnf/config.h: include the correct header on musl
+
+Problem reported at https://github.com/rpm-software-management/libdnf/issues/1146,
+but this patch isn't quite the fix.
+
+Upstream-Status: Inappropriate
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ libdnf/config.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libdnf/config.h b/libdnf/config.h
+index 16121f6f..51623ce4 100644
+--- a/libdnf/config.h
++++ b/libdnf/config.h

meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-include-the-correct-header-on-musl.patch line 28

Quoted 10 lines
meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-include-the-correct-header-on-musl.patch new file +10 -0
+@@ -18,7 +18,12 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+
++#include <features.h>
++#ifdef __GLIBC__
+ #include <bits/wordsize.h>
++#else
++#include <bits/reg.h>
++#endif

It seems __WORDISIZE is what is being used here, a portable way would be

#include <limits.h>
#if (ULONG_MAX == 0xffffffffffffffff)
64bit wordlen stuff
#else
32bit stuff
#endif

if we still want to keep using internal libc internal define __WORDSIZE
then for musl include sys/user.h headers under bits/ dir are usually not portable and not meant for direct includes

#include <features.h>
#ifdef __GLIBC__
#include <bits/wordsize.h>
#endif
#include <sys/user.h>

Quoted 27 lines
meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-include-the-correct-header-on-musl.patch new file +3 -0
+
+ #if __WORDSIZE == 32
+ #include "config-32.h"
meta/recipes-devtools/libdnf/libdnf_0.58.0.bb renamed from meta/recipes-devtools/libdnf/libdnf_0.55.2.bb +2 -1
similarity index 93%
rename from meta/recipes-devtools/libdnf/libdnf_0.55.2.bb
rename to meta/recipes-devtools/libdnf/libdnf_0.58.0.bb
index b34bb5de01..eea410af4c 100644
@@ -11,9 +11,10 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \
             file://0001-Add-WITH_TESTS-option.patch \
             file://0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch \
             file://enable_test_data_dir_set.patch \
+           file://0001-libdnf-config.h-include-the-correct-header-on-musl.patch \
             "
 
-SRCREV = "d2d0ec98fd2e0a2623123fb1ddf8fdd8936c6046"
+SRCREV = "85278894f21bc1957dc47a2a09ddacf59bc3cda8"
  UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
 
  S = "${WORKDIR}/git"
#26 lore raw

Re: [OE-core] [PATCH 08/24] libdnf: update 0.55.2 -> 0.58.0

Quoted 14 lines · Khem Raj

It seems __WORDISIZE is what is being used here, a portable way would be

#include <limits.h>
#if (ULONG_MAX == 0xffffffffffffffff)
64bit wordlen stuff
#else
32bit stuff
#endif

if we still want to keep using internal libc internal define __WORDSIZE then for musl include sys/user.h headers under bits/ dir are usually not portable and not meant for direct includes

Quoted 6 lines

#include <features.h>
#ifdef __GLIBC__
#include <bits/wordsize.h>
#endif
#include <sys/user.h>

Can you send a patch upstream for this please? I have filed a ticket which you can reference:
https://github.com/rpm-software-management/libdnf/issues/1146

Alex

#27 lore raw

Re: [OE-core] [PATCH 08/24] libdnf: update 0.55.2 -> 0.58.0

Quoted 24 lines · Alexander Kanavin

On Sun, 28 Feb 2021 at 20:04, Khem Raj <[email protected] <mailto:[email protected]>> wrote:

    It seems __WORDISIZE is what is being used here, a portable way would be

    #include <limits.h>
    #if (ULONG_MAX == 0xffffffffffffffff)
    64bit wordlen stuff
    #else
    32bit stuff
    #endif

    if we still want to keep using internal libc internal define __WORDSIZE
    then for musl include sys/user.h headers under bits/ dir are usually
    not
    portable and not meant for direct includes

    #include <features.h>
    #ifdef __GLIBC__
    #include <bits/wordsize.h>
    #endif
    #include <sys/user.h>
Quoted 2 lines

Can you send a patch upstream for this please? I have filed a ticket which you can reference:
https://github.com/rpm-software-management/libdnf/issues/1146 <https://github.com/rpm-software-management/libdnf/issues/1146>

This is a review so please fix it as suggested in OE atleast since you will have test setups I do not have rpm/dnf setups

Quoted 2 lines

Alex

#28 lore raw

Re: [OE-core] [PATCH 08/24] libdnf: update 0.55.2 -> 0.58.0

Quoted 8 lines · Khem Raj
Quoted 4 lines

Can you send a patch upstream for this please? I have filed a ticket which you can reference:
https://github.com/rpm-software-management/libdnf/issues/1146
<https://github.com/rpm-software-management/libdnf/issues/1146>

This is a review so please fix it as suggested in OE atleast since you will have test setups I do not have rpm/dnf setups

Any fix we do needs to be upstreamable, so can you please write a comment to the upstream ticket?
They're too telling me I need to send them a patch, and I don't want to send something I don't really understand.
https://github.com/rpm-software-management/libdnf/issues/1146

Testing is easy: build libdnf with TCLIBC=musl.

Alex

#29 lore raw

Re: [OE-core] [PATCH 08/24] libdnf: update 0.55.2 -> 0.58.0

Quoted 10 lines · Alexander Kanavin
Quoted 8 lines · Khem Raj
Quoted 4 lines

Can you send a patch upstream for this please? I have filed a ticket which you can reference:
https://github.com/rpm-software-management/libdnf/issues/1146
<https://github.com/rpm-software-management/libdnf/issues/1146>

This is a review so please fix it as suggested in OE atleast since you will have test setups I do not have rpm/dnf setups

Quoted 6 lines

Any fix we do needs to be upstreamable, so can you please write a comment to the upstream ticket? They're too telling me I need to send them a patch, and I don't want to send something I don't really understand.
https://github.com/rpm-software-management/libdnf/issues/1146

Testing is easy: build libdnf with TCLIBC=musl.

I've been holding this in -next since I'd really like to try and match what happens upstream if we can. Since upstream seem receptive, could we get them a pull request open for the replacement for __WORDSIZE and update the OE patch too to track things?

Cheers,

Richard

#30 lore raw

Re: [OE-core] [PATCH 08/24] libdnf: update 0.55.2 -> 0.58.0

Quoted 18 lines · Richard Purdie
Quoted 11 lines · Alexander Kanavin
Quoted 8 lines · Khem Raj
Quoted 4 lines

Can you send a patch upstream for this please? I have filed a ticket which you can reference:
https://github.com/rpm-software-management/libdnf/issues/1146
<https://github.com/rpm-software-management/libdnf/issues/1146>

This is a review so please fix it as suggested in OE atleast since you will have test setups I do not have rpm/dnf setups

Any fix we do needs to be upstreamable, so can you please write a

comment to the upstream ticket?

Quoted 1 line

They're too telling me I need to send them a patch, and I don't want to

send something I don't really

Quoted 3 lines

understand.
https://github.com/rpm-software-management/libdnf/issues/1146

Quoted 7 lines
Quoted 1 line

Testing is easy: build libdnf with TCLIBC=musl.

I've been holding this in -next since I'd really like to try and match what happens upstream if we can. Since upstream seem receptive, could we get them a pull request open for the replacement for __WORDSIZE and update the OE patch too to track things?

Done both.

Alex

#31 lore raw

PATCH 9/24 librepo: update 1.12.1 -> 1.13.0

In reply to Alexander Kanavin
---
 ...tain-PYTHON_INSTALL_DIR-by-running-p.patch | 38 +++++--------------
 ...les-with-pkg-config-not-with-cmake-m.patch |  8 ++--
 .../{librepo_1.12.1.bb => librepo_1.13.0.bb}  |  2 +-
 3 files changed, 15 insertions(+), 33 deletions(-)
 rename meta/recipes-devtools/librepo/{librepo_1.12.1.bb => librepo_1.13.0.bb} (94%)
meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch +10 -28
index b61f0c9324..46ab9a1132 100644
@@ -1,4 +1,4 @@
-From b08a3b71e716dd0485ef51036d32e4c304fb4e67 Mon Sep 17 00:00:00 2001
+From 82bd6d196a0453657cbacaaedd75b2d2fe0bf9ba Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Fri, 30 Dec 2016 18:05:36 +0200
 Subject: [PATCH] Do not try to obtain PYTHON_INSTALL_DIR by running python.
@@ -7,35 +7,17 @@ Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <[email protected]>
 
 ---
- librepo/python/python2/CMakeLists.txt | 12 ++++++------
- librepo/python/python3/CMakeLists.txt | 12 ++++++------
- 2 files changed, 12 insertions(+), 12 deletions(-)
+ librepo/python/CMakeLists.txt | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/librepo/python/python2/CMakeLists.txt b/librepo/python/python2/CMakeLists.txt
-index a0f1f9a..1665079 100644
---- a/librepo/python/python2/CMakeLists.txt
-+++ b/librepo/python/python2/CMakeLists.txt
-@@ -1,9 +1,9 @@
--EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
--from sys import stdout
--from distutils import sysconfig
--path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}')
--stdout.write(path)"
--OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
-+#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
-+#from sys import stdout
-+#from distutils import sysconfig
-+#path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}')
-+#stdout.write(path)"
-+#OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
- INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
+diff --git a/librepo/python/CMakeLists.txt b/librepo/python/CMakeLists.txt
+index 52fc39e..2024407 100644
+--- a/librepo/python/CMakeLists.txt
++++ b/librepo/python/CMakeLists.txt
+@@ -16,12 +16,12 @@ SET (librepomodule_SRCS
+ 
+ MESSAGE("Building python bindings")
  
- MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")
-diff --git a/librepo/python/python3/CMakeLists.txt b/librepo/python/python3/CMakeLists.txt
-index 52ba44e..da51e10 100644
---- a/librepo/python/python3/CMakeLists.txt
-+++ b/librepo/python/python3/CMakeLists.txt
-@@ -1,9 +1,9 @@
 -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
 -from sys import stdout
 -from distutils import sysconfig
meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch +4 -4
index 73902e5f58..d61d8fbf85 100644
@@ -1,4 +1,4 @@
-From f5a1dfe4c87c228165bc25e7fe464120d8139a3d Mon Sep 17 00:00:00 2001
+From 25113b34bc1aae377d7bf447e69528783e2c177e Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Fri, 30 Dec 2016 18:23:27 +0200
 Subject: [PATCH] Set gpgme variables with pkg-config, not with cmake module
@@ -12,13 +12,13 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e949dbe..c954b2e 100644
+index a45d5c4..40249e6 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -31,7 +31,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED)
+@@ -32,7 +32,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED)
  PKG_SEARCH_MODULE(LIBCRYPTO REQUIRED libcrypto openssl)
  PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED)
- FIND_PACKAGE(CURL REQUIRED)
+ FIND_PACKAGE(CURL 7.52.0 REQUIRED)
 -FIND_PACKAGE(Gpgme REQUIRED)
 +PKG_CHECK_MODULES(GPGME gpgme REQUIRED)
 +set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES})
meta/recipes-devtools/librepo/librepo_1.13.0.bb renamed from meta/recipes-devtools/librepo/librepo_1.12.1.bb +1 -1
similarity index 94%
rename from meta/recipes-devtools/librepo/librepo_1.12.1.bb
rename to meta/recipes-devtools/librepo/librepo_1.13.0.bb
index e90928d2ed..0a68e0ac4f 100644
@@ -10,7 +10,7 @@ SRC_URI = "git://github.com/rpm-software-management/librepo.git \
            file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \
            "
 
-SRCREV = "d4ad350291f2937c0b6a3eea9e1d0c8e1051fc32"
+SRCREV = "a244d78bab11510408fb9413f1c78c2f56c69fa5"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.29.2
#32 lore raw

PATCH 10/24 meson: update 0.56.2 -> 0.57.1

In reply to Alexander Kanavin

Replace hacky 0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch with entries in meson.cross.

Rest of the patches are refreshed.

---
 meta/classes/meson.bbclass                    |  2 +
 meta/recipes-devtools/meson/meson.inc         |  3 +-
 .../0001-Make-CPU-family-warnings-fatal.patch | 10 ++---
 ...g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch | 37 -------------------
 ...y-do-not-substitute-python-s-install.patch | 14 +++----
 ...pport-building-allarch-recipes-again.patch |  6 +--
 .../meson/meson/0003-native_bindir.patch      | 27 +++++++-------
 .../meson/meson/disable-rpath-handling.patch  | 12 +++---
 .../{meson_0.56.2.bb => meson_0.57.1.bb}      |  0
 ...on_0.56.2.bb => nativesdk-meson_0.57.1.bb} |  0
 10 files changed, 36 insertions(+), 75 deletions(-)
 delete mode 100644 meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch
 rename meta/recipes-devtools/meson/{meson_0.56.2.bb => meson_0.57.1.bb} (100%)
 rename meta/recipes-devtools/meson/{nativesdk-meson_0.56.2.bb => nativesdk-meson_0.57.1.bb} (100%)
meta/classes/meson.bbclass +2 -0
index 83aa854b7e..a7644e70cb 100644
@@ -99,6 +99,8 @@ readelf = ${@meson_array('READELF', d)}
 pkgconfig = 'pkg-config'
 llvm-config = 'llvm-config${LLVMVERSION}'
 cups-config = 'cups-config'
+g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper'
+g-ir-compiler = '${STAGING_BINDIR}/g-ir-compiler-wrapper'
 
 [properties]
 needs_exe_wrapper = true
meta/recipes-devtools/meson/meson.inc +1 -2
index d0ebec9911..622c22affd 100644
@@ -14,9 +14,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
            file://disable-rpath-handling.patch \
            file://cross-prop-default.patch \
            file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
-           file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \
            "
-SRC_URI[sha256sum] = "3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4"
+SRC_URI[sha256sum] = "72e1c782ba9bda204f4a1ed57f98d027d7b6eb9414c723eebbd6ec7f1955c8a6"
 
 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 +5 -5
index edd262df5a..0808891a27 100644
@@ -1,4 +1,4 @@
-From 248d17b7221e7ebc9d84154eac11ae4ebb5189ab Mon Sep 17 00:00:00 2001
+From 76934bcbf2cfa7304e8864e28c51f58adda0392f 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 13d0ba5..5ba3a1a 100644
+index ba35d16..2d3c34c 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
-@@ -254,7 +254,7 @@ class MachineInfo:
+@@ -262,7 +262,7 @@ class MachineInfo:
  
          cpu_family = literal['cpu_family']
          if cpu_family not in known_cpu_families:
@@ -25,10 +25,10 @@ index 13d0ba5..5ba3a1a 100644
          endian = literal['endian']
          if endian not in ('little', 'big'):
 diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 588005b..988e3ea 100644
+index 756dd81..4d2c2b6 100644
 --- a/mesonbuild/environment.py
 +++ b/mesonbuild/environment.py
-@@ -400,9 +400,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
+@@ -434,9 +434,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
              trial = 'ppc64'
  
      if trial not in known_cpu_families:
meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch deleted +0 -37
deleted file mode 100644
index a1f8422d44..0000000000
@@ -1,37 +0,0 @@
-From 64aa6718c290e150dafd8da83f31cb08af00af0e Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Wed, 27 May 2020 16:43:05 +0000
-Subject: [PATCH] gnome.py: prefix g-i paths with PKG_CONFIG_SYSROOT_DIR
-
-When using sysroots for builds, the standard target paths for the
-tools need to be prefixed (pkg-config is not clever enough to
-determine when a custom variable is a path)
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <[email protected]>
-
----
- mesonbuild/modules/gnome.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
-index 52016f4..2b72ee4 100644
---- a/mesonbuild/modules/gnome.py
-+++ b/mesonbuild/modules/gnome.py
-@@ -410,14 +410,14 @@ class GnomeModule(ExtensionModule):
-             if giscanner is not None:
-                 self.giscanner = ExternalProgram.from_entry('g-ir-scanner', giscanner)
-             elif self.gir_dep.type_name == 'pkgconfig':
--                self.giscanner = ExternalProgram('g_ir_scanner', self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}))
-+                self.giscanner = ExternalProgram('g_ir_scanner', os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}))
-             else:
-                 self.giscanner = self.interpreter.find_program_impl('g-ir-scanner')
-             gicompiler = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-compiler')
-             if gicompiler is not None:
-                 self.gicompiler = ExternalProgram.from_entry('g-ir-compiler', gicompiler)
-             elif self.gir_dep.type_name == 'pkgconfig':
--                self.gicompiler = ExternalProgram('g_ir_compiler', self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}))
-+                self.gicompiler = ExternalProgram('g_ir_compiler', os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}))
-             else:
-                 self.gicompiler = self.interpreter.find_program_impl('g-ir-compiler')
-         return self.gir_dep, self.giscanner, self.gicompiler
meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch +5 -9
index c0ad01e9d3..231414fcb6 100644
@@ -1,4 +1,4 @@
-From 214e559d394491b1376e4cc370f75151117a3f83 Mon Sep 17 00:00:00 2001
+From f8f67c8d5c3f374b1e30e2d40cb56a79f0544471 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Thu, 18 Apr 2019 17:36:11 +0200
 Subject: [PATCH] modules/python.py: do not substitute python's install prefix
@@ -12,11 +12,11 @@ Upstream-Status: Pending
 Signed-off-by: Alexander Kanavin <[email protected]>
 
 ---
- mesonbuild/modules/python.py | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
+ mesonbuild/modules/python.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
-index 2f0c644..d2aa565 100644
+index eda70ce..18edd15 100644
 --- a/mesonbuild/modules/python.py
 +++ b/mesonbuild/modules/python.py
 @@ -251,7 +251,7 @@ INTROSPECT_COMMAND = '''import sysconfig
@@ -28,11 +28,7 @@ index 2f0c644..d2aa565 100644
  
  def links_against_libpython():
      from distutils.core import Distribution, Extension
-@@ -276,12 +276,11 @@ class PythonInstallation(ExternalProgramHolder):
-         ExternalProgramHolder.__init__(self, python, interpreter.subproject)
-         self.interpreter = interpreter
-         self.subproject = self.interpreter.subproject
--        prefix = self.interpreter.environment.coredata.get_builtin_option('prefix')
+@@ -280,8 +280,8 @@ class PythonInstallation(ExternalProgramHolder):
          self.variables = info['variables']
          self.paths = info['paths']
          install_paths = info['install_paths']
meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +3 -3
index 2bbd2c149c..ddc34c2f49 100644
@@ -1,4 +1,4 @@
-From 3c0d3d1a32d4a66aa0b7ab9af3e975243855a1db Mon Sep 17 00:00:00 2001
+From 6efb6114836fd4a1e012aa03b37f3beeeb22b466 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,10 +13,10 @@ Signed-off-by: Peter Kjellerstedt <[email protected]>
  1 file changed, 1 insertion(+)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 5ba3a1a..0bf4969 100644
+index 2d3c34c..b9e7908 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
-@@ -38,6 +38,7 @@ _T = T.TypeVar('_T')
+@@ -36,6 +36,7 @@ from pathlib import Path
  
  
  known_cpu_families = (
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +14 -13
index fb55a05187..ed85116c4f 100644
@@ -1,4 +1,4 @@
-From cbc27ee1576b4d04ad8e9d80760c63a9d3b7f5ed Mon Sep 17 00:00:00 2001
+From 1546e1f95a119175b7a4e4272a26dd85505e5ede 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
@@ -15,16 +15,17 @@ that is is OE only. https://github.com/mesonbuild/meson/issues/1849#issuecomment
 
 Upstream-Status: Inappropriate [OE specific]
 Signed-off-by: Ricardo Ribalda Delgado <[email protected]>
+
 ---
  mesonbuild/dependencies/base.py | 19 +++++++++++--------
  mesonbuild/dependencies/ui.py   |  6 +++---
  2 files changed, 14 insertions(+), 11 deletions(-)
 
 diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
-index 3a5f5f8..0af89f8 100644
+index cd77b4b..7e3f338 100644
 --- a/mesonbuild/dependencies/base.py
 +++ b/mesonbuild/dependencies/base.py
-@@ -183,7 +183,7 @@ class Dependency:
+@@ -192,7 +192,7 @@ class Dependency:
      def get_exe_args(self, compiler):
          return []
  
@@ -33,16 +34,16 @@ index 3a5f5f8..0af89f8 100644
          raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name))
  
      def get_configtool_variable(self, variable_name):
-@@ -261,7 +261,7 @@ class InternalDependency(Dependency):
-                 setattr(result, k, copy.deepcopy(v, memo))
-         return result
+@@ -280,7 +280,7 @@ class InternalDependency(Dependency):
+             return True
+         return any(d.is_built() for d in self.ext_deps)
  
 -    def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any]) -> str:
 +    def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any], use_native=False) -> str:
          raise DependencyException('Method "get_pkgconfig_variable()" is '
                                    'invalid for an internal dependency')
  
-@@ -639,8 +639,11 @@ class PkgConfigDependency(ExternalDependency):
+@@ -658,8 +658,11 @@ class PkgConfigDependency(ExternalDependency):
          return s.format(self.__class__.__name__, self.name, self.is_found,
                          self.version_reqs)
  
@@ -56,16 +57,16 @@ index 3a5f5f8..0af89f8 100644
          p, out, err = Popen_safe(cmd, env=env)
          rc, out, err = p.returncode, out.strip(), err.strip()
          call = ' '.join(cmd)
-@@ -666,7 +669,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -685,7 +688,7 @@ class PkgConfigDependency(ExternalDependency):
+             env['PKG_CONFIG_LIBDIR'] = new_pkg_config_libdir
              mlog.debug('PKG_CONFIG_LIBDIR: ' + new_pkg_config_libdir)
  
- 
 -    def _call_pkgbin(self, args, env=None):
 +    def _call_pkgbin(self, args, env=None, use_native=False):
          # Always copy the environment since we're going to modify it
          # with pkg-config variables
          if env is None:
-@@ -680,7 +683,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -699,7 +702,7 @@ class PkgConfigDependency(ExternalDependency):
          targs = tuple(args)
          cache = PkgConfigDependency.pkgbin_cache
          if (self.pkgbin, targs, fenv) not in cache:
@@ -74,7 +75,7 @@ index 3a5f5f8..0af89f8 100644
          return cache[(self.pkgbin, targs, fenv)]
  
      def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]:
-@@ -889,7 +892,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -905,7 +908,7 @@ class PkgConfigDependency(ExternalDependency):
                                        (self.name, out_raw))
          self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
  
@@ -83,7 +84,7 @@ index 3a5f5f8..0af89f8 100644
          options = ['--variable=' + variable_name, self.name]
  
          if 'define_variable' in kwargs:
-@@ -902,7 +905,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -918,7 +921,7 @@ class PkgConfigDependency(ExternalDependency):
  
              options = ['--define-variable=' + '='.join(definition)] + options
  
@@ -93,7 +94,7 @@ index 3a5f5f8..0af89f8 100644
          if ret != 0:
              if self.required:
 diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
-index 5dffd3a..fb3a178 100644
+index d897d76..a598d2e 100644
 --- a/mesonbuild/dependencies/ui.py
 +++ b/mesonbuild/dependencies/ui.py
 @@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency):
meta/recipes-devtools/meson/meson/disable-rpath-handling.patch +6 -6
index 4653a72a20..7c766c61b0 100644
@@ -1,4 +1,4 @@
-From 9e3fcf192c1ca068d310c648c311f9d850214421 Mon Sep 17 00:00:00 2001
+From 27bbd3c9d8d86de545fcf6608564a14571c98a61 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <[email protected]>
 Date: Fri, 23 Nov 2018 15:28:28 +0000
 Subject: [PATCH] meson: Disable rpath stripping at install time
@@ -16,17 +16,17 @@ Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567]
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
-index 0be01fe..5406cab 100644
+index 212568a..06366d4 100644
 --- a/mesonbuild/minstall.py
 +++ b/mesonbuild/minstall.py
-@@ -512,8 +512,11 @@ class Installer:
+@@ -653,8 +653,11 @@ class Installer:
              if file_copied:
                  self.did_install_something = True
                  try:
--                    depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
--                                       install_name_mappings, verbose=False)
+-                    self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
+-                                         install_name_mappings, verbose=False)
 +                    if install_rpath:
-+                        depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
++                        self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
 +                                           install_name_mappings, verbose=False)
 +                    else:
 +                        print("RPATH changes at install time disabled")
meta/recipes-devtools/meson/meson_0.57.1.bb renamed from meta/recipes-devtools/meson/meson_0.56.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.56.2.bb
rename to meta/recipes-devtools/meson/meson_0.57.1.bb
meta/recipes-devtools/meson/nativesdk-meson_0.57.1.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.56.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.56.2.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.57.1.bb
Signature · 1 line
2.29.2
#33 lore raw

PATCH 11/24 perl: update 5.32.0 -> 5.32.1

In reply to Alexander Kanavin

Drop perl-cross-makefile.patch as it is merged upstream.

---
 .../perl/files/perl-cross-makefile.patch      | 29 -------------------
 .../perl/{perl_5.32.0.bb => perl_5.32.1.bb}   |  7 ++---
 2 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 meta/recipes-devtools/perl/files/perl-cross-makefile.patch
 rename meta/recipes-devtools/perl/{perl_5.32.0.bb => perl_5.32.1.bb} (98%)
meta/recipes-devtools/perl/files/perl-cross-makefile.patch deleted +0 -29
deleted file mode 100644
index 5d3f998200..0000000000
@@ -1,29 +0,0 @@
-Makefile: Avoid continual rebuilds of miniperl and associated races 
-
-In the Yocto Project, when we run "make install" we notice miniperl
-rebuilding multiple times. Usually this is harmless however sometimes
-race issues occur such as miniperl not being executable.
-
-The issue is that crosspatch is a phony target so it always rebuilds.
-Adding this as a dependency of miniperl means miniperl always rebuilds
-too.
-
-Avoid this by injecting a direct dependency avoiding the phony target.
-miniperl is then only rebuilt when its input changes as desired.
-
-Signed-off-by: Richard Purdie [email protected]
-Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/95]
-
-Index: perl-5.32.0/Makefile
-===================================================================
---- perl-5.32.0.orig/Makefile
-+++ perl-5.32.0/Makefile
-@@ -56,7 +56,7 @@ crosspatch: $(CROSSPATCHED)
- 
- # A minor fix for buildroot, force crosspatching when running "make perl modules"
- # instead of "make all".
--miniperlmain$O: crosspatch
-+miniperlmain$O: $(CROSSPATCHED)
- 
- # Original versions are not saved anymore; patch generally takes care of this,
- # and if that fails, reaching for the source tarball is the safest option.
meta/recipes-devtools/perl/perl_5.32.1.bb renamed from meta/recipes-devtools/perl/perl_5.32.0.bb +3 -4
similarity index 98%
rename from meta/recipes-devtools/perl/perl_5.32.0.bb
rename to meta/recipes-devtools/perl/perl_5.32.1.bb
index 7d88c65322..1fafc0a8c9 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \
 
 
 SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \
-           https://github.com/arsv/perl-cross/releases/download/1.3.4/perl-cross-1.3.4.tar.gz;name=perl-cross \
+           https://github.com/arsv/perl-cross/releases/download/1.3.5/perl-cross-1.3.5.tar.gz;name=perl-cross \
            file://perl-rdepends.txt \
            file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \
            file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \
@@ -21,7 +21,6 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \
            file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \
            file://0002-Constant-Fix-up-shebang.patch \
            file://determinism.patch  \
-           file://perl-cross-makefile.patch \
            "
 SRC_URI_append_class-native = " \
            file://perl-configpm-switch.patch \
@@ -30,8 +29,8 @@ SRC_URI_append_class-target = " \
            file://encodefix.patch \
 "
 
-SRC_URI[perl.sha256sum] = "efeb1ce1f10824190ad1cadbcccf6fdb8a5d37007d0100d2d9ae5f2b5900c0b4"
-SRC_URI[perl-cross.sha256sum] = "755aa0ca8141a942188a269564f86c3c82349f82c346ed5c992495d7f35138ba"
+SRC_URI[perl.sha256sum] = "03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c"
+SRC_URI[perl-cross.sha256sum] = "91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25"
 
 S = "${WORKDIR}/perl-${PV}"
 
Signature · 1 line
2.29.2
#34 lore raw

Re: [OE-core] [PATCH 11/24] perl: update 5.32.0 -> 5.32.1

seeing few failures

https://errors.yoctoproject.org/Errors/Build/117607/

Quoted 87 lines · Alexander Kanavin

Drop perl-cross-makefile.patch as it is merged upstream.

---
 .../perl/files/perl-cross-makefile.patch      | 29 -------------------
 .../perl/{perl_5.32.0.bb => perl_5.32.1.bb}   |  7 ++---
 2 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 meta/recipes-devtools/perl/files/perl-cross-makefile.patch
 rename meta/recipes-devtools/perl/{perl_5.32.0.bb => perl_5.32.1.bb} (98%)
meta/recipes-devtools/perl/files/perl-cross-makefile.patch deleted +0 -29
deleted file mode 100644
index 5d3f998200..0000000000
@@ -1,29 +0,0 @@
-Makefile: Avoid continual rebuilds of miniperl and associated races
-
-In the Yocto Project, when we run "make install" we notice miniperl
-rebuilding multiple times. Usually this is harmless however sometimes
-race issues occur such as miniperl not being executable.
-
-The issue is that crosspatch is a phony target so it always rebuilds.
-Adding this as a dependency of miniperl means miniperl always rebuilds
-too.
-
-Avoid this by injecting a direct dependency avoiding the phony target.
-miniperl is then only rebuilt when its input changes as desired.
-
-Signed-off-by: Richard Purdie [email protected]
-Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/95]
-
-Index: perl-5.32.0/Makefile
-===================================================================
---- perl-5.32.0.orig/Makefile
-+++ perl-5.32.0/Makefile
-@@ -56,7 +56,7 @@ crosspatch: $(CROSSPATCHED)
-
- # A minor fix for buildroot, force crosspatching when running "make perl modules"
- # instead of "make all".
--miniperlmain$O: crosspatch
-+miniperlmain$O: $(CROSSPATCHED)
-
- # Original versions are not saved anymore; patch generally takes care of this,
- # and if that fails, reaching for the source tarball is the safest option.
meta/recipes-devtools/perl/perl_5.32.1.bb renamed from meta/recipes-devtools/perl/perl_5.32.0.bb +3 -5
similarity index 98%
rename from meta/recipes-devtools/perl/perl_5.32.0.bb
rename to meta/recipes-devtools/perl/perl_5.32.1.bb
index 7d88c65322..1fafc0a8c9 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \
 
 
 SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \
-           https://github.com/arsv/perl-cross/releases/download/1.3.4/perl-cross-1.3.4.tar.gz;name=perl-cross \
+           https://github.com/arsv/perl-cross/releases/download/1.3.5/perl-cross-1.3.5.tar.gz;name=perl-cross \
            file://perl-rdepends.txt \
            file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \
            file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \
@@ -21,7 +21,6 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \
            file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \
            file://0002-Constant-Fix-up-shebang.patch \
            file://determinism.patch  \
-           file://perl-cross-makefile.patch \
            "
 SRC_URI_append_class-native = " \
            file://perl-configpm-switch.patch \
@@ -30,8 +29,8 @@ SRC_URI_append_class-target = " \
            file://encodefix.patch \
 "
 
-SRC_URI[perl.sha256sum] = "efeb1ce1f10824190ad1cadbcccf6fdb8a5d37007d0100d2d9ae5f2b5900c0b4"
-SRC_URI[perl-cross.sha256sum] = "755aa0ca8141a942188a269564f86c3c82349f82c346ed5c992495d7f35138ba"
+SRC_URI[perl.sha256sum] = "03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c"
+SRC_URI[perl-cross.sha256sum] = "91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25"
 
 S = "${WORKDIR}/perl-${PV}"
 
--

2.29.2

#35 lore raw

Re: [OE-core] [PATCH 11/24] perl: update 5.32.0 -> 5.32.1

it would be good to mention it in notes that you might need to export PERL_USE_UNSAFE_INC = "1"
if a perl module still relies on using unsafe include dirs like ( . ) etc. Otherwise this change can break happy users.

Quoted 94 lines · Khem Raj

seeing few failures

https://errors.yoctoproject.org/Errors/Build/117607/

Quoted 87 lines · Alexander Kanavin

Drop perl-cross-makefile.patch as it is merged upstream.

---
 .../perl/files/perl-cross-makefile.patch      | 29 -------------------
 .../perl/{perl_5.32.0.bb => perl_5.32.1.bb}   |  7 ++---
 2 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 meta/recipes-devtools/perl/files/perl-cross-makefile.patch
 rename meta/recipes-devtools/perl/{perl_5.32.0.bb => perl_5.32.1.bb} (98%)
meta/recipes-devtools/perl/files/perl-cross-makefile.patch deleted +0 -29
deleted file mode 100644
index 5d3f998200..0000000000
@@ -1,29 +0,0 @@
-Makefile: Avoid continual rebuilds of miniperl and associated races
-
-In the Yocto Project, when we run "make install" we notice miniperl
-rebuilding multiple times. Usually this is harmless however sometimes
-race issues occur such as miniperl not being executable.
-
-The issue is that crosspatch is a phony target so it always rebuilds.
-Adding this as a dependency of miniperl means miniperl always rebuilds
-too.
-
-Avoid this by injecting a direct dependency avoiding the phony target.
-miniperl is then only rebuilt when its input changes as desired.
-
-Signed-off-by: Richard Purdie [email protected]
-Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/95]
-
-Index: perl-5.32.0/Makefile
-===================================================================
---- perl-5.32.0.orig/Makefile
-+++ perl-5.32.0/Makefile
-@@ -56,7 +56,7 @@ crosspatch: $(CROSSPATCHED)
-
- # A minor fix for buildroot, force crosspatching when running "make perl modules"
- # instead of "make all".
--miniperlmain$O: crosspatch
-+miniperlmain$O: $(CROSSPATCHED)
-
- # Original versions are not saved anymore; patch generally takes care of this,
- # and if that fails, reaching for the source tarball is the safest option.
meta/recipes-devtools/perl/perl_5.32.1.bb renamed from meta/recipes-devtools/perl/perl_5.32.0.bb +3 -5
similarity index 98%
rename from meta/recipes-devtools/perl/perl_5.32.0.bb
rename to meta/recipes-devtools/perl/perl_5.32.1.bb
index 7d88c65322..1fafc0a8c9 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \
 
 
 SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \
-           https://github.com/arsv/perl-cross/releases/download/1.3.4/perl-cross-1.3.4.tar.gz;name=perl-cross \
+           https://github.com/arsv/perl-cross/releases/download/1.3.5/perl-cross-1.3.5.tar.gz;name=perl-cross \
            file://perl-rdepends.txt \
            file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \
            file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \
@@ -21,7 +21,6 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \
            file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \
            file://0002-Constant-Fix-up-shebang.patch \
            file://determinism.patch  \
-           file://perl-cross-makefile.patch \
            "
 SRC_URI_append_class-native = " \
            file://perl-configpm-switch.patch \
@@ -30,8 +29,8 @@ SRC_URI_append_class-target = " \
            file://encodefix.patch \
 "
 
-SRC_URI[perl.sha256sum] = "efeb1ce1f10824190ad1cadbcccf6fdb8a5d37007d0100d2d9ae5f2b5900c0b4"
-SRC_URI[perl-cross.sha256sum] = "755aa0ca8141a942188a269564f86c3c82349f82c346ed5c992495d7f35138ba"
+SRC_URI[perl.sha256sum] = "03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c"
+SRC_URI[perl-cross.sha256sum] = "91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25"
 
 S = "${WORKDIR}/perl-${PV}"
 
--

2.29.2

#36 lore raw

Re: [OE-core] [PATCH 11/24] perl: update 5.32.0 -> 5.32.1

Yes, I was surprised as well this change happened in a point release, but couldn't find the specific setting to revert it. 'perl -I .' works as well.

Alex

Quoted 124 lines · Khem Raj

it would be good to mention it in notes that you might need to export PERL_USE_UNSAFE_INC = "1"
if a perl module still relies on using unsafe include dirs like ( . ) etc. Otherwise this change can break happy users.

Quoted 16 lines · Khem Raj

seeing few failures

https://errors.yoctoproject.org/Errors/Build/117607/

Quoted 9 lines · Alexander Kanavin

Drop perl-cross-makefile.patch as it is merged upstream.

---
 .../perl/files/perl-cross-makefile.patch      | 29 -------------------
 .../perl/{perl_5.32.0.bb => perl_5.32.1.bb}   |  7 ++---
 2 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644

meta/recipes-devtools/perl/files/perl-cross-makefile.patch

Quoted 1 line
Quoted 1 line
 rename meta/recipes-devtools/perl/{perl_5.32.0.bb => perl_5.32.1.bb}

(98%)

Quoted 2 lines
Quoted 2 lines

diff --git

a/meta/recipes-devtools/perl/files/perl-cross-makefile.patch b/meta/recipes-devtools/perl/files/perl-cross-makefile.patch

Quoted 12 lines
Quoted 12 lines

deleted file mode 100644
index 5d3f998200..0000000000

meta/recipes-devtools/perl/files/perl-cross-makefile.patch deleted +0 -7
@@ -1,29 +0,0 @@
-Makefile: Avoid continual rebuilds of miniperl and associated races
-
-In the Yocto Project, when we run "make install" we notice miniperl
-rebuilding multiple times. Usually this is harmless however sometimes
-race issues occur such as miniperl not being executable.
-
-The issue is that crosspatch is a phony target so it always rebuilds.
Quoted 8 lines

meta/recipes-devtools/perl/files/perl-cross-makefile.patch

Quoted 8 lines
meta/recipes-devtools/perl/files/perl-cross-makefile.patch deleted +0 -8
-Adding this as a dependency of miniperl means miniperl always rebuilds
-too.
-
-Avoid this by injecting a direct dependency avoiding the phony target.
-miniperl is then only rebuilt when its input changes as desired.
-
-Signed-off-by: Richard Purdie [email protected]
-Upstream-Status: Submitted [

https://github.com/arsv/perl-cross/pull/95]

Quoted 8 lines

meta/recipes-devtools/perl/files/perl-cross-makefile.patch

Quoted 8 lines
meta/recipes-devtools/perl/files/perl-cross-makefile.patch deleted +0 -8
-
-Index: perl-5.32.0/Makefile
-===================================================================
---- perl-5.32.0.orig/Makefile
-+++ perl-5.32.0/Makefile
-@@ -56,7 +56,7 @@ crosspatch: $(CROSSPATCHED)
-
- # A minor fix for buildroot, force crosspatching when running "make

perl modules"

Quoted 5 lines

meta/recipes-devtools/perl/files/perl-cross-makefile.patch

Quoted 5 lines
meta/recipes-devtools/perl/files/perl-cross-makefile.patch deleted +0 -5
- # instead of "make all".
--miniperlmain$O: crosspatch
-+miniperlmain$O: $(CROSSPATCHED)
-
- # Original versions are not saved anymore; patch generally takes

care of this,

Quoted 1 line

meta/recipes-devtools/perl/files/perl-cross-makefile.patch line 29

Quoted 1 line
meta/recipes-devtools/perl/files/perl-cross-makefile.patch deleted +0 -1
- # and if that fails, reaching for the source tarball is the safest

option.

Quoted 1 line

Review

Quoted 1 line
(quoted diff) +0 -0

b/meta/recipes-devtools/perl/perl_5.32.1.bb

Quoted 7 lines

meta/recipes-devtools/perl/perl_5.32.1.bb LIC_FILES_CHKSUM =

Quoted 7 lines

similarity index 98%
rename from meta/recipes-devtools/perl/perl_5.32.0.bb rename to meta/recipes-devtools/perl/perl_5.32.1.bb index 7d88c65322..1fafc0a8c9 100644

meta/recipes-devtools/perl/perl_5.32.1.bb renamed from meta/recipes-devtools/perl/perl_5.32.0.bb +0 -0
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM =

"file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \

Quoted 4 lines

meta/recipes-devtools/perl/perl_5.32.1.bb LIC_FILES_CHKSUM = · line 10

Quoted 4 lines
meta/recipes-devtools/perl/perl_5.32.1.bb renamed from meta/recipes-devtools/perl/perl_5.32.0.bb +0 -1
 SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \
-

https://github.com/arsv/perl-cross/releases/download/1.3.4/perl-cross-1.3.4.tar.gz;name=perl-cross
\

Quoted 1 line

meta/recipes-devtools/perl/perl_5.32.1.bb LIC_FILES_CHKSUM = · line 10

Quoted 1 line
meta/recipes-devtools/perl/perl_5.32.1.bb renamed from meta/recipes-devtools/perl/perl_5.32.0.bb +1 -0
+

https://github.com/arsv/perl-cross/releases/download/1.3.5/perl-cross-1.3.5.tar.gz;name=perl-cross
\

Quoted 2 lines

meta/recipes-devtools/perl/perl_5.32.1.bb LIC_FILES_CHKSUM = · line 12

Quoted 2 lines
meta/recipes-devtools/perl/perl_5.32.1.bb renamed from meta/recipes-devtools/perl/perl_5.32.0.bb +0 -0
            file://perl-rdepends.txt \
 

file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \

Quoted 1 line
Quoted 1 line

file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \

Quoted 1 line

meta/recipes-devtools/perl/perl_5.32.1.bb SRC_URI = "

Quoted 1 line
meta/recipes-devtools/perl/perl_5.32.1.bb renamed from meta/recipes-devtools/perl/perl_5.32.0.bb +0 -0
@@ -21,7 +21,6 @@ SRC_URI = "

https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \

Quoted 1 line
Quoted 1 line

file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \

Quoted 11 lines

meta/recipes-devtools/perl/perl_5.32.1.bb SRC_URI_append_class-target = " \ · line 33

Quoted 11 lines
            file://0002-Constant-Fix-up-shebang.patch \
            file://determinism.patch  \
meta/recipes-devtools/perl/perl_5.32.1.bb renamed from meta/recipes-devtools/perl/perl_5.32.0.bb +0 -2
-           file://perl-cross-makefile.patch \
            "
 SRC_URI_append_class-native = " \
            file://perl-configpm-switch.patch \
@@ -30,8 +29,8 @@ SRC_URI_append_class-target = " \
            file://encodefix.patch \
 "
 
-SRC_URI[perl.sha256sum] =

"efeb1ce1f10824190ad1cadbcccf6fdb8a5d37007d0100d2d9ae5f2b5900c0b4"

Quoted 1 line

meta/recipes-devtools/perl/perl_5.32.1.bb SRC_URI_append_class-target = " \ · line 34

Quoted 1 line
meta/recipes-devtools/perl/perl_5.32.1.bb renamed from meta/recipes-devtools/perl/perl_5.32.0.bb +0 -1
-SRC_URI[perl-cross.sha256sum] =

"755aa0ca8141a942188a269564f86c3c82349f82c346ed5c992495d7f35138ba"

Quoted 1 line

meta/recipes-devtools/perl/perl_5.32.1.bb SRC_URI_append_class-target = " \ · line 32

Quoted 1 line
meta/recipes-devtools/perl/perl_5.32.1.bb renamed from meta/recipes-devtools/perl/perl_5.32.0.bb +1 -0
+SRC_URI[perl.sha256sum] =

"03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c"

Quoted 1 line

meta/recipes-devtools/perl/perl_5.32.1.bb SRC_URI_append_class-target = " \ · line 33

Quoted 1 line
meta/recipes-devtools/perl/perl_5.32.1.bb renamed from meta/recipes-devtools/perl/perl_5.32.0.bb +1 -0
+SRC_URI[perl-cross.sha256sum] =

"91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25"

Quoted 9 lines
Quoted 9 lines
meta/recipes-devtools/perl/perl_5.32.1.bb renamed from meta/recipes-devtools/perl/perl_5.32.0.bb +0 -1
 S = "${WORKDIR}/perl-${PV}"
 
--

2.29.2

#37 lore raw

PATCH 12/24 pango: update 1.48.0 -> 1.48.2

In reply to Alexander Kanavin

Drop a patch; issue fixed upstream:
https://gitlab.gnome.org/GNOME/pango/-/commit/fcda7d6f9b6ee966f5da860be5ec0c0096193a83

---
 ...c-drop-assert-that-fails-with-Cantar.patch | 27 -------------------
 .../{pango_1.48.0.bb => pango_1.48.2.bb}      |  3 +--
 2 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 meta/recipes-graphics/pango/pango/0001-tests-test-font.c-drop-assert-that-fails-with-Cantar.patch
 rename meta/recipes-graphics/pango/{pango_1.48.0.bb => pango_1.48.2.bb} (90%)
meta/recipes-graphics/pango/pango/0001-tests-test-font.c-drop-assert-that-fails-with-Cantar.patch deleted +0 -27
deleted file mode 100644
index d8f971d914..0000000000
@@ -1,27 +0,0 @@
-From eea900ec107920bc99c9df5ab258b7bc446c0b87 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Fri, 4 Dec 2020 14:03:01 +0000
-Subject: [PATCH] tests/test-font.c: drop assert that fails with Cantarell
- family
-
-Upstream bug: https://gitlab.gnome.org/GNOME/pango/-/issues/494
-
-Upstream-Status: Inappropriate [needs a proper fix by upstream that handles font faces with identical names]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- tests/test-font.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test-font.c b/tests/test-font.c
-index 486504f..7e45ba1 100644
---- a/tests/test-font.c
-+++ b/tests/test-font.c
-@@ -217,7 +217,7 @@ test_enumerate (void)
-   for (i = 0; i < n_faces; i++)
-     {
-       face = pango_font_family_get_face (families[0], pango_font_face_get_face_name (faces[i]));
--      g_assert_true (face == faces[i]);
-+      //g_assert_true (face == faces[i]);
-     }
- 
-   desc = pango_font_description_new ();
meta/recipes-graphics/pango/pango_1.48.2.bb renamed from meta/recipes-graphics/pango/pango_1.48.0.bb +1 -2
similarity index 90%
rename from meta/recipes-graphics/pango/pango_1.48.0.bb
rename to meta/recipes-graphics/pango/pango_1.48.2.bb
index 552a44583c..1dcb43b5e1 100644
@@ -18,8 +18,7 @@ inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspec
 GIR_MESON_ENABLE_FLAG = "enabled"
 GIR_MESON_DISABLE_FLAG = "disabled"
 
-SRC_URI += " file://0001-tests-test-font.c-drop-assert-that-fails-with-Cantar.patch"
-SRC_URI[archive.sha256sum] = "391f26f3341c2d7053e0fb26a956bd42360dadd825efe7088b1e9340a65e74e6"
+SRC_URI[archive.sha256sum] = "d21f8b30dc8abdfc55de25656ecb88dc1105eeeb315e5e2a980dcef8010c2c80"
 
 DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi"
 
Signature · 1 line
2.29.2
#38 lore raw

PATCH 13/24 vulkan-samples: update to latest revision

In reply to Alexander Kanavin
---
 meta/recipes-graphics/vulkan/vulkan-samples_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/vulkan/vulkan-samples_git.bb +1 -1
index 05b9e855d7..f3985c8349 100644
@@ -9,7 +9,7 @@ SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git \
            "
 
 UPSTREAM_CHECK_COMMITS = "1"
-SRCREV = "524cdcd27005e7cd56e6694fa41e685519d7dbca"
+SRCREV = "55cebd9e7cc4153a3a7b3a45d42274c0e2a17815"
 
 UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
 S = "${WORKDIR}/git"
Signature · 1 line
2.29.2
#39 lore raw

PATCH 14/24 webkitgtk: update 2.30.4 -> 2.30.5

In reply to Alexander Kanavin
---
 ...ix-racy-parallel-build-of-WebKit2-4.0.gir.patch | 14 +++++++-------
 .../{webkitgtk_2.30.4.bb => webkitgtk_2.30.5.bb}   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename meta/recipes-sato/webkit/{webkitgtk_2.30.4.bb => webkitgtk_2.30.5.bb} (98%)
meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch +7 -7
index aa9a06701a..0c31c5fa21 100644
@@ -1,4 +1,4 @@
-From 0afc194c6446e6c3242f1d706b4564e3a9cb2cee Mon Sep 17 00:00:00 2001
+From 4718888071e29deb8b245b88c81577fd5bac4e5e Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Mon, 29 Aug 2016 16:38:11 +0300
 Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir
@@ -11,12 +11,12 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
-index a074a80..8c6ebb5 100644
+index a069c5f6..ea2f542b 100644
 --- a/Source/WebKit/PlatformGTK.cmake
 +++ b/Source/WebKit/PlatformGTK.cmake
-@@ -728,8 +728,9 @@ if (ENABLE_INTROSPECTION)
-     string(REGEX MATCHALL "-L[^ ]*"
-         INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+@@ -650,8 +650,9 @@ if (ENABLE_INTROSPECTION)
+         set(GIR_SOURCES_TOP_DIRS "--sources-top-dirs=${CMAKE_BINARY_DIR}")
+     endif ()
  
 -    add_custom_command(
 -        OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
@@ -26,7 +26,7 @@ index a074a80..8c6ebb5 100644
          DEPENDS WebKit
          DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
          COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
-@@ -773,7 +774,7 @@ if (ENABLE_INTROSPECTION)
+@@ -699,7 +700,7 @@ if (ENABLE_INTROSPECTION)
      add_custom_command(
          OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
          DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
@@ -35,7 +35,7 @@ index a074a80..8c6ebb5 100644
          COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
              LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
              ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
-@@ -828,7 +829,7 @@ if (ENABLE_INTROSPECTION)
+@@ -761,7 +762,7 @@ if (ENABLE_INTROSPECTION)
  
      add_custom_command(
          OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
meta/recipes-sato/webkit/webkitgtk_2.30.5.bb renamed from meta/recipes-sato/webkit/webkitgtk_2.30.4.bb +1 -1
similarity index 98%
rename from meta/recipes-sato/webkit/webkitgtk_2.30.4.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.30.5.bb
index a16a676d7a..2928b8e55b 100644
@@ -19,7 +19,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://include_array.patch \
            file://include_xutil.patch \
            "
-SRC_URI[sha256sum] = "d595a37c5001ff787266b155e303a5f2e5b48a6d466f2714c2f30c11392f7b24"
+SRC_URI[sha256sum] = "7d0dab08e3c5ae07bec80b2822ef42e952765d5724cac86eb23999bfed5a7f1f"
 
 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
 
Signature · 1 line
2.29.2
#40 lore raw

PATCH 15/24 libgcrypt: update 1.8.7 -> 1.9.2

In reply to Alexander Kanavin

Drop backports.

Add a patch that inserts missing spaces in Makefiles.

Drop determinism.patch: upstream has moved the git stuff to an external script, which has a guard that checkes for presence of .git/ in source tree.

License-Update: additional source file listed

---
 ...0001-Makefile.am-add-a-missing-space.patch |  41 +++
 .../0001-Prefetch-GCM-look-up-tables.patch    |  90 -----
 ...01-libgcrypt-fix-m4-file-for-oe-core.patch |   9 +-
 ...-tables-to-.data-section-and-unshare.patch | 332 ------------------
 ...ilding-error-with-O2-in-sysroot-path.patch |  16 +-
 ...-table-to-.data-section-and-unshare-.patch | 178 ----------
 ...m-fix-undefined-reference-to-pthread.patch |  21 +-
 .../libgcrypt/files/determinism.patch         |  32 --
 ...{libgcrypt_1.8.7.bb => libgcrypt_1.9.2.bb} |  12 +-
 9 files changed, 67 insertions(+), 664 deletions(-)
 create mode 100644 meta/recipes-support/libgcrypt/files/0001-Makefile.am-add-a-missing-space.patch
 delete mode 100644 meta/recipes-support/libgcrypt/files/0001-Prefetch-GCM-look-up-tables.patch
 delete mode 100644 meta/recipes-support/libgcrypt/files/0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch
 delete mode 100644 meta/recipes-support/libgcrypt/files/0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch
 delete mode 100644 meta/recipes-support/libgcrypt/files/determinism.patch
 rename meta/recipes-support/libgcrypt/{libgcrypt_1.8.7.bb => libgcrypt_1.9.2.bb} (81%)
meta/recipes-support/libgcrypt/files/0001-Makefile.am-add-a-missing-space.patch new file +41 -0
new file mode 100644
index 0000000000..8fbed9add6
@@ -0,0 +1,41 @@
+From b8192ff67ed46ea2cc4282fa1856ce2868223737 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Wed, 24 Feb 2021 19:43:07 +0000
+Subject: [PATCH] Makefile.am: add a missing space
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ cipher/Makefile.am | 2 +-
+ doc/Makefile.am    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cipher/Makefile.am b/cipher/Makefile.am
+index 1cf5072..b3ca225 100644
+--- a/cipher/Makefile.am
++++ b/cipher/Makefile.am
+@@ -143,7 +143,7 @@ gost-sb.h: gost-s-box
+ 
+ gost-s-box: gost-s-box.c
+ 	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \
+-	    $(CPPFLAGS_FOR_BUILD)-o $@ $(srcdir)/gost-s-box.c
++	    $(CPPFLAGS_FOR_BUILD) -o $@ $(srcdir)/gost-s-box.c
+ 
+ 
+ if ENABLE_O_FLAG_MUNGING
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index fd7aac2..1703bd9 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -43,7 +43,7 @@ man_MANS = $(myman_pages)
+ 
+ yat2m: yat2m.c
+ 	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \
+-	    $(CPPFLAGS_FOR_BUILD)-o $@ $(srcdir)/yat2m.c
++	    $(CPPFLAGS_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
+ 
+ .fig.png:
+ 	fig2dev -L png `test -f '$<' || echo '$(srcdir)/'`$< $@
+-- 
+2.17.1
+
meta/recipes-support/libgcrypt/files/0001-Prefetch-GCM-look-up-tables.patch deleted +0 -90

90 lines not on this page · raw message

meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch +3 -6
index cd8a5993b4..c873e24ed5 100644
@@ -1,4 +1,4 @@
-From bee26d7c4ea0b4a397c289b819b89e78bc325ba0 Mon Sep 17 00:00:00 2001
+From 839f38e5ecc22b7f1b837284bbbffac8cb32ab1e Mon Sep 17 00:00:00 2001
 From: Trevor Gamblin <[email protected]>
 Date: Tue, 29 Oct 2019 14:08:32 -0400
 Subject: [PATCH] libgcrypt: fix m4 file for oe-core
@@ -17,7 +17,7 @@ Signed-off-by: Trevor Gamblin <[email protected]>
  1 file changed, 4 insertions(+), 86 deletions(-)
 
 diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4
-index 37dfbea2..3d2e90a8 100644
+index 19d514f..21125c7 100644
 --- a/src/libgcrypt.m4
 +++ b/src/libgcrypt.m4
 @@ -29,41 +29,6 @@ dnl is added to the gpg_config_script_warn variable.
@@ -25,7 +25,7 @@ index 37dfbea2..3d2e90a8 100644
  AC_DEFUN([AM_PATH_LIBGCRYPT],
  [ AC_REQUIRE([AC_CANONICAL_HOST])
 -  AC_ARG_WITH(libgcrypt-prefix,
--            AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
+-            AS_HELP_STRING([--with-libgcrypt-prefix=PFX],
 -                           [prefix where LIBGCRYPT is installed (optional)]),
 -     libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
 -  if test x"${LIBGCRYPT_CONFIG}" = x ; then
@@ -144,6 +144,3 @@ index 37dfbea2..3d2e90a8 100644
      ifelse([$3], , :, [$3])
    fi
    AC_SUBST(LIBGCRYPT_CFLAGS)
--- 
-2.17.1
-
meta/recipes-support/libgcrypt/files/0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch deleted +0 -332

332 lines not on this page · raw message

meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch +7 -9
index d7554f38af..f9c362431c 100644
@@ -1,7 +1,7 @@
-From 97570ef271ea1fb7b5ca903eec88f68407b0ec76 Mon Sep 17 00:00:00 2001
+From 3c6c10eae0993c8ca60879494c6650f7b8f54ebe Mon Sep 17 00:00:00 2001
 From: Chen Qi <[email protected]>
 Date: Wed, 16 Aug 2017 10:44:41 +0800
-Subject: [PATCH 2/4] libgcrypt: fix building error with '-O2' in sysroot path
+Subject: [PATCH] libgcrypt: fix building error with '-O2' in sysroot path
 
 Upstream-Status: Pending
 
@@ -19,23 +19,21 @@ Signed-off-by: Chen Qi <[email protected]>
 
 Rebase to 1.8.0
 Signed-off-by: Hongxu Jia <[email protected]>
+
 ---
  cipher/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cipher/Makefile.am b/cipher/Makefile.am
-index 95c4510..bd52ec7 100644
+index d644005..1cf5072 100644
 --- a/cipher/Makefile.am
 +++ b/cipher/Makefile.am
-@@ -116,7 +116,7 @@ gost-s-box: gost-s-box.c
+@@ -147,7 +147,7 @@ gost-s-box: gost-s-box.c
  
  
  if ENABLE_O_FLAG_MUNGING
--o_flag_munging = sed -e 's/-O\([2-9s][2-9s]*\)/-O1/' -e 's/-Ofast/-O1/g'
-+o_flag_munging = sed -e 's/ -O\([2-9s][2-9s]*\) / -O1 /' -e 's/ -Ofast / -O1 /g'
+-o_flag_munging = sed -e 's/-O\([2-9sg][2-9sg]*\)/-O1/' -e 's/-Ofast/-O1/g'
++o_flag_munging = sed -e 's/ -O\([2-9sg][2-9sg]*\) / -O1 /' -e 's/ -Ofast / -O1 /g'
  else
  o_flag_munging = cat
  endif
--- 
-1.8.3.1
-
meta/recipes-support/libgcrypt/files/0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch deleted +0 -178

178 lines not on this page · raw message

meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch +11 -10
index 8622df3ea8..5bf0c7f8a3 100644
@@ -1,7 +1,7 @@
-From e20dbdb0b8f0af840ef90b299c4e2277c52ddf87 Mon Sep 17 00:00:00 2001
+From cb06d218ee36e303a64f27c690f30040d5d87960 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
 Date: Sun, 12 Jun 2016 04:44:29 -0400
-Subject: [PATCH 4/4] tests/Makefile.am: fix undefined reference to
+Subject: [PATCH] tests/Makefile.am: fix undefined reference to
  `pthread_create'
 
 Add missing '-lpthread' to CFLAGS
@@ -9,20 +9,21 @@ Add missing '-lpthread' to CFLAGS
 Upstream-Status: Pending
 
 Signed-off-by: Hongxu Jia <[email protected]>
+
 ---
  tests/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 1744ea7..04cf425 100644
+index ab201f0..1cf82d0 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
-@@ -64,4 +64,4 @@ EXTRA_DIST = README rsa-16k.key cavs_tests.sh cavs_driver.pl \
- 
- LDADD = $(standard_ldadd) $(GPG_ERROR_LIBS)
- t_lock_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS)
+@@ -75,7 +75,7 @@ t_mpi_bit_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@
+ t_secmem_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@
+ testapi_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@
+ t_lock_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@
 -t_lock_CFLAGS = $(GPG_ERROR_MT_CFLAGS)
 +t_lock_CFLAGS = $(GPG_ERROR_MT_CFLAGS) -lpthread
--- 
-1.8.3.1
-
+ testdrv_LDADD = $(LDADD_FOR_TESTS_KLUDGE)
+ 
+ # Build a version of the test driver for the build platform.
meta/recipes-support/libgcrypt/files/determinism.patch deleted +0 -32
deleted file mode 100644
index ad0b8c7950..0000000000
@@ -1,32 +0,0 @@
-gnutls detects our outer git trees and injects that revision into its objects.
-That isn't deterministic so stop it. Also ensure we're not marked as a development
-build as its git detection is faulty.
-
-RP 2020/2/6
-
-Upstream-Status: Pending
-Signed-off-by: Richard Purdie <[email protected]>
-
-
-Index: libgcrypt-1.8.5/configure.ac
-===================================================================
---- libgcrypt-1.8.5.orig/configure.ac
-+++ libgcrypt-1.8.5/configure.ac
-@@ -45,7 +45,7 @@ m4_define([mym4_revision_dec],
- m4_define([mym4_betastring],
-           m4_esyscmd_s([git describe --match 'libgcrypt-[0-9].*[0-9]' --long|\
-                         awk -F- '$3!=0{print"-beta"$3}']))
--m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
-+m4_define([mym4_isgit],[no])
- m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
- 
- AC_INIT([libgcrypt],[mym4_full_version],[http://bugs.gnupg.org])
-@@ -2575,7 +2575,7 @@ AM_CONDITIONAL([BUILD_DOC], [test "x$bui
- #
- # Provide information about the build.
- #
--BUILD_REVISION="mym4_revision"
-+BUILD_REVISION="None"
- AC_SUBST(BUILD_REVISION)
- AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION",
-                    [GIT commit id revision used to build this package])
meta/recipes-support/libgcrypt/libgcrypt_1.9.2.bb renamed from meta/recipes-support/libgcrypt/libgcrypt_1.8.7.bb +5 -7
similarity index 81%
rename from meta/recipes-support/libgcrypt/libgcrypt_1.8.7.bb
rename to meta/recipes-support/libgcrypt/libgcrypt_1.9.2.bb
index 7db624a09b..df49177f16 100644
@@ -11,7 +11,8 @@ LICENSE_dumpsexp-dev = "GPLv3+"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \
-                    file://LICENSES;md5=840e3bcb754e5046ffeda7619034cbd8"
+                    file://LICENSES;md5=2dae15d91a37cfde72fe9eae75f8ea14 \
+                    "
 
 DEPENDS = "libgpg-error"
 
@@ -21,12 +22,9 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \
            file://0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch \
            file://0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \
            file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \
-           file://0001-Prefetch-GCM-look-up-tables.patch \
-           file://0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch \
-           file://0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch \
-           file://determinism.patch \
-"
-SRC_URI[sha256sum] = "03b70f028299561b7034b8966d7dd77ef16ed139c43440925fe8782561974748"
+           file://0001-Makefile.am-add-a-missing-space.patch \
+           "
+SRC_URI[sha256sum] = "b2c10d091513b271e47177274607b1ffba3d95b188bbfa8797f948aec9053c5a"
 
 # Below whitelisted CVEs are disputed and not affecting crypto libraries for any distro.
 CVE_CHECK_WHITELIST += "CVE-2018-12433 CVE-2018-12438"
Signature · 1 line
2.29.2
#41 lore raw

PATCH 16/24 libical: update 3.0.8 -> 3.0.9

In reply to Alexander Kanavin

Upstream attempted to fix cross-compilation, but seems to have botched it, so a new ticket was filed, and patch to un-break it was rewritten.

---
 .../0001-Fix-build-with-icu-68.1.patch        | 81 -------------------
 ...-our-hand-build-native-src-generator.patch | 45 +++++------
 .../{libical_3.0.8.bb => libical_3.0.9.bb}    | 14 ++--
 3 files changed, 28 insertions(+), 112 deletions(-)
 delete mode 100644 meta/recipes-support/libical/libical/0001-Fix-build-with-icu-68.1.patch
 rename meta/recipes-support/libical/{libical_3.0.8.bb => libical_3.0.9.bb} (79%)
meta/recipes-support/libical/libical/0001-Fix-build-with-icu-68.1.patch deleted +0 -81
deleted file mode 100644
index 79e1475c6c..0000000000
@@ -1,81 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-From 52d603212173d4502800bf746436a93f806a8898 Mon Sep 17 00:00:00 2001
-From: Allen Winter <[email protected]>
-Date: Sat, 31 Oct 2020 17:38:01 -0400
-Subject: [PATCH] Fix build with icu-68.1
-
-Use stdbool.h to define true and false when possible
-
-Issue#448
----
- ConfigureChecks.cmake   |  1 +
- config.h.cmake          |  3 +++
- src/libical/icalrecur.c | 10 ++++++++--
- 3 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index e4d0e2ec..bba33fa9 100644
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -10,6 +10,7 @@ check_include_files(sys/utsname.h HAVE_SYS_UTSNAME_H)
- check_include_files(fcntl.h HAVE_FCNTL_H)
- check_include_files(unistd.h HAVE_UNISTD_H)
- check_include_files(wctype.h HAVE_WCTYPE_H)
-+check_include_files(stdbool.h HAVE_STDBOOL_H)
- 
- include(CheckFunctionExists)
- if(WIN32 AND MSVC)
-diff --git a/config.h.cmake b/config.h.cmake
-index 8fd3421b..c8008692 100644
---- a/config.h.cmake
-+++ b/config.h.cmake
-@@ -39,6 +39,9 @@
- /* Define to 1 if you have the <dirent.h> header file. */
- #cmakedefine HAVE_DIRENT_H 1
- 
-+/* Define to 1 if you have the <stdbool.h> header file. */
-+#cmakedefine HAVE_STDBOOL_H 1
-+
- /* Define if we have pthread. */
- #cmakedefine HAVE_PTHREAD_ATTR_GET_NP 1
- #cmakedefine HAVE_PTHREAD_GETATTR_NP 1
-diff --git a/src/libical/icalrecur.c b/src/libical/icalrecur.c
-index 73178450..b3f054b8 100644
---- a/src/libical/icalrecur.c
-+++ b/src/libical/icalrecur.c
-@@ -145,6 +145,12 @@
- #if defined(HAVE_LIBICU)
- #include <unicode/ucal.h>
- #include <unicode/ustring.h>
-+#if defined(HAVE_STDBOOL_H)
-+#include <stdbool.h>
-+#else
-+#define false 0
-+#define true 1
-+#endif
- #define RSCALE_IS_SUPPORTED 1
- #else
- #define RSCALE_IS_SUPPORTED 0
-@@ -1018,7 +1024,7 @@ icalarray *icalrecurrencetype_rscale_supported_calendars(void)
- 
-     calendars = icalarray_new(sizeof(const char **), 20);
- 
--    en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
-+    en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status);
-     while ((cal = uenum_next(en, NULL, &status))) {
-         cal = icalmemory_tmp_copy(cal);
-         icalarray_append(calendars, &cal);
-@@ -1411,7 +1417,7 @@ static int initialize_rscale(icalrecur_iterator *impl)
-         }
- 
-         /* Check if specified calendar is supported */
--        en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
-+        en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status);
-         while ((cal = uenum_next(en, NULL, &status))) {
-             if (!strcmp(cal, rule.rscale)) {
-                 is_hebrew = !strcmp(rule.rscale, "hebrew");
--- 
-2.25.1
-
meta/recipes-support/libical/libical/0001-Use-our-hand-build-native-src-generator.patch +22 -23

55 lines not on this page · raw message

meta/recipes-support/libical/libical_3.0.9.bb renamed from meta/recipes-support/libical/libical_3.0.8.bb +6 -8
similarity index 79%
rename from meta/recipes-support/libical/libical_3.0.8.bb
rename to meta/recipes-support/libical/libical_3.0.9.bb
index 6230f09eca..6f8b491190 100644
@@ -8,19 +8,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1910a2a76ddf6a9ba369182494170d87 \
                     "
 SECTION = "libs"
 
-SRC_URI = " \
-    https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \
-    file://0001-Use-our-hand-build-native-src-generator.patch \
-    file://0001-Fix-build-with-icu-68.1.patch \
+SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \
+           file://0001-Use-our-hand-build-native-src-generator.patch \
 "
-SRC_URI[md5sum] = "41bd1f1fcdcb4779cea478bb55cf07bf"
-SRC_URI[sha256sum] = "09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f"
+SRC_URI[sha256sum] = "bd26d98b7fcb2eb0cd5461747bbb02024ebe38e293ca53a7dfdcb2505265a728"
 UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases"
 
 inherit cmake pkgconfig
 
 do_compile_prepend() {
-	# As long as https://github.com/libical/libical/issues/394 is open build native src-generator manually
+	# As long as https://github.com/libical/libical/issues/481 is open build native src-generator manually
 	NATIVE_CFLAGS="${BUILD_CFLAGS} `pkg-config-native --cflags glib-2.0` `pkg-config-native --cflags libxml-2.0`"
 	NATIVE_LDFLAGS="${BUILD_LDFLAGS} `pkg-config-native --libs glib-2.0` `pkg-config-native --libs libxml-2.0`"
 	${BUILD_CC} $NATIVE_CFLAGS ${S}/src/libical-glib/tools/generator.c ${S}/src/libical-glib/tools/xml-parser.c -o ${B}/src-generator $NATIVE_LDFLAGS
@@ -42,5 +39,6 @@ do_install_append () {
     sed -i \
        -e 's,${STAGING_LIBDIR},${libdir},g' \
        -e 's,${STAGING_INCDIR},${includedir},g' \
-       ${D}${libdir}/cmake/LibIcal/LibIcal*.cmake
+       ${D}${libdir}/cmake/LibIcal/LibIcal*.cmake \
+       ${D}${libdir}/cmake/LibIcal/Ical*.cmake
 }
Signature · 1 line
2.29.2
#42 lore raw

PATCH 17/24 pinentry: update 1.1.0 -> 1.1.1

In reply to Alexander Kanavin

Refresh xxx-config->pkg-config patches.

---
 meta/lib/oeqa/selftest/cases/oescripts.py     |   2 +-
 .../pinentry-1.1.0/gpg-error_pkconf.patch     | 100 ----------
 .../pinentry-1.1.1/gpg-error_pkconf.patch     | 177 ++++++++++++++++++
 .../libassuan_pkgconf.patch                   | 111 ++++++-----
 .../{pinentry_1.1.0.bb => pinentry_1.1.1.bb}  |   3 +-
 5 files changed, 243 insertions(+), 150 deletions(-)
 delete mode 100644 meta/recipes-support/pinentry/pinentry-1.1.0/gpg-error_pkconf.patch
 create mode 100644 meta/recipes-support/pinentry/pinentry-1.1.1/gpg-error_pkconf.patch
 rename meta/recipes-support/pinentry/{pinentry-1.1.0 => pinentry-1.1.1}/libassuan_pkgconf.patch (63%)
 rename meta/recipes-support/pinentry/{pinentry_1.1.0.bb => pinentry_1.1.1.bb} (90%)
meta/lib/oeqa/selftest/cases/oescripts.py +1 -1
index 726daff7c6..8a10ff357b 100644
@@ -167,7 +167,7 @@ class OEListPackageconfigTests(OEScriptTests):
     def test_packageconfig_flags_option_all(self):
         results = runCmd('%s/contrib/list-packageconfig-flags.py -a' % self.scripts_dir)
         expected_endlines = []
-        expected_endlines.append("pinentry-1.1.0")
+        expected_endlines.append("pinentry-1.1.1")
         expected_endlines.append("PACKAGECONFIG ncurses libcap")
         expected_endlines.append("PACKAGECONFIG[qt] --enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase")
         expected_endlines.append("PACKAGECONFIG[gtk2] --enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0")
meta/recipes-support/pinentry/pinentry-1.1.0/gpg-error_pkconf.patch deleted +0 -100

100 lines not on this page · raw message

meta/recipes-support/pinentry/pinentry-1.1.1/gpg-error_pkconf.patch new file +177 -0

177 lines not on this page · raw message

meta/recipes-support/pinentry/pinentry-1.1.1/libassuan_pkgconf.patch renamed from meta/recipes-support/pinentry/pinentry-1.1.0/libassuan_pkgconf.patch +64 -47

183 lines not on this page · raw message

meta/recipes-support/pinentry/pinentry_1.1.1.bb renamed from meta/recipes-support/pinentry/pinentry_1.1.0.bb +1 -2
similarity index 90%
rename from meta/recipes-support/pinentry/pinentry_1.1.0.bb
rename to meta/recipes-support/pinentry/pinentry_1.1.1.bb
index d9ca0732f7..98577fe3ef 100644
@@ -16,8 +16,7 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://gpg-error_pkconf.patch \
 "
 
-SRC_URI[md5sum] = "3829315cb0a1e9cedc05ffe6def7a2c6"
-SRC_URI[sha256sum] = "68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570"
+SRC_URI[sha256sum] = "cd12a064013ed18e2ee8475e669b9f58db1b225a0144debdb85a68cecddba57f"
 
 inherit autotools pkgconfig
 
Signature · 1 line
2.29.2
#43 lore raw

PATCH 18/24 procps: update 3.3.16 -> 3.3.17

In reply to Alexander Kanavin
---
 .../procps/0001-w.c-correct-musl-builds.patch | 44 +++++++++++++++++++
 ...02-proc-escape.c-add-missing-include.patch | 23 ++++++++++
 .../{procps_3.3.16.bb => procps_3.3.17.bb}    |  4 +-
 3 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch
 create mode 100644 meta/recipes-extended/procps/procps/0002-proc-escape.c-add-missing-include.patch
 rename meta/recipes-extended/procps/{procps_3.3.16.bb => procps_3.3.17.bb} (94%)
meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch new file +44 -0
new file mode 100644
index 0000000000..c92ad28e4f
@@ -0,0 +1,44 @@
+From 22f8d25567b8d64bdbab0fb0b4915b4362561d9b Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Wed, 24 Feb 2021 21:14:31 +0000
+Subject: [PATCH] w.c: correct musl builds
+
+No need to redefine UT_ stuff to something that does not exist.
+
+UT_ is already provided in musl but via utmp.h header, so include
+it always.
+
+Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/126]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ w.c | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/w.c b/w.c
+index 9d07ac9..d10639b 100644
+--- a/w.c
++++ b/w.c
+@@ -57,9 +57,8 @@
+ #include <unistd.h>
+ #ifdef HAVE_UTMPX_H
+ #	include <utmpx.h>
+-#else
+-#	include <utmp.h>
+ #endif
++#include <utmp.h>
+ #include <arpa/inet.h>
+ 
+ static int ignoreuser = 0;	/* for '-u' */
+@@ -72,12 +71,6 @@ typedef struct utmpx utmp_t;
+ typedef struct utmp utmp_t;
+ #endif
+ 
+-#if !defined(UT_HOSTSIZE) || defined(__UT_HOSTSIZE)
+-#	define UT_HOSTSIZE __UT_HOSTSIZE
+-#	define UT_LINESIZE __UT_LINESIZE
+-#	define UT_NAMESIZE __UT_NAMESIZE
+-#endif
+-
+ #ifdef W_SHOWFROM
+ # define FROM_STRING "on"
+ #else
meta/recipes-extended/procps/procps/0002-proc-escape.c-add-missing-include.patch new file +23 -0
new file mode 100644
index 0000000000..5fa1ac9d78
@@ -0,0 +1,23 @@
+From 4f964821398dff7ab21fec63da15e1e00b2e9277 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Wed, 24 Feb 2021 21:16:14 +0000
+Subject: [PATCH] proc/escape.c: add missing include
+
+Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/126]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ proc/escape.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/proc/escape.c b/proc/escape.c
+index 2e8fb7d..e1f4612 100644
+--- a/proc/escape.c
++++ b/proc/escape.c
+@@ -21,6 +21,7 @@
+ #include <sys/types.h>
+ #include <string.h>
+ #include <limits.h>
++#include <langinfo.h>
+ #include "procps.h"
+ #include "escape.h"
+ #include "readproc.h"
meta/recipes-extended/procps/procps_3.3.17.bb renamed from meta/recipes-extended/procps/procps_3.3.16.bb +3 -1
similarity index 94%
rename from meta/recipes-extended/procps/procps_3.3.16.bb
rename to meta/recipes-extended/procps/procps_3.3.17.bb
index ef3ac86e97..c74a901d9a 100644
@@ -14,8 +14,10 @@ inherit autotools gettext pkgconfig update-alternatives
 
 SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https \
            file://sysctl.conf \
+           file://0001-w.c-correct-musl-builds.patch \
+           file://0002-proc-escape.c-add-missing-include.patch \
            "
-SRCREV = "59c88e18f29000ceaf7e5f98181b07be443cf12f"
+SRCREV = "19a508ea121c0c4ac6d0224575a036de745eaaf8"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.29.2
#44 lore raw

Re: [OE-core] [PATCH 18/24] procps: update 3.3.16 -> 3.3.17

Quoted 34 lines · Alexander Kanavin
---
  .../procps/0001-w.c-correct-musl-builds.patch | 44 +++++++++++++++++++
  ...02-proc-escape.c-add-missing-include.patch | 23 ++++++++++
  .../{procps_3.3.16.bb => procps_3.3.17.bb}    |  4 +-
  3 files changed, 70 insertions(+), 1 deletion(-)

create mode 100644 meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch create mode 100644 meta/recipes-extended/procps/procps/0002-proc-escape.c-add-missing-include.patch rename meta/recipes-extended/procps/{procps_3.3.16.bb => procps_3.3.17.bb} (94%)

meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch new file +18 -0
new file mode 100644
index 0000000000..c92ad28e4f
@@ -0,0 +1,44 @@
+From 22f8d25567b8d64bdbab0fb0b4915b4362561d9b Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Wed, 24 Feb 2021 21:14:31 +0000
+Subject: [PATCH] w.c: correct musl builds
+
+No need to redefine UT_ stuff to something that does not exist.
+
+UT_ is already provided in musl but via utmp.h header, so include
+it always.
+
+Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/126]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ w.c | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/w.c b/w.c
+index 9d07ac9..d10639b 100644

meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch line 28

Quoted 10 lines
meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch new file +10 -0
+--- a/w.c
++++ b/w.c
+@@ -57,9 +57,8 @@
+ #include <unistd.h>
+ #ifdef HAVE_UTMPX_H
+ #	include <utmpx.h>
+-#else
+-#	include <utmp.h>
+ #endif
++#include <utmp.h>

this would mean when utmpx.h is provided ( e.g. ) it will now include both, which is a change perhaps to look more into, it might want them to be exclusive.

Quoted 69 lines
meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch new file +16 -0
+ #include <arpa/inet.h>
+
+ static int ignoreuser = 0;	/* for '-u' */
+@@ -72,12 +71,6 @@ typedef struct utmpx utmp_t;
+ typedef struct utmp utmp_t;
+ #endif
+
+-#if !defined(UT_HOSTSIZE) || defined(__UT_HOSTSIZE)
+-#	define UT_HOSTSIZE __UT_HOSTSIZE
+-#	define UT_LINESIZE __UT_LINESIZE
+-#	define UT_NAMESIZE __UT_NAMESIZE
+-#endif
+-
+ #ifdef W_SHOWFROM
+ # define FROM_STRING "on"
+ #else
meta/recipes-extended/procps/procps/0002-proc-escape.c-add-missing-include.patch new file +23 -0
new file mode 100644
index 0000000000..5fa1ac9d78
@@ -0,0 +1,23 @@
+From 4f964821398dff7ab21fec63da15e1e00b2e9277 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Wed, 24 Feb 2021 21:16:14 +0000
+Subject: [PATCH] proc/escape.c: add missing include
+
+Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/126]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ proc/escape.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/proc/escape.c b/proc/escape.c
+index 2e8fb7d..e1f4612 100644
+--- a/proc/escape.c
++++ b/proc/escape.c
+@@ -21,6 +21,7 @@
+ #include <sys/types.h>
+ #include <string.h>
+ #include <limits.h>
++#include <langinfo.h>
+ #include "procps.h"
+ #include "escape.h"
+ #include "readproc.h"
meta/recipes-extended/procps/procps_3.3.17.bb renamed from meta/recipes-extended/procps/procps_3.3.16.bb +3 -1
similarity index 94%
rename from meta/recipes-extended/procps/procps_3.3.16.bb
rename to meta/recipes-extended/procps/procps_3.3.17.bb
index ef3ac86e97..c74a901d9a 100644
@@ -14,8 +14,10 @@ inherit autotools gettext pkgconfig update-alternatives
 
  SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https \
             file://sysctl.conf \
+           file://0001-w.c-correct-musl-builds.patch \
+           file://0002-proc-escape.c-add-missing-include.patch \
             "
-SRCREV = "59c88e18f29000ceaf7e5f98181b07be443cf12f"
+SRCREV = "19a508ea121c0c4ac6d0224575a036de745eaaf8"
 
  S = "${WORKDIR}/git"
 
#45 lore raw

Re: [OE-core] [PATCH 18/24] procps: update 3.3.16 -> 3.3.17

Quoted 42 lines · Khem Raj
Quoted 40 lines · Alexander Kanavin

---

  .../procps/0001-w.c-correct-musl-builds.patch | 44 +++++++++++++++++++
  ...02-proc-escape.c-add-missing-include.patch | 23 ++++++++++
  .../{procps_3.3.16.bb => procps_3.3.17.bb}    |  4 +-
  3 files changed, 70 insertions(+), 1 deletion(-)

  create mode 100644 meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch create mode 100644 meta/recipes-extended/procps/procps/0002-proc-escape.c-add-missing-include.patch rename meta/recipes-extended/procps/{procps_3.3.16.bb => procps_3.3.17.bb} (94%)

meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch new file +24 -0
new file mode 100644
index 0000000000..c92ad28e4f
@@ -0,0 +1,44 @@
+From 22f8d25567b8d64bdbab0fb0b4915b4362561d9b Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Wed, 24 Feb 2021 21:14:31 +0000
+Subject: [PATCH] w.c: correct musl builds
+
+No need to redefine UT_ stuff to something that does not exist.
+
+UT_ is already provided in musl but via utmp.h header, so include
+it always.
+
+Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/126]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ w.c | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/w.c b/w.c
+index 9d07ac9..d10639b 100644
+--- a/w.c
++++ b/w.c
+@@ -57,9 +57,8 @@
+ #include <unistd.h>
+ #ifdef HAVE_UTMPX_H
+ #	include <utmpx.h>
Quoted 8 lines

meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch line 28

Quoted 4 lines
meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch new file +4 -0
+-#else
+-#	include <utmp.h>
+ #endif
++#include <utmp.h>

this would mean when utmpx.h is provided ( e.g. ) it will now include both, which is a change perhaps to look more into, it might want them to be exclusive.

This one is worrying me a bit as it does seem to change behaviour on glibc. Was anyone able to look into it further?

Cheers,

Richard

#46 lore raw

Re: [OE-core] [PATCH 18/24] procps: update 3.3.16 -> 3.3.17

There is an open issue upstream:
https://gitlab.com/procps-ng/procps/-/issues/193

I'm fine if this is deferred until upstream sorts it out.

Alex

Quoted 68 lines · Richard Purdie
Quoted 5 lines · Khem Raj
Quoted 3 lines · Alexander Kanavin
---
  .../procps/0001-w.c-correct-musl-builds.patch | 44

+++++++++++++++++++

Quoted 4 lines
Quoted 4 lines
  ...02-proc-escape.c-add-missing-include.patch | 23 ++++++++++
  .../{procps_3.3.16.bb => procps_3.3.17.bb}    |  4 +-
  3 files changed, 70 insertions(+), 1 deletion(-)

create mode 100644

meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch

Quoted 1 line
Quoted 1 line

create mode 100644

meta/recipes-extended/procps/procps/0002-proc-escape.c-add-missing-include.patch

Quoted 1 line
Quoted 1 line

rename meta/recipes-extended/procps/{procps_3.3.16.bb =>

procps_3.3.17.bb} (94%)

Quoted 2 lines
Quoted 2 lines

diff --git

a/meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch b/meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch

Quoted 4 lines
Quoted 4 lines

new file mode 100644
index 0000000000..c92ad28e4f
--- /dev/null
+++

b/meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch

Quoted 4 lines
Quoted 4 lines
meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch new file +3 -0
@@ -0,0 +1,44 @@
+From 22f8d25567b8d64bdbab0fb0b4915b4362561d9b Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Wed, 24 Feb 2021 21:14:31 +0000
Quoted 8 lines

meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch

Quoted 8 lines
meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch new file +8 -0
+Subject: [PATCH] w.c: correct musl builds
+
+No need to redefine UT_ stuff to something that does not exist.
+
+UT_ is already provided in musl but via utmp.h header, so include
+it always.
+
+Upstream-Status: Submitted [

https://gitlab.com/procps-ng/procps/-/merge_requests/126]

Quoted 13 lines
Quoted 13 lines
meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch new file +13 -0
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ w.c | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/w.c b/w.c
+index 9d07ac9..d10639b 100644
+--- a/w.c
++++ b/w.c
+@@ -57,9 +57,8 @@
+ #include <unistd.h>
+ #ifdef HAVE_UTMPX_H
+ # include <utmpx.h>
Quoted 8 lines

meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch line 28

Quoted 4 lines
meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch new file +4 -0
+-#else
+-# include <utmp.h>
+ #endif
++#include <utmp.h>

this would mean when utmpx.h is provided ( e.g. ) it will now include both, which is a change perhaps to look more into, it might want them to be exclusive.

This one is worrying me a bit as it does seem to change behaviour on glibc. Was anyone able to look into it further?

Cheers,

Richard

#47 lore raw

PATCH 19/24 libmd: add a recipe

In reply to Alexander Kanavin

This is required by new versions of libbsd.

---
 meta/conf/distro/include/maintainers.inc  |  1 +
 meta/recipes-support/libmd/libmd_1.0.3.bb | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 meta/recipes-support/libmd/libmd_1.0.3.bb
meta/conf/distro/include/maintainers.inc +1 -0
index c9c9b8fc1e..9093f2d7fd 100644
@@ -350,6 +350,7 @@ RECIPE_MAINTAINER_pn-libinput = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-libjitterentropy = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-libksba = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-libmatchbox = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-libmd = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-libmnl = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-libmpc = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-libmodule-build-perl = "Tim Orling <[email protected]>"
meta/recipes-support/libmd/libmd_1.0.3.bb new file +16 -0
new file mode 100644
index 0000000000..2e6762e490
@@ -0,0 +1,16 @@
+SUMMARY = "Message Digest functions from BSD systems"
+DESCRIPTION = "This library provides message digest functions \
+found on BSD systems either on their libc (NetBSD, OpenBSD) or \
+libmd (FreeBSD, DragonflyBSD, macOS, Solaris) libraries and \
+lacking on others like GNU systems."
+HOMEPAGE = "https://www.hadrons.org/software/libmd/"
+
+LICENSE = "BSD-3-Clause & BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0436d4fb62a71f661d6e8b7812f9e1df"
+
+SRC_URI = "https://archive.hadrons.org/software/libmd/libmd-${PV}.tar.xz"
+SRC_URI[sha256sum] = "5a02097f95cc250a3f1001865e4dbba5f1d15554120f95693c0541923c52af4a"
+
+inherit autotools
+
+BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.29.2
#48 lore raw

PATCH 20/24 libbsd: udpate 0.10.0 -> 0.11.3

In reply to Alexander Kanavin

License-Update: copyright years, file lists

---
 .../libbsd/{libbsd_0.10.0.bb => libbsd_0.11.3.bb}          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename meta/recipes-support/libbsd/{libbsd_0.10.0.bb => libbsd_0.11.3.bb} (87%)
meta/recipes-support/libbsd/libbsd_0.11.3.bb renamed from meta/recipes-support/libbsd/libbsd_0.10.0.bb +4 -3
similarity index 87%
rename from meta/recipes-support/libbsd/libbsd_0.10.0.bb
rename to meta/recipes-support/libbsd/libbsd_0.11.3.bb
index 5b32b9af41..55ecae2ea5 100644
@@ -29,14 +29,15 @@ HOMEPAGE = "https://libbsd.freedesktop.org/wiki/"
 # License: public-domain-Colin-Plumb
 LICENSE = "BSD-3-Clause & BSD-4-Clause & ISC & PD"
 LICENSE_${PN} = "BSD-3-Clause & ISC & PD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2120be0173469a06ed185b688e0e1ae0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=adf6172075bcc5837e33a8a688eb7e22"
 SECTION = "libs"
 
 SRC_URI = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "ead96d240d02faa5b921c0aa50c812b5"
-SRC_URI[sha256sum] = "34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887"
+SRC_URI[sha256sum] = "ff95cf8184151dacae4247832f8d4ea8800fa127dbd15033ecfe839f285b42a1"
 
 inherit autotools pkgconfig
 
+DEPENDS += "libmd"
+
 BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.29.2
#49 lore raw

PATCH 21/24 syslinux: use NO_INLINE_FUNCS in CFLAGS

In reply to Alexander Kanavin

This is required with latest versions of e2fsprogs.

---
 meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb +2 -0
index fbb2da7f91..8d78f62efa 100644
@@ -44,6 +44,8 @@ TARGET_LDFLAGS = ""
 SECURITY_LDFLAGS = ""
 LDFLAGS_SECTION_REMOVAL = ""
 
+CFLAGS_append = " -DNO_INLINE_FUNCS"
+
 EXTRA_OEMAKE = " \
 	BINDIR=${bindir} SBINDIR=${sbindir} LIBDIR=${libdir} \
 	DATADIR=${datadir} MANDIR=${mandir} INCDIR=${includedir} \
Signature · 1 line
2.29.2
#50 lore raw

PATCH 22/24 scripts/lib/wic/partition.py: do not set FAT size

In reply to Alexander Kanavin

Modern dosfstools automatically determines the appropriate size and will error out if something that doesn't make sense is supplied on the command line.

---
 scripts/lib/wic/partition.py | 4 ----
 1 file changed, 4 deletions(-)
scripts/lib/wic/partition.py +0 -4
index 85f9847047..76d144d12d 100644
@@ -339,8 +339,6 @@ class Partition():
             label_str = "-n %s" % self.label
 
         size_str = ""
-        if self.fstype == 'msdos':
-            size_str = "-F 16" # FAT 16
 
         extraopts = self.mkfs_extraopts or '-S 512'
 
@@ -422,8 +420,6 @@ class Partition():
             label_str = "-n %s" % self.label
 
         size_str = ""
-        if self.fstype == 'msdos':
-            size_str = "-F 16" # FAT 16
 
         extraopts = self.mkfs_extraopts or '-S 512'
 
Signature · 1 line
2.29.2
#51 lore raw

Re: [OE-core] [PATCH 22/24] scripts/lib/wic/partition.py: do not set FAT size

Quoted 3 lines · Alexander Kanavin

Modern dosfstools automatically determines the appropriate size and will error out if something that doesn't make sense is supplied on the command line.

leaving it to tool seem to make it non-deterministic, is there any disadvantage of using a manual fallback default

Quoted 33 lines
---
  scripts/lib/wic/partition.py | 4 ----
  1 file changed, 4 deletions(-)
scripts/lib/wic/partition.py +0 -4
index 85f9847047..76d144d12d 100644
@@ -339,8 +339,6 @@ class Partition():
              label_str = "-n %s" % self.label
 
          size_str = ""
-        if self.fstype == 'msdos':
-            size_str = "-F 16" # FAT 16
 
          extraopts = self.mkfs_extraopts or '-S 512'
 
@@ -422,8 +420,6 @@ class Partition():
              label_str = "-n %s" % self.label
 
          size_str = ""
-        if self.fstype == 'msdos':
-            size_str = "-F 16" # FAT 16
 
          extraopts = self.mkfs_extraopts or '-S 512'
 
#52 lore raw

Re: [OE-core] [PATCH 22/24] scripts/lib/wic/partition.py: do not set FAT size

Quoted 10 lines · Khem Raj
Quoted 3 lines · Alexander Kanavin

Modern dosfstools automatically determines the appropriate size and will error out if something that doesn't make sense is supplied on the command line.

leaving it to tool seem to make it non-deterministic, is there any disadvantage of using a manual fallback default

It is fully deterministic and depends on the filesystem size. Also it's an internal filesystem detail no one cares about as all sizes are nowadays supported by all FAT drivers.

Alex

#53 lore raw

PATCH 23/24 openssl: address ptest failures caused by perl 5.32.1

In reply to Alexander Kanavin

For some reason the new perl no longer has . in list of directories searched in 'require', and so the file needs to be copied where perl can find it.

---
 meta/recipes-connectivity/openssl/openssl_1.1.1j.bb | 4 ++++
 1 file changed, 4 insertions(+)
meta/recipes-connectivity/openssl/openssl_1.1.1j.bb +4 -0
index c431f22643..181790e6ab 100644
@@ -199,6 +199,10 @@ do_install_ptest () {
 
 	install -d ${D}${PTEST_PATH}/engines
 	install -m755 ${B}/engines/ossltest.so ${D}${PTEST_PATH}/engines
+
+        # seems to be needed with perl 5.32.1
+        install -d ${D}${PTEST_PATH}/util/perl/recipes
+        cp ${D}${PTEST_PATH}/test/recipes/tconversion.pl ${D}${PTEST_PATH}/util/perl/recipes/
 }
 
 # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto
Signature · 1 line
2.29.2
#54 lore raw

PATCH 24/24 ptest-perl/run-ptest: address failures caused by perl 5.32.1

In reply to Alexander Kanavin

Particulary, . needs to be explicitly specified so that perl looks there when loading items in 'require'.

---
 meta/files/ptest-perl/run-ptest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/files/ptest-perl/run-ptest +1 -1
index c9f9ca94d0..fd35357b42 100644
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 for case in `find t -type f -name '*.t'`; do
-    perl $case >$case.output 2>&1
+    perl -I . $case >$case.output 2>&1
     ret=$?
     cat $case.output
     if [ $ret -ne 0 ]; then
Signature · 1 line
2.29.2