mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-07-19 15:29:08 +02:00
88efe3c0ea
Upgrade python3-blivet from 3.1.4 to 3.4.0. * it imports selinux conditionally, so remove 0001-comment-out-selinux.patch * rebase 0008-use-oe-variable-to-replace-hardcoded-dir.patch and 0010-invoking-mkfs-with-infinite-timeout.patch Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
36 lines
1.0 KiB
Diff
36 lines
1.0 KiB
Diff
From 33844f6773a676bd57240954e402ae9a843663a4 Mon Sep 17 00:00:00 2001
|
|
From: Hongxu Jia <hongxu.jia@windriver.com>
|
|
Date: Fri, 16 Jun 2017 15:43:00 +0800
|
|
Subject: [PATCH 10/11] invoking mkfs with infinite timeout
|
|
|
|
This large timeout is needed when running on machines with
|
|
lots of disks, or with slow disks.
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
|
|
|
Rebase for python3-blivet 3.4.0.
|
|
|
|
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
|
---
|
|
blivet/tasks/fsmkfs.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/blivet/tasks/fsmkfs.py b/blivet/tasks/fsmkfs.py
|
|
index e4a6aaa8..9730f7e5 100644
|
|
--- a/blivet/tasks/fsmkfs.py
|
|
+++ b/blivet/tasks/fsmkfs.py
|
|
@@ -203,7 +203,7 @@ class FSMkfs(task.BasicApplication, FSMkfsTask):
|
|
options = options or []
|
|
cmd = self._mkfs_command(options, label, set_uuid, nodiscard)
|
|
try:
|
|
- ret = util.run_program(cmd)
|
|
+ ret = util.run_program(cmd, timeout=-1)
|
|
except OSError as e:
|
|
raise FSError(e)
|
|
|
|
--
|
|
2.7.4
|
|
|