Backport a patch from an upstream PR to disable a test that correctly causes errors in libarchive 3.7.5 onwards.
Signed-off-by: Ross Burton <ross.bur...@arm.com> --- .../python3-libarchive-c/new-libarchive.patch | 41 +++++++++++++++++++ .../python/python3-libarchive-c_5.1.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-libarchive-c/new-libarchive.patch diff --git a/meta/recipes-devtools/python/python3-libarchive-c/new-libarchive.patch b/meta/recipes-devtools/python/python3-libarchive-c/new-libarchive.patch new file mode 100644 index 00000000000..681e03a465b --- /dev/null +++ b/meta/recipes-devtools/python/python3-libarchive-c/new-libarchive.patch @@ -0,0 +1,41 @@ +From adb206946721a4f5bd1190ab9c975bab4373e35c Mon Sep 17 00:00:00 2001 +From: Changaco <chang...@changaco.oy.lc> +Date: Fri, 27 Sep 2024 11:51:22 +0200 +Subject: [PATCH] update a test failing with new libarchive versions + +fixes #130 + +Upstream-Status: Submitted [https://github.com/Changaco/python-libarchive-c/pull/131] +Signed-off-by: Ross Burton <ross.bur...@arm.com> +--- + tests/test_entry.py | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/tests/test_entry.py b/tests/test_entry.py +index 419cecb..34543a5 100644 +--- a/tests/test_entry.py ++++ b/tests/test_entry.py +@@ -9,7 +9,7 @@ + + import pytest + +-from libarchive import memory_reader, memory_writer ++from libarchive import ArchiveError, memory_reader, memory_writer + from libarchive.entry import ArchiveEntry, ConsumedArchiveEntry, PassedArchiveEntry + + from . import data_dir, get_entries, get_tarinfos +@@ -64,7 +64,13 @@ def test_check_ArchiveEntry_against_TarInfo(): + + + def test_check_archiveentry_using_python_testtar(): +- check_entries(join(data_dir, 'testtar.tar')) ++ # This test behaves differently depending on the libarchive version: ++ # 3.5, 3.6 and presumably all future versions reject the archive as damaged, ++ # whereas older versions accepted it. ++ try: ++ check_entries(join(data_dir, 'testtar.tar')) ++ except ArchiveError as e: ++ assert e.msg == "Damaged tar archive" + + + def test_check_archiveentry_with_unicode_and_binary_entries_tar(): diff --git a/meta/recipes-devtools/python/python3-libarchive-c_5.1.bb b/meta/recipes-devtools/python/python3-libarchive-c_5.1.bb index c8aff3defe6..3116c6b62ec 100644 --- a/meta/recipes-devtools/python/python3-libarchive-c_5.1.bb +++ b/meta/recipes-devtools/python/python3-libarchive-c_5.1.bb @@ -6,6 +6,7 @@ LICENSE = "CC0-1.0" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=bcab380227a83bc147350b40a81e6ffc" SRC_URI += " \ + file://new-libarchive.patch \ file://run-ptest \ " -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#205029): https://lists.openembedded.org/g/openembedded-core/message/205029 Mute This Topic: https://lists.openembedded.org/mt/108688678/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
