diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2024-03-19 13:45:10 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-03-20 09:28:07 -0700 |
commit | a6439a2179f8b6d514bc00f14f76ae71ea3bb5f0 (patch) | |
tree | a1262d9be6d5e6fff26c16422a0570a79e0adee2 /meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch | |
parent | 99b4f570ff7da277c407a86ad809086d433e813b (diff) | |
download | meta-openembedded-a6439a2179f8b6d514bc00f14f76ae71ea3bb5f0.tar.gz |
python3-blivet: upgrade 3.8.2 -> 3.9.1
0002-run_program-support-timeout.patch
0003-support-infinit-timeout.patch
0005-fix-incorrect-timeout-while-system-time-changed.patch
0006-tweak-btrfs-packages.patch
0007-invoking-mount-with-infinite-timeout.patch
0008-use-oe-variable-to-replace-hardcoded-dir.patch
0010-invoking-mkfs-with-infinite-timeout.patch
0011-invoking-dd-with-infinite-timeout.patch
refreshed for 3.9.1
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch')
-rw-r--r-- | meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch | 13 |
1 files changed, 5 insertions, 8 deletions
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 5b388599bf..d277e8b0f7 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 713cf821ebe17f9e1771502a85e0905ea04dafae Mon Sep 17 00:00:00 2001 | 1 | From 8a18a6c1dea7cce6669d0eeb4230e85aa88d8e44 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Fri, 23 Nov 2018 17:03:58 +0800 | 3 | Date: Fri, 23 Nov 2018 17:03:58 +0800 |
4 | Subject: [PATCH 02/11] run_program support timeout | 4 | Subject: [PATCH 02/11] run_program support timeout |
@@ -7,14 +7,14 @@ Upstream-Status: Pending | |||
7 | 7 | ||
8 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 8 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
9 | --- | 9 | --- |
10 | blivet/util.py | 70 ++++++++++++++++++++++++++++++++++------------------------ | 10 | blivet/util.py | 70 +++++++++++++++++++++++++++++--------------------- |
11 | 1 file changed, 41 insertions(+), 29 deletions(-) | 11 | 1 file changed, 41 insertions(+), 29 deletions(-) |
12 | 12 | ||
13 | diff --git a/blivet/util.py b/blivet/util.py | 13 | diff --git a/blivet/util.py b/blivet/util.py |
14 | index 4eac8b9..4f05076 100644 | 14 | index f8a8f88..a5da7b6 100644 |
15 | --- a/blivet/util.py | 15 | --- a/blivet/util.py |
16 | +++ b/blivet/util.py | 16 | +++ b/blivet/util.py |
17 | @@ -158,6 +158,30 @@ class Path(str): | 17 | @@ -171,6 +171,30 @@ class Path(str): |
18 | def __hash__(self): | 18 | def __hash__(self): |
19 | return self._path.__hash__() | 19 | return self._path.__hash__() |
20 | 20 | ||
@@ -45,7 +45,7 @@ index 4eac8b9..4f05076 100644 | |||
45 | 45 | ||
46 | def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=False, binary_output=False): | 46 | def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=False, binary_output=False): |
47 | if env_prune is None: | 47 | if env_prune is None: |
48 | @@ -180,35 +204,23 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa | 48 | @@ -193,35 +217,23 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa |
49 | stderr_dir = subprocess.STDOUT | 49 | stderr_dir = subprocess.STDOUT |
50 | else: | 50 | else: |
51 | stderr_dir = subprocess.PIPE | 51 | stderr_dir = subprocess.PIPE |
@@ -98,6 +98,3 @@ index 4eac8b9..4f05076 100644 | |||
98 | 98 | ||
99 | 99 | ||
100 | def run_program(*args, **kwargs): | 100 | def run_program(*args, **kwargs): |
101 | -- | ||
102 | 2.7.4 | ||
103 | |||