mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
78e30d940d
Drop distutils and smtpd modules from packaging, as both are gone in 3.12. Rebase: 0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch (drop setup.py chunk as the file is gone) Drop patches: 0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch (setup.py gone, lib/termcap not mentioned anywhere else) 0001-Don-t-search-system-for-headers-libraries.patch (setup.py gone, usr/lib64 not mentioned anywhere else) 0001-Makefile-do-not-compile-.pyc-in-parallel.patch (replaced with COMPILEALL_OPTS= in EXTRA_OEMAKE) 0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch (setup.py gone, add_multiarch_paths not mentioned anywhere else) 0017-setup.py-do-not-report-missing-dependencies-for-disa.patch (has been superseded by Setup.local tweak in do_configure:prepend) 12-distutils-prefix-is-inside-staging-area.patch (distutils has been removed upstream, so this old, unplesant hack can be finally dropped) avoid_warning_about_tkinter.patch (setup.py gone, tkinter detection logic performed in configure.ac) (From OE-Core rev: 716d82352545d3667a658b69d65d6127678dd150) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
41 lines
1.7 KiB
Diff
41 lines
1.7 KiB
Diff
From 039d5e652796b55f1132afa568c7432b6ed89afd Mon Sep 17 00:00:00 2001
|
|
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Date: Fri, 27 May 2022 17:05:44 +0100
|
|
Subject: [PATCH] python3: Ensure stale empty python module directories don't
|
|
|
|
There are two issues here. Firstly, the modules are accessed in on disk order. This
|
|
means behaviour seen on one system might not reproduce on another and is a real headache.
|
|
|
|
Secondly, empty directories left behind by previous modules might be looked at. This
|
|
has caused a long string of different issues for us.
|
|
|
|
As a result, patch this to a behaviour which works for us.
|
|
|
|
Upstream-Status: Pending [need to talk to upstream to see if they'll take one or both fixes]
|
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
---
|
|
Lib/importlib/metadata/__init__.py | 9 ++++++++-
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Lib/importlib/metadata/__init__.py b/Lib/importlib/metadata/__init__.py
|
|
index 82e0ce1..969cac4 100644
|
|
--- a/Lib/importlib/metadata/__init__.py
|
|
+++ b/Lib/importlib/metadata/__init__.py
|
|
@@ -710,7 +710,14 @@ class Lookup:
|
|
self.infos = FreezableDefaultDict(list)
|
|
self.eggs = FreezableDefaultDict(list)
|
|
|
|
- for child in path.children():
|
|
+ for child in sorted(path.children()):
|
|
+ childpath = pathlib.Path(path.root, child)
|
|
+ try:
|
|
+ if childpath.is_dir() and not any(childpath.iterdir()):
|
|
+ # Empty directories aren't interesting
|
|
+ continue
|
|
+ except PermissionError:
|
|
+ continue
|
|
low = child.lower()
|
|
if low.endswith((".dist-info", ".egg-info")):
|
|
# rpartition is faster than splitext and suitable for this purpose.
|