3 files changed, 0 insertions, 76 deletions

diff --git a/meta/recipes-devtools/python/python3-libarchive-c/0001-ffi-Insert-a-replacable-anchor-for-find_library.patch b/meta/recipes-devtools/python/python3-libarchive-c/0001-ffi-Insert-a-replacable-anchor-for-find_library.patch
deleted file mode 100644
index 7b8775802f..0000000000
--- a/meta/recipes-devtools/python/python3-libarchive-c/0001-ffi-Insert-a-replacable-anchor-for-find_library.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ed20aba335996d3aa97d99dfc122eb5a3a26ba1b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 2 Nov 2024 11:06:01 -0700
-Subject: [PATCH] ffi: Insert a replacable anchor for find_library
-
-@@REPLACE_FIND_LIBRARY_API@@ must be sustituted from bitbake environment via
-recipe. This also helps in detecting changes to code from upstream in
-this area as this patch will fail to apply.
-
-Upstream-Status: Inappropriate [OE-Specific]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libarchive/ffi.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libarchive/ffi.py b/libarchive/ffi.py
-index 1fc321a..991f1b6 100644
---- a/libarchive/ffi.py
-+++ b/libarchive/ffi.py
-@@ -22,7 +22,7 @@ logger = logging.getLogger('libarchive')
- 
- page_size = mmap.PAGESIZE
- 
--libarchive_path = os.environ.get('LIBARCHIVE') or find_library('archive')
-+libarchive_path = os.environ.get('LIBARCHIVE') or @@REPLACE_FIND_LIBRARY_API@@
- libarchive = ctypes.cdll.LoadLibrary(libarchive_path)
- 
- 
diff --git a/meta/recipes-devtools/python/python3-libarchive-c/new-libarchive.patch b/meta/recipes-devtools/python/python3-libarchive-c/new-libarchive.patch
deleted file mode 100644
index 681e03a465..0000000000
--- a/meta/recipes-devtools/python/python3-libarchive-c/new-libarchive.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From adb206946721a4f5bd1190ab9c975bab4373e35c Mon Sep 17 00:00:00 2001
-From: Changaco <changaco@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.burton@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/run-ptest b/meta/recipes-devtools/python/python3-libarchive-c/run-ptest
deleted file mode 100644
index ddfbba7f94..0000000000
--- a/meta/recipes-devtools/python/python3-libarchive-c/run-ptest
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# export needed to set the locale to support accentuated and non-latin chars in tests
-export LC_ALL=en_US.UTF-8
-
-pytest --automake