From 8c22ff0d8b70d9b12f0487ef696a7e915b9e3173 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 7 Nov 2025 13:31:53 +0000 Subject: The poky repository master branch is no longer being updated. You can either: a) switch to individual clones of bitbake, openembedded-core, meta-yocto and yocto-docs b) use the new bitbake-setup You can find information about either approach in our documentation: https://docs.yoctoproject.org/ Note that "poky" the distro setting is still available in meta-yocto as before and we continue to use and maintain that. Long live Poky! Some further information on the background of this change can be found in: https://lists.openembedded.org/g/openembedded-architecture/message/2179 Signed-off-by: Richard Purdie --- ...er-utils.py-sort-entries-before-writing-o.patch | 27 -------- .../python/python3-installer/interpreter.patch | 71 ---------------------- 2 files changed, 98 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-installer/0001-src-installer-utils.py-sort-entries-before-writing-o.patch delete mode 100644 meta/recipes-devtools/python/python3-installer/interpreter.patch (limited to 'meta/recipes-devtools/python/python3-installer') diff --git a/meta/recipes-devtools/python/python3-installer/0001-src-installer-utils.py-sort-entries-before-writing-o.patch b/meta/recipes-devtools/python/python3-installer/0001-src-installer-utils.py-sort-entries-before-writing-o.patch deleted file mode 100644 index a6715ed457..0000000000 --- a/meta/recipes-devtools/python/python3-installer/0001-src-installer-utils.py-sort-entries-before-writing-o.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 760ddf50ce559abd67bbdd31797267d00bcddfb3 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 1 Oct 2024 19:22:11 +0200 -Subject: [PATCH] src/installer/utils.py: sort entries before writing out - RECORD file - -This helps build reproducibility. - -Upstream-Status: Submitted [https://github.com/pypa/installer/pull/245] -Signed-off-by: Alexander Kanavin ---- - src/installer/utils.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/installer/utils.py b/src/installer/utils.py -index 3e601d6..073297c 100644 ---- a/src/installer/utils.py -+++ b/src/installer/utils.py -@@ -207,7 +207,7 @@ def construct_record_file( - io.BytesIO(), encoding="utf-8", write_through=True, newline="" - ) - writer = csv.writer(stream, delimiter=",", quotechar='"', lineterminator="\n") -- for scheme, record in records: -+ for scheme, record in sorted(records, key=lambda x: x[1].path): - writer.writerow(record.to_row(prefix_for_scheme(scheme))) - stream.seek(0) - return stream.detach() diff --git a/meta/recipes-devtools/python/python3-installer/interpreter.patch b/meta/recipes-devtools/python/python3-installer/interpreter.patch deleted file mode 100644 index 7906769b90..0000000000 --- a/meta/recipes-devtools/python/python3-installer/interpreter.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 74fe171fa4a25c120607e9f8450cbdfee675c959 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Mon, 14 Mar 2022 14:39:22 +0000 -Subject: [PATCH] python3-installer: add installer module - -Let us override the hashbang directly (possibly upstreamable), and don't -play games with hashbangs: for now assume that even hashbangs with spaces -are simple (assume the spaces are only used to separate arguments) and -we don't have long hashbangs. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton - ---- - src/installer/__main__.py | 9 ++++++++- - src/installer/scripts.py | 15 +-------------- - 2 files changed, 9 insertions(+), 15 deletions(-) - -diff --git a/src/installer/__main__.py b/src/installer/__main__.py -index 51014b9..38de286 100644 ---- a/src/installer/__main__.py -+++ b/src/installer/__main__.py -@@ -30,6 +30,13 @@ def _get_main_parser() -> argparse.ArgumentParser: - type=str, - help="override prefix to install packages to", - ) -+ parser.add_argument( -+ "--interpreter", -+ "-i", -+ type=str, -+ default=sys.executable, -+ help=f"interpreter (defaults to {sys.executable})", -+ ) - parser.add_argument( - "--compile-bytecode", - action="append", -@@ -86,7 +93,7 @@ def _main(cli_args: Sequence[str], program: Optional[str] = None) -> None: - with WheelFile.open(args.wheel) as source: - destination = SchemeDictionaryDestination( - scheme_dict=_get_scheme_dict(source.distribution, prefix=args.prefix), -- interpreter=sys.executable, -+ interpreter=args.interpreter, - script_kind=get_launcher_kind(), - bytecode_optimization_levels=bytecode_levels, - destdir=args.destdir, -diff --git a/src/installer/scripts.py b/src/installer/scripts.py -index 7e3c8fc..ba6ed5a 100644 ---- a/src/installer/scripts.py -+++ b/src/installer/scripts.py -@@ -59,20 +59,7 @@ def _build_shebang(executable: str, forlauncher: bool) -> bytes: - https://bitbucket.org/pypa/distlib/src/58cd5c6/distlib/scripts.py#lines-124 - """ - executable_bytes = executable.encode("utf-8") -- if forlauncher: # The launcher can just use the command as-is. -- return b"#!" + executable_bytes -- if _is_executable_simple(executable_bytes): -- return b"#!" + executable_bytes -- -- # Shebang support for an executable with a space in it is under-specified -- # and platform-dependent, so we use a clever hack to generate a script to -- # run in ``/bin/sh`` that should work on all reasonably modern platforms. -- # Read the following message to understand how the hack works: -- # https://github.com/pradyunsg/installer/pull/4#issuecomment-623668717 -- -- quoted = shlex.quote(executable).encode("utf-8") -- # I don't understand a lick what this is trying to do. -- return b"#!/bin/sh\n'''exec' " + quoted + b' "$0" "$@"\n' + b"' '''" -+ return b"#!" + executable_bytes - - - class InvalidScript(ValueError): -- cgit v1.2.3-54-g00ecf