From 88efe3c0ea78196b53d0c6606887b9cf72ca632c Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Tue, 3 Aug 2021 14:13:38 +0800 Subject: python3-blivet: 3.1.4 -> 3.4.0 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 Signed-off-by: Khem Raj Signed-off-by: Trevor Gamblin --- .../0010-invoking-mkfs-with-infinite-timeout.patch | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'meta-python/recipes-extended/python-blivet/python3-blivet/0010-invoking-mkfs-with-infinite-timeout.patch') diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0010-invoking-mkfs-with-infinite-timeout.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0010-invoking-mkfs-with-infinite-timeout.patch index f128490458..c441acd173 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0010-invoking-mkfs-with-infinite-timeout.patch +++ b/meta-python/recipes-extended/python-blivet/python3-blivet/0010-invoking-mkfs-with-infinite-timeout.patch @@ -9,17 +9,21 @@ lots of disks, or with slow disks. Upstream-Status: Pending Signed-off-by: Hongxu Jia + +Rebase for python3-blivet 3.4.0. + +Signed-off-by: Kai Kang --- 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 ad166aa..7bf5075 100644 +index e4a6aaa8..9730f7e5 100644 --- a/blivet/tasks/fsmkfs.py +++ b/blivet/tasks/fsmkfs.py -@@ -170,7 +170,7 @@ class FSMkfs(task.BasicApplication, FSMkfsTask): +@@ -203,7 +203,7 @@ class FSMkfs(task.BasicApplication, FSMkfsTask): options = options or [] - cmd = self._mkfs_command(options, label, set_uuid) + cmd = self._mkfs_command(options, label, set_uuid, nodiscard) try: - ret = util.run_program(cmd) + ret = util.run_program(cmd, timeout=-1) -- cgit v1.2.3-54-g00ecf