From 0a4e093940df5b21ae216b9b4ed1488bdb9d23ce Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Wed, 2 Apr 2025 14:49:31 +0800 Subject: [PATCH] python-blivet: 3.9.2 -> 3.12.1 Upgrade python-blivet from 3.9.2 to 3.12.1: * rebase 0002-run_program-support-timeout.patch Signed-off-by: Kai Kang Signed-off-by: Khem Raj --- .../0002-run_program-support-timeout.patch | 18 +++++++++++------- ...livet_3.9.2.bb => python3-blivet_3.12.1.bb} | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) rename meta-python/recipes-extended/python-blivet/{python3-blivet_3.9.2.bb => python3-blivet_3.12.1.bb} (93%) diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch index d277e8b0f7..b577cd4bd4 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch +++ b/meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch @@ -6,15 +6,19 @@ Subject: [PATCH 02/11] run_program support timeout Upstream-Status: Pending Signed-off-by: Hongxu Jia + +Rebase for blivet 3.12.1. + +Signed-off-by: Kai Kang --- - blivet/util.py | 70 +++++++++++++++++++++++++++++--------------------- + blivet/util.py | 70 ++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 29 deletions(-) diff --git a/blivet/util.py b/blivet/util.py -index f8a8f88..a5da7b6 100644 +index d194a5b..5985164 100644 --- a/blivet/util.py +++ b/blivet/util.py -@@ -171,6 +171,30 @@ class Path(str): +@@ -169,6 +169,30 @@ class Path(str): def __hash__(self): return self._path.__hash__() @@ -45,7 +49,7 @@ index f8a8f88..a5da7b6 100644 def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=False, binary_output=False): if env_prune is None: -@@ -193,35 +217,23 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa +@@ -191,35 +215,23 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa stderr_dir = subprocess.STDOUT else: stderr_dir = subprocess.PIPE @@ -58,7 +62,7 @@ index f8a8f88..a5da7b6 100644 - preexec_fn=chroot, cwd=root, env=env) - - out, err = proc.communicate() -- if not binary_output and six.PY3: +- if not binary_output: - out = out.decode("utf-8") - if out: - if not stderr_to_stdout: @@ -85,7 +89,8 @@ index f8a8f88..a5da7b6 100644 + stderr=stderr_dir, + close_fds=True, + preexec_fn=chroot, cwd=root, env=env) -+ if not binary_output and six.PY3: ++ ++ if not binary_output: + out = out.decode("utf-8") + if out: + if not stderr_to_stdout: @@ -94,7 +99,6 @@ index f8a8f88..a5da7b6 100644 + program_log.info("%s", line) + + return (res, out) -+ def run_program(*args, **kwargs): diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet_3.9.2.bb b/meta-python/recipes-extended/python-blivet/python3-blivet_3.12.1.bb similarity index 93% rename from meta-python/recipes-extended/python-blivet/python3-blivet_3.9.2.bb rename to meta-python/recipes-extended/python-blivet/python3-blivet_3.12.1.bb index c22df46564..6a00e48ebb 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet_3.9.2.bb +++ b/meta-python/recipes-extended/python-blivet/python3-blivet_3.12.1.bb @@ -16,7 +16,7 @@ SRC_URI += "\ file://0010-invoking-mkfs-with-infinite-timeout.patch \ file://0011-invoking-dd-with-infinite-timeout.patch \ " -SRC_URI[sha256sum] = "9d97e37ebba01db28a1e6155cbd71c54fb55e9c2be5921982dc85bed316d8cfe" +SRC_URI[sha256sum] = "54775ba212d1574b1b0750ce147f0d3cf3b5d73aaf040d172283edb57db4ba15" inherit pypi features_check systemd setuptools3_legacy