3 files changed, 15 insertions, 12 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 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 <hongxu.jia@windriver.com>
+
+Rebase for blivet 3.12.1.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
 ---
- 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
index f0ce981480..bf492b3d57 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
@@ -1,5 +1,5 @@
 DESCRIPTION = "A python module for system storage configuration"
-HOMEPAGE = "http://fedoraproject.org/wiki/blivet"
+HOMEPAGE = "https://fedoraproject.org/wiki/blivet"
 LICENSE = "LGPL-2.0-or-later"
 SECTION = "devel/python"
 
@@ -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
 
@@ -24,7 +24,7 @@ REQUIRED_DISTRO_FEATURES = "systemd"
 
 RDEPENDS:${PN} += "python3-pykickstart python3-pyudev \
                    parted python3-pyparted multipath-tools \
-                   lsof cryptsetup libblockdev \
+                   lsof cryptsetup libblockdev libblockdev-bin \
                    libbytesize \
 "
 
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.5.0.bb b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.6.0.bb
index 124f36c6e0..79bee63d08 100644
--- a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.5.0.bb
+++ b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.6.0.bb
@@ -6,9 +6,8 @@ SECTION = "devel/python"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://github.com/storaged-project/blivet-gui.git;branch=main;protocol=https"
-SRCREV = "626b44610a30ad26734dd20642538caab5a9178a"
+SRCREV = "7cec4bd48af4c8f7beb1a74bac751c3d520dedf1"
 
-S = "${WORKDIR}/git"
 
 inherit features_check setuptools3
 REQUIRED_DISTRO_FEATURES = "x11 systemd gobject-introspection-data"