mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-10 16:40:03 +00:00
Code Issues Projects Releases Wiki Activity

python3-blivet: upgrade 3.8.2 -> 3.9.1

Browse Source 
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>
This commit is contained in:
Wang Mingyu
2024-03-19 13:45:10 +08:00
committed by Khem Raj
parent 99b4f570ff
commit a6439a2179
9 changed files with 33 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch
+5 -8
View File
@@ -1,4 +1,4 @@
From 713cf821ebe17f9e1771502a85e0905ea04dafae Mon Sep 17 00:00:00 2001 From 8a18a6c1dea7cce6669d0eeb4230e85aa88d8e44 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com> From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Fri, 23 Nov 2018 17:03:58 +0800 Date: Fri, 23 Nov 2018 17:03:58 +0800
Subject: [PATCH 02/11] run_program support timeout Subject: [PATCH 02/11] run_program support timeout
@@ -7,14 +7,14 @@ Upstream-Status: Pending
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
--- ---
blivet/util.py | 70 ++++++++++++++++++++++++++++++++++------------------------ blivet/util.py | 70 +++++++++++++++++++++++++++++---------------------
1 file changed, 41 insertions(+), 29 deletions(-) 1 file changed, 41 insertions(+), 29 deletions(-)
diff --git a/blivet/util.py b/blivet/util.py diff --git a/blivet/util.py b/blivet/util.py
index 4eac8b9..4f05076 100644 index f8a8f88..a5da7b6 100644
--- a/blivet/util.py --- a/blivet/util.py
+++ b/blivet/util.py +++ b/blivet/util.py
@@ -158,6 +158,30 @@ class Path(str): @@ -171,6 +171,30 @@ class Path(str):
def __hash__(self): def __hash__(self):
return self._path.__hash__() return self._path.__hash__()
@@ -45,7 +45,7 @@ index 4eac8b9..4f05076 100644
def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=False, binary_output=False): def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=False, binary_output=False):
if env_prune is None: if env_prune is None:
@@ -180,35 +204,23 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa @@ -193,35 +217,23 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa
stderr_dir = subprocess.STDOUT stderr_dir = subprocess.STDOUT
else: else:
stderr_dir = subprocess.PIPE stderr_dir = subprocess.PIPE
@@ -98,6 +98,3 @@ index 4eac8b9..4f05076 100644
def run_program(*args, **kwargs): def run_program(*args, **kwargs):
--
2.7.4
meta-python/recipes-extended/python-blivet/python3-blivet/0003-support-infinit-timeout.patch
+7 -10
View File
@@ -1,4 +1,4 @@
From 5d5436dfa3bdde7b4e87ce5a40cbc724199847d6 Mon Sep 17 00:00:00 2001 From 112b825541f498762f373cfc9918e444dda74095 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com> From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Mon, 8 May 2017 16:18:02 +0800 Date: Mon, 8 May 2017 16:18:02 +0800
Subject: [PATCH 03/11] support infinit timeout Subject: [PATCH 03/11] support infinit timeout
@@ -11,10 +11,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
1 file changed, 8 insertions(+), 4 deletions(-) 1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/blivet/util.py b/blivet/util.py diff --git a/blivet/util.py b/blivet/util.py
index 4f05076..7e89949 100644 index a5da7b6..58117ae 100644
--- a/blivet/util.py --- a/blivet/util.py
+++ b/blivet/util.py +++ b/blivet/util.py
@@ -158,6 +158,7 @@ class Path(str): @@ -171,6 +171,7 @@ class Path(str):
def __hash__(self): def __hash__(self):
return self._path.__hash__() return self._path.__hash__()
@@ -22,7 +22,7 @@ index 4f05076..7e89949 100644
def timeout_command(argv, timeout, *args, **kwargs): def timeout_command(argv, timeout, *args, **kwargs):
"""call shell-command and either return its output or kill it """call shell-command and either return its output or kill it
if it doesn't normally exit within timeout seconds and return None""" if it doesn't normally exit within timeout seconds and return None"""
@@ -169,7 +170,7 @@ def timeout_command(argv, timeout, *args, **kwargs): @@ -182,7 +183,7 @@ def timeout_command(argv, timeout, *args, **kwargs):
while proc.poll() is None: while proc.poll() is None:
time.sleep(0.1) time.sleep(0.1)
now = datetime.datetime.now() now = datetime.datetime.now()
@@ -31,7 +31,7 @@ index 4f05076..7e89949 100644
os.kill(proc.pid, signal.SIGKILL) os.kill(proc.pid, signal.SIGKILL)
os.waitpid(-1, os.WNOHANG) os.waitpid(-1, os.WNOHANG)
program_log.debug("%d seconds timeout" % timeout) program_log.debug("%d seconds timeout" % timeout)
@@ -183,7 +184,7 @@ def timeout_command(argv, timeout, *args, **kwargs): @@ -196,7 +197,7 @@ def timeout_command(argv, timeout, *args, **kwargs):
program_log.debug("Return code: %d", proc.returncode) program_log.debug("Return code: %d", proc.returncode)
return (proc.returncode, proc.stdout.read()) return (proc.returncode, proc.stdout.read())
@@ -40,7 +40,7 @@ index 4f05076..7e89949 100644
if env_prune is None: if env_prune is None:
env_prune = [] env_prune = []
@@ -192,7 +193,10 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa @@ -205,7 +206,10 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa
os.chroot(root) os.chroot(root)
with program_log_lock: # pylint: disable=not-context-manager with program_log_lock: # pylint: disable=not-context-manager
@@ -52,7 +52,7 @@ index 4f05076..7e89949 100644
env = os.environ.copy() env = os.environ.copy()
env.update({"LC_ALL": "C", env.update({"LC_ALL": "C",
@@ -205,7 +209,7 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa @@ -218,7 +222,7 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa
else: else:
stderr_dir = subprocess.PIPE stderr_dir = subprocess.PIPE
@@ -61,6 +61,3 @@ index 4f05076..7e89949 100644
stdin=stdin, stdin=stdin,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=stderr_dir, stderr=stderr_dir,
--
2.7.4
meta-python/recipes-extended/python-blivet/python3-blivet/0005-fix-incorrect-timeout-while-system-time-changed.patch
+3 -6
View File
@@ -1,4 +1,4 @@
From f783b9b00da5df176fcd7927b752f574ca6db319 Mon Sep 17 00:00:00 2001 From c645c83628b2290855cbd225e13c038ab75a7f74 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com> From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Fri, 26 Aug 2016 02:02:49 -0400 Date: Fri, 26 Aug 2016 02:02:49 -0400
Subject: [PATCH 05/11] fix incorrect timeout while system time changed Subject: [PATCH 05/11] fix incorrect timeout while system time changed
@@ -22,10 +22,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
1 file changed, 3 insertions(+), 3 deletions(-) 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/blivet/util.py b/blivet/util.py diff --git a/blivet/util.py b/blivet/util.py
index 7e89949..5571e73 100644 index 58117ae..5bc5804 100644
--- a/blivet/util.py --- a/blivet/util.py
+++ b/blivet/util.py +++ b/blivet/util.py
@@ -163,14 +163,14 @@ def timeout_command(argv, timeout, *args, **kwargs): @@ -176,14 +176,14 @@ def timeout_command(argv, timeout, *args, **kwargs):
"""call shell-command and either return its output or kill it """call shell-command and either return its output or kill it
if it doesn't normally exit within timeout seconds and return None""" if it doesn't normally exit within timeout seconds and return None"""
import subprocess, datetime, os, time, signal import subprocess, datetime, os, time, signal
@@ -43,6 +43,3 @@ index 7e89949..5571e73 100644
os.kill(proc.pid, signal.SIGKILL) os.kill(proc.pid, signal.SIGKILL)
os.waitpid(-1, os.WNOHANG) os.waitpid(-1, os.WNOHANG)
program_log.debug("%d seconds timeout" % timeout) program_log.debug("%d seconds timeout" % timeout)
--
2.7.4
meta-python/recipes-extended/python-blivet/python3-blivet/0006-tweak-btrfs-packages.patch
+5 -8
View File
@@ -1,4 +1,4 @@
From 8932ae933f2b6acf5e98c9956beff69ae430eed2 Mon Sep 17 00:00:00 2001 From 359bc9f60a4bcf6be64a72c3825af65269f6c6c9 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com> From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Mon, 8 May 2017 16:33:15 +0800 Date: Mon, 8 May 2017 16:33:15 +0800
Subject: [PATCH 06/11] tweak btrfs packages Subject: [PATCH 06/11] tweak btrfs packages
@@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
2 files changed, 2 insertions(+), 2 deletions(-) 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py
index cada940..7e4d4b8 100644 index 259bcf8..8e4eb2b 100644
--- a/blivet/devices/btrfs.py --- a/blivet/devices/btrfs.py
+++ b/blivet/devices/btrfs.py +++ b/blivet/devices/btrfs.py
@@ -55,7 +55,7 @@ class BTRFSDevice(StorageDevice): @@ -57,7 +57,7 @@ class BTRFSDevice(StorageDevice):
""" Base class for BTRFS volume and sub-volume devices. """ """ Base class for BTRFS volume and sub-volume devices. """
_type = "btrfs" _type = "btrfs"
@@ -28,10 +28,10 @@ index cada940..7e4d4b8 100644
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py
index 81e367f..55e5d57 100644 index 932307a..865b863 100644
--- a/blivet/formats/fs.py --- a/blivet/formats/fs.py
+++ b/blivet/formats/fs.py +++ b/blivet/formats/fs.py
@@ -926,7 +926,7 @@ class BTRFS(FS): @@ -1049,7 +1049,7 @@ class BTRFS(FS):
_formattable = True _formattable = True
_linux_native = True _linux_native = True
_supported = True _supported = True
@@ -40,6 +40,3 @@ index 81e367f..55e5d57 100644
_min_size = Size("256 MiB") _min_size = Size("256 MiB")
_max_size = Size("16 EiB") _max_size = Size("16 EiB")
_mkfs_class = fsmkfs.BTRFSMkfs _mkfs_class = fsmkfs.BTRFSMkfs
--
2.7.4
meta-python/recipes-extended/python-blivet/python3-blivet/0007-invoking-mount-with-infinite-timeout.patch
+3 -6
View File
@@ -1,4 +1,4 @@
From f53481dc4a56b8a996628733553e080bb0aafdd7 Mon Sep 17 00:00:00 2001 From f159d71d742ace5640c7810bcc27365f8fde95a3 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com> From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Fri, 23 Nov 2018 17:07:22 +0800 Date: Fri, 23 Nov 2018 17:07:22 +0800
Subject: [PATCH 07/11] invoking mount with infinite timeout Subject: [PATCH 07/11] invoking mount with infinite timeout
@@ -14,10 +14,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/blivet/util.py b/blivet/util.py diff --git a/blivet/util.py b/blivet/util.py
index 5571e73..02c8033 100644 index 5bc5804..9de77e1 100644
--- a/blivet/util.py --- a/blivet/util.py
+++ b/blivet/util.py +++ b/blivet/util.py
@@ -258,7 +258,7 @@ def mount(device, mountpoint, fstype, options=None): @@ -271,7 +271,7 @@ def mount(device, mountpoint, fstype, options=None):
makedirs(mountpoint) makedirs(mountpoint)
argv = ["mount", "-t", fstype, "-o", options, device, mountpoint] argv = ["mount", "-t", fstype, "-o", options, device, mountpoint]
@@ -26,6 +26,3 @@ index 5571e73..02c8033 100644
def umount(mountpoint): def umount(mountpoint):
--
2.7.4
meta-python/recipes-extended/python-blivet/python3-blivet/0008-use-oe-variable-to-replace-hardcoded-dir.patch
+3 -6
View File
@@ -1,4 +1,4 @@
From 12e2579333258d1a690f8718e91b0f217078e886 Mon Sep 17 00:00:00 2001 From 6a85945c060154581f5a129a6a946258bf9333c4 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com> From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Mon, 8 May 2017 03:54:12 -0400 Date: Mon, 8 May 2017 03:54:12 -0400
Subject: [PATCH 08/11] use oe variable to replace hardcoded dir Subject: [PATCH 08/11] use oe variable to replace hardcoded dir
@@ -15,10 +15,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
1 file changed, 4 insertions(+), 4 deletions(-) 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/setup.py b/setup.py diff --git a/setup.py b/setup.py
index b745a79..b5b4258 100644 index e6bb3f3..700085b 100644
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -61,10 +61,10 @@ class blivet_sdist(sdist): @@ -73,10 +73,10 @@ class blivet_sdist(sdist):
data_files = [ data_files = [
@@ -33,6 +33,3 @@ index b745a79..b5b4258 100644
] ]
--
2.7.4
meta-python/recipes-extended/python-blivet/python3-blivet/0010-invoking-mkfs-with-infinite-timeout.patch
+3 -6
View File
@@ -1,4 +1,4 @@
From 33844f6773a676bd57240954e402ae9a843663a4 Mon Sep 17 00:00:00 2001 From abadd821acffd5dbc870f86dad3c3a6bf3f2f74f Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com> From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Fri, 16 Jun 2017 15:43:00 +0800 Date: Fri, 16 Jun 2017 15:43:00 +0800
Subject: [PATCH 10/11] invoking mkfs with infinite timeout Subject: [PATCH 10/11] invoking mkfs with infinite timeout
@@ -18,10 +18,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/blivet/tasks/fsmkfs.py b/blivet/tasks/fsmkfs.py diff --git a/blivet/tasks/fsmkfs.py b/blivet/tasks/fsmkfs.py
index e4a6aaa8..9730f7e5 100644 index e9daa9e..2174cc3 100644
--- a/blivet/tasks/fsmkfs.py --- a/blivet/tasks/fsmkfs.py
+++ b/blivet/tasks/fsmkfs.py +++ b/blivet/tasks/fsmkfs.py
@@ -203,7 +203,7 @@ class FSMkfs(task.BasicApplication, FSMkfsTask): @@ -207,7 +207,7 @@ class FSMkfs(task.BasicApplication, FSMkfsTask):
options = options or [] options = options or []
cmd = self._mkfs_command(options, label, set_uuid, nodiscard) cmd = self._mkfs_command(options, label, set_uuid, nodiscard)
try: try:
@@ -30,6 +30,3 @@ index e4a6aaa8..9730f7e5 100644
except OSError as e: except OSError as e:
raise FSError(e) raise FSError(e)
--
2.7.4
meta-python/recipes-extended/python-blivet/python3-blivet/0011-invoking-dd-with-infinite-timeout.patch
+3 -6
View File
@@ -1,4 +1,4 @@
From 21ca2b859a49e96a230d55a7866dfc7ed5d1366c Mon Sep 17 00:00:00 2001 From 3d398173f02bb641473299abb1166fdcc3643666 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com> From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Tue, 6 Mar 2018 17:28:56 +0800 Date: Tue, 6 Mar 2018 17:28:56 +0800
Subject: [PATCH 11/11] invoking dd with infinite timeout Subject: [PATCH 11/11] invoking dd with infinite timeout
@@ -14,10 +14,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/blivet/devices/partition.py b/blivet/devices/partition.py diff --git a/blivet/devices/partition.py b/blivet/devices/partition.py
index 623e1c9..141d8ad 100644 index b60b9b4..fa8858b 100644
--- a/blivet/devices/partition.py --- a/blivet/devices/partition.py
+++ b/blivet/devices/partition.py +++ b/blivet/devices/partition.py
@@ -618,7 +618,7 @@ class PartitionDevice(StorageDevice): @@ -667,7 +667,7 @@ class PartitionDevice(StorageDevice):
cmd = ["dd", "if=/dev/zero", "of=%s" % device, "bs=%d" % bs, cmd = ["dd", "if=/dev/zero", "of=%s" % device, "bs=%d" % bs,
"seek=%d" % start, "count=%d" % count] "seek=%d" % start, "count=%d" % count]
try: try:
@@ -26,6 +26,3 @@ index 623e1c9..141d8ad 100644
except OSError as e: except OSError as e:
log.error(str(e)) log.error(str(e))
finally: finally:
--
2.7.4
meta-python/recipes-extended/python-blivet/python3-blivet_3.8.2.bb → meta-python/recipes-extended/python-blivet/python3-blivet_3.9.1.bb
+1 -1
View File
@@ -16,7 +16,7 @@ SRC_URI += "\
file://0010-invoking-mkfs-with-infinite-timeout.patch \ file://0010-invoking-mkfs-with-infinite-timeout.patch \
file://0011-invoking-dd-with-infinite-timeout.patch \ file://0011-invoking-dd-with-infinite-timeout.patch \
" "
SRC_URI[sha256sum] = "88d1500c76c4660aec7da9e9aa54f7f574546571b52c07a67e1417883c2cb25b" SRC_URI[sha256sum] = "fda09ac9ddbbacbb0c00e867006cf36b213b8f5707accdfaaebfd27378f362d8"
inherit pypi features_check systemd setuptools3_legacy inherit pypi features_check systemd setuptools3_legacy