From: James Hilliard <james.hilliard1@gmail.com>
To: buildroot@buildroot.org
Cc: James Hilliard <james.hilliard1@gmail.com>,
Marcus Hoffmann <marcus.hoffmann@othermo.de>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Subject: [Buildroot] [PATCH v3 2/2] package/pkg-python: clean conflicting pep517 packages before install
Date: Mon, 22 Aug 2022 01:54:18 -0600 [thread overview]
Message-ID: <20220822075418.903230-2-james.hilliard1@gmail.com> (raw)
In-Reply-To: <20220822075418.903230-1-james.hilliard1@gmail.com>
The python installer package isn't able to overwrite files of packges
that already exist, this causes problems when doing a rebuild or
update without a full clean.
To fix this we can use functionality from importlib to identify and
remove any conflicting python package files before installation.
Fixes:
Traceback (most recent call last):
File "/home/buildroot/buildroot/support/scripts/pyinstaller.py", line 69, in <module>
main()
File "/home/buildroot/buildroot/support/scripts/pyinstaller.py", line 61, in main
install(
File "/home/buildroot/buildroot/output/host/lib/python3.10/site-packages/installer/_core.py", line 109, in install
record = destination.write_file(
File "/home/buildroot/buildroot/output/host/lib/python3.10/site-packages/installer/destinations.py", line 207, in write_file
return self.write_to_fs(scheme, path_, stream, is_executable)
File "/home/buildroot/buildroot/output/host/lib/python3.10/site-packages/installer/destinations.py", line 167, in write_to_fs
raise FileExistsError(message)
FileExistsError: File already exists: /home/buildroot/buildroot/output/target/usr/lib/python3.10/site-packages/tinycss2/__init__.py
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Tested-by: Marcus Hoffmann <marcus.hoffmann@othermo.de>
---
Changes v2 -> v3:
- split out host pyinstaller.py change
Changes v1 -> v2:
- remove unused os import
---
support/scripts/pyinstaller.py | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/support/scripts/pyinstaller.py b/support/scripts/pyinstaller.py
index 6dd9242327..d9b77cac19 100644
--- a/support/scripts/pyinstaller.py
+++ b/support/scripts/pyinstaller.py
@@ -2,12 +2,33 @@
import argparse
import glob
+import pathlib
+
+from importlib.machinery import PathFinder
+from importlib.metadata import DistributionFinder
from installer import install
+from installer._core import _process_WHEEL_file
from installer.destinations import SchemeDictionaryDestination
from installer.sources import WheelFile
+def clean(source, destination):
+ scheme = _process_WHEEL_file(source)
+ scheme_path = destination.scheme_dict[scheme]
+ context = DistributionFinder.Context(
+ name=source.distribution,
+ path=[scheme_path],
+ )
+ for path in PathFinder.find_distributions(context=context):
+ if not path.files:
+ continue
+ for file in path.files:
+ file_path = pathlib.Path(file.locate())
+ if file_path.exists():
+ file_path.unlink()
+
+
def main():
"""Entry point for CLI."""
ap = argparse.ArgumentParser("python pyinstaller.py")
@@ -58,6 +79,7 @@ def main():
)
with WheelFile.open(glob.glob(args.wheel_file)[0]) as source:
+ clean(source, destination)
install(
source=source,
destination=destination,
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next prev parent reply other threads:[~2022-08-22 7:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-22 7:54 [Buildroot] [PATCH v3 1/2] package/pkg-python: use pyinstaller.py for host python packages James Hilliard
2022-08-22 7:54 ` James Hilliard [this message]
2022-08-22 9:57 ` [Buildroot] [PATCH v3 2/2] package/pkg-python: clean conflicting pep517 packages before install Yann E. MORIN
2022-08-22 9:55 ` [Buildroot] [PATCH v3 1/2] package/pkg-python: use pyinstaller.py for host python packages Yann E. MORIN
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220822075418.903230-2-james.hilliard1@gmail.com \
--to=james.hilliard1@gmail.com \
--cc=buildroot@buildroot.org \
--cc=marcus.hoffmann@othermo.de \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.