diff options
Diffstat (limited to 'meta-python/recipes-extended/python-blivet')
18 files changed, 122 insertions, 373 deletions
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch deleted file mode 100644 index 0ee32057cb..0000000000 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 7d483c27ac0a23ca3bba7f320918afc40013bd8e Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Mon, 8 May 2017 14:25:52 +0800 -Subject: [PATCH 01/13] comment out selinux - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - blivet/flags.py | 5 +++-- - blivet/util.py | 6 +++++- - 2 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/blivet/flags.py b/blivet/flags.py -index 06822db..b55a93f 100644 ---- a/blivet/flags.py -+++ b/blivet/flags.py -@@ -20,7 +20,7 @@ - # - - import shlex --import selinux -+#import selinux - - - class Flags(object): -@@ -49,7 +49,8 @@ class Flags(object): - # - # enable/disable functionality - # -- self.selinux = selinux.is_selinux_enabled() -+ #self.selinux = selinux.is_selinux_enabled() -+ self.selinux = False - self.multipath = True - self.dmraid = True - self.ibft = True -diff --git a/blivet/util.py b/blivet/util.py -index e3e71ce..0cf5188 100644 ---- a/blivet/util.py -+++ b/blivet/util.py -@@ -4,7 +4,7 @@ import glob - import itertools - import os - import shutil --import selinux -+#import selinux - import subprocess - import re - import sys -@@ -431,6 +431,8 @@ def get_cow_sysfs_path(dev_path, dev_sysfsPath): - def match_path_context(path): - """ Return the default SELinux context for the given path. """ - context = None -+ return context -+ - try: - context = selinux.matchpathcon(os.path.normpath(path), 0)[1] - except OSError as e: -@@ -455,6 +457,8 @@ def set_file_context(path, context, root=None): - - True if successful, False if not. - """ -+ return False -+ - if root is None: - root = '/' - --- -2.7.4 - 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 01e71be304..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,20 +1,20 @@ -From 86744d408b91acdcb086a03d7779fcda152f2ac3 Mon Sep 17 00:00:00 2001 +From 8a18a6c1dea7cce6669d0eeb4230e85aa88d8e44 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Mon, 8 May 2017 14:39:56 +0800 -Subject: [PATCH 02/13] run_program support timeout +Date: Fri, 23 Nov 2018 17:03:58 +0800 +Subject: [PATCH 02/11] run_program support timeout Upstream-Status: Pending Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - blivet/util.py | 68 +++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 39 insertions(+), 29 deletions(-) + blivet/util.py | 70 +++++++++++++++++++++++++++++--------------------- + 1 file changed, 41 insertions(+), 29 deletions(-) diff --git a/blivet/util.py b/blivet/util.py -index 0cf5188..d4bd9bb 100644 +index f8a8f88..a5da7b6 100644 --- a/blivet/util.py +++ b/blivet/util.py -@@ -158,6 +158,30 @@ class Path(str): +@@ -171,6 +171,30 @@ class Path(str): def __hash__(self): return self._path.__hash__() @@ -45,12 +45,12 @@ index 0cf5188..d4bd9bb 100644 def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=False, binary_output=False): if env_prune is None: -@@ -180,36 +204,22 @@ 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 else: stderr_dir = subprocess.PIPE - try: -- proc = subprocess.Popen(argv, +- proc = subprocess.Popen(argv, # pylint: disable=subprocess-popen-preexec-fn - stdin=stdin, - stdout=subprocess.PIPE, - stderr=stderr_dir, @@ -78,7 +78,7 @@ index 0cf5188..d4bd9bb 100644 - program_log.debug("Return code: %d", proc.returncode) - - return (proc.returncode, out) - ++ + res, out = timeout_command(argv, 10, + stdin=stdin, + stdout=subprocess.PIPE, @@ -94,9 +94,7 @@ index 0cf5188..d4bd9bb 100644 + program_log.info("%s", line) + + return (res, out) ++ + def run_program(*args, **kwargs): - return _run_program(*args, **kwargs)[0] --- -2.7.4 - diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0003-support-infinit-timeout.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0003-support-infinit-timeout.patch index 489fb56bb3..8ab65a3e22 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0003-support-infinit-timeout.patch +++ b/meta-python/recipes-extended/python-blivet/python3-blivet/0003-support-infinit-timeout.patch @@ -1,7 +1,7 @@ -From 923265e04df5920fc99393aa05f584032aa1b383 Mon Sep 17 00:00:00 2001 +From 112b825541f498762f373cfc9918e444dda74095 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Mon, 8 May 2017 16:18:02 +0800 -Subject: [PATCH 03/13] support infinit timeout +Subject: [PATCH 03/11] support infinit timeout Upstream-Status: Pending @@ -11,10 +11,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/blivet/util.py b/blivet/util.py -index d4bd9bb..44a2da5 100644 +index a5da7b6..58117ae 100644 --- a/blivet/util.py +++ b/blivet/util.py -@@ -158,6 +158,7 @@ class Path(str): +@@ -171,6 +171,7 @@ class Path(str): def __hash__(self): return self._path.__hash__() @@ -22,7 +22,7 @@ index d4bd9bb..44a2da5 100644 def timeout_command(argv, timeout, *args, **kwargs): """call shell-command and either return its output or kill it 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: time.sleep(0.1) now = datetime.datetime.now() @@ -31,7 +31,7 @@ index d4bd9bb..44a2da5 100644 os.kill(proc.pid, signal.SIGKILL) os.waitpid(-1, os.WNOHANG) 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) return (proc.returncode, proc.stdout.read()) @@ -40,7 +40,7 @@ index d4bd9bb..44a2da5 100644 if env_prune is None: 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) with program_log_lock: # pylint: disable=not-context-manager @@ -52,7 +52,7 @@ index d4bd9bb..44a2da5 100644 env = os.environ.copy() 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: stderr_dir = subprocess.PIPE @@ -61,6 +61,3 @@ index d4bd9bb..44a2da5 100644 stdin=stdin, stdout=subprocess.PIPE, stderr=stderr_dir, --- -2.7.4 - diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0004-Mount-var-volatile-during-install.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0004-Mount-var-volatile-during-install.patch deleted file mode 100644 index cb837e2863..0000000000 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0004-Mount-var-volatile-during-install.patch +++ /dev/null @@ -1,59 +0,0 @@ -From c3959bd00665e24a955bbdbea1ef555e76372f12 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Mon, 8 May 2017 16:25:16 +0800 -Subject: [PATCH 04/13] Mount /var/volatile during install - -The installed system needs /var/volatile clean, otherwise it -caused systemd's journalctl failed to record boot log. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - blivet/osinstall.py | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/blivet/osinstall.py b/blivet/osinstall.py -index a4f9535..61819c2 100644 ---- a/blivet/osinstall.py -+++ b/blivet/osinstall.py -@@ -294,6 +294,7 @@ class FSSet(object): - self._sysfs = None - self._proc = None - self._devshm = None -+ self._volatile = None - self._usb = None - self._selinux = None - self._run = None -@@ -335,6 +336,12 @@ class FSSet(object): - return self._devshm - - @property -+ def volatile(self): -+ if not self._volatile: -+ self._volatile = NoDevice(fmt=get_format("tmpfs", device="tmpfs", mountpoint="/var/volatile")) -+ return self._volatile -+ -+ @property - def usb(self): - if not self._usb: - self._usb = NoDevice(fmt=get_format("usbfs", device="usbfs", mountpoint="/proc/bus/usb")) -@@ -591,6 +598,7 @@ class FSSet(object): - - devices = list(self.mountpoints.values()) + self.swap_devices - devices.extend([self.dev, self.devshm, self.devpts, self.sysfs, -+ self.volatile, - self.proc, self.selinux, self.usb, self.run]) - if isinstance(_platform, EFI): - devices.append(self.efivars) -@@ -650,6 +658,7 @@ class FSSet(object): - """ unmount filesystems, except swap if swapoff == False """ - devices = list(self.mountpoints.values()) + self.swap_devices - devices.extend([self.dev, self.devshm, self.devpts, self.sysfs, -+ self.volatile, - self.proc, self.usb, self.selinux, self.run]) - if isinstance(_platform, EFI): - devices.append(self.efivars) --- -2.7.4 - diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0007-fix-incorrect-timeout-while-system-time-changed.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0005-fix-incorrect-timeout-while-system-time-changed.patch index 6512d8642a..795e4f1206 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0007-fix-incorrect-timeout-while-system-time-changed.patch +++ b/meta-python/recipes-extended/python-blivet/python3-blivet/0005-fix-incorrect-timeout-while-system-time-changed.patch @@ -1,7 +1,7 @@ -From 78ee2b9090f9400ccc4f730e674f5ae972740ccb Mon Sep 17 00:00:00 2001 +From c645c83628b2290855cbd225e13c038ab75a7f74 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Fri, 26 Aug 2016 02:02:49 -0400 -Subject: [PATCH 07/13] fix incorrect timeout while system time changed +Subject: [PATCH 05/11] fix incorrect timeout while system time changed While system time changed by NTP, invoking timeout_command breaks with incorrect timeout. @@ -22,10 +22,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blivet/util.py b/blivet/util.py -index 44a2da5..b3c45ac 100644 +index 58117ae..5bc5804 100644 --- a/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 if it doesn't normally exit within timeout seconds and return None""" import subprocess, datetime, os, time, signal @@ -43,6 +43,3 @@ index 44a2da5..b3c45ac 100644 os.kill(proc.pid, signal.SIGKILL) os.waitpid(-1, os.WNOHANG) program_log.debug("%d seconds timeout" % timeout) --- -2.7.4 - diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0005-update-fstab-by-appending.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0005-update-fstab-by-appending.patch deleted file mode 100644 index 4f343b7d83..0000000000 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0005-update-fstab-by-appending.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 386ff899763f8473eb93a7a1578fb7cc4f86f66d Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Mon, 8 May 2017 16:28:12 +0800 -Subject: [PATCH 05/13] update fstab by appending - -The 'storage.write()' has updated fstab by overwriting -the original one, we should update fstab by appending -to keep original tmpfs partitions. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - blivet/osinstall.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/blivet/osinstall.py b/blivet/osinstall.py -index 61819c2..afa82db 100644 ---- a/blivet/osinstall.py -+++ b/blivet/osinstall.py -@@ -728,7 +728,7 @@ class FSSet(object): - # /etc/fstab - fstab_path = os.path.normpath("%s/etc/fstab" % get_sysroot()) - fstab = self.fstab() -- open(fstab_path, "w").write(fstab) -+ open(fstab_path, "a").write(fstab) - - # /etc/crypttab - crypttab_path = os.path.normpath("%s/etc/crypttab" % get_sysroot()) --- -2.7.4 - diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0006-fix-new.roots-object-is-not-iterable.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0006-fix-new.roots-object-is-not-iterable.patch deleted file mode 100644 index f5ff754d8d..0000000000 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0006-fix-new.roots-object-is-not-iterable.patch +++ /dev/null @@ -1,28 +0,0 @@ -From cd92eea8fab37ba6b0c7f03daa5255343dc75716 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Mon, 8 May 2017 16:30:20 +0800 -Subject: [PATCH 06/13] fix new.roots object is not iterable - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - blivet/blivet.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/blivet/blivet.py b/blivet/blivet.py -index 6a33e9c..79ae91a 100644 ---- a/blivet/blivet.py -+++ b/blivet/blivet.py -@@ -1761,7 +1761,7 @@ class Blivet(object): - p = partition.disk.format.parted_disk.getPartitionByPath(partition.path) - partition.parted_partition = p - -- for root in new.roots: -+ for root in new.roots or []: - root.swaps = [new.devicetree.get_device_by_id(d.id, hidden=True) for d in root.swaps] - root.swaps = [s for s in root.swaps if s] - --- -2.7.4 - diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0008-tweak-btrfs-packages.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0006-tweak-btrfs-packages.patch index 121336e4c3..6c53f03db1 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0008-tweak-btrfs-packages.patch +++ b/meta-python/recipes-extended/python-blivet/python3-blivet/0006-tweak-btrfs-packages.patch @@ -1,7 +1,7 @@ -From 6f661a511eea096c073888c7adb836a9a880b476 Mon Sep 17 00:00:00 2001 +From b55b1023f8f1ad3121928eb9d0ee9902f5474752 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Mon, 8 May 2017 16:33:15 +0800 -Subject: [PATCH 08/13] tweak btrfs packages +Subject: [PATCH] tweak btrfs packages In oe-cre/yocto, we name btrfs package with btrfs-tools, rather than btrfs-progs. @@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py -index c5cb21f..9d417b2 100644 +index c446e7e..37c183e 100644 --- a/blivet/devices/btrfs.py +++ b/blivet/devices/btrfs.py -@@ -55,7 +55,7 @@ class BTRFSDevice(StorageDevice): +@@ -58,7 +58,7 @@ class BTRFSDevice(StorageDevice): """ Base class for BTRFS volume and sub-volume devices. """ _type = "btrfs" @@ -28,10 +28,10 @@ index c5cb21f..9d417b2 100644 def __init__(self, *args, **kwargs): diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py -index a49826f..e8f216d 100644 +index 1e102b6..f16941e 100644 --- a/blivet/formats/fs.py +++ b/blivet/formats/fs.py -@@ -918,7 +918,7 @@ class BTRFS(FS): +@@ -1050,7 +1050,7 @@ class BTRFS(FS): _formattable = True _linux_native = True _supported = True @@ -40,6 +40,3 @@ index a49826f..e8f216d 100644 _min_size = Size("256 MiB") _max_size = Size("16 EiB") _mkfs_class = fsmkfs.BTRFSMkfs --- -2.7.4 - diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0009-invoking-mount-with-infinite-timeout.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0007-invoking-mount-with-infinite-timeout.patch index fc084b1295..809f4e1584 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0009-invoking-mount-with-infinite-timeout.patch +++ b/meta-python/recipes-extended/python-blivet/python3-blivet/0007-invoking-mount-with-infinite-timeout.patch @@ -1,7 +1,7 @@ -From a6ac2157ee6793302e23ddbc5e3b249fa7da5b7e Mon Sep 17 00:00:00 2001 +From f159d71d742ace5640c7810bcc27365f8fde95a3 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 31 Aug 2016 21:30:32 -0400 -Subject: [PATCH 09/13] invoking mount with infinite timeout +Date: Fri, 23 Nov 2018 17:07:22 +0800 +Subject: [PATCH 07/11] invoking mount with infinite timeout This large timeout is needed when running on machines with lots of disks, or with slow disks. @@ -14,18 +14,15 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blivet/util.py b/blivet/util.py -index b3c45ac..9f02b18 100644 +index 5bc5804..9de77e1 100644 --- a/blivet/util.py +++ b/blivet/util.py -@@ -257,7 +257,7 @@ def mount(device, mountpoint, fstype, options=None): +@@ -271,7 +271,7 @@ def mount(device, mountpoint, fstype, options=None): + makedirs(mountpoint) argv = ["mount", "-t", fstype, "-o", options, device, mountpoint] - try: -- rc = run_program(argv) -+ rc = run_program(argv, timeout=-1) - except OSError: - raise +- return run_program(argv) ++ return run_program(argv, timeout=-1) --- -2.7.4 - + + def umount(mountpoint): diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0010-use-oe-variable-to-replace-hardcoded-dir.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0008-use-oe-variable-to-replace-hardcoded-dir.patch index 45d8fabba6..d3ab8f8526 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0010-use-oe-variable-to-replace-hardcoded-dir.patch +++ b/meta-python/recipes-extended/python-blivet/python3-blivet/0008-use-oe-variable-to-replace-hardcoded-dir.patch @@ -1,34 +1,35 @@ -From e07133dbcf3c52e1ddd2f12797dcd16145269273 Mon Sep 17 00:00:00 2001 +From 6a85945c060154581f5a129a6a946258bf9333c4 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Mon, 8 May 2017 03:54:12 -0400 -Subject: [PATCH 10/13] use oe variable to replace hardcoded dir +Subject: [PATCH 08/11] use oe variable to replace hardcoded dir 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> --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index 4d06a33..a994d06 100644 +index e6bb3f3..700085b 100644 --- a/setup.py +++ b/setup.py -@@ -61,10 +61,10 @@ class blivet_sdist(sdist): +@@ -73,10 +73,10 @@ class blivet_sdist(sdist): data_files = [ - ('/etc/dbus-1/system.d', ['dbus/blivet.conf']), -- ('/usr/share/dbus-1/system-services', ['dbus/com.redhat.Blivet1.service']), +- ('/usr/share/dbus-1/system-services', ['dbus/com.redhat.Blivet0.service']), - ('/usr/libexec', ['dbus/blivetd']), - ('/usr/lib/systemd/system', ['dbus/blivet.service']) + (os.environ.get('sysconfdir')+'/dbus-1/system.d', ['dbus/blivet.conf']), -+ (os.environ.get('datadir')+'/dbus-1/system-services', ['dbus/com.redhat.Blivet1.service']), ++ (os.environ.get('datadir')+'/dbus-1/system-services', ['dbus/com.redhat.Blivet0.service']), + (os.environ.get('libexecdir'), ['dbus/blivetd']), + (os.environ.get('systemd_system_unitdir'), ['dbus/blivet.service']) ] --- -2.7.4 - diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0011-invoking-fsck-with-infinite-timeout.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0009-invoking-fsck-with-infinite-timeout.patch index c61fe01b94..f4778779b6 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0011-invoking-fsck-with-infinite-timeout.patch +++ b/meta-python/recipes-extended/python-blivet/python3-blivet/0009-invoking-fsck-with-infinite-timeout.patch @@ -1,7 +1,7 @@ -From e9ab4376a18cc1bd413c000b036320833eec80d7 Mon Sep 17 00:00:00 2001 +From 9624b6d0dda40aaecbaf9530be819943575a2ec6 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Thu, 1 Jun 2017 16:05:27 +0800 -Subject: [PATCH 11/13] invoking fsck with infinite timeout +Subject: [PATCH 09/11] invoking fsck with infinite timeout This large timeout is needed when running on machines with lots of disks, or with slow disks. @@ -14,7 +14,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blivet/tasks/fsck.py b/blivet/tasks/fsck.py -index c4214dc..e13ac6b 100644 +index 5274f13..6e074c4 100644 --- a/blivet/tasks/fsck.py +++ b/blivet/tasks/fsck.py @@ -77,7 +77,7 @@ class FSCK(task.BasicApplication, fstask.FSTask): diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0012-invoking-mkfs-with-infinite-timeout.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0010-invoking-mkfs-with-infinite-timeout.patch index 33bdbe8125..394a818aa2 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0012-invoking-mkfs-with-infinite-timeout.patch +++ b/meta-python/recipes-extended/python-blivet/python3-blivet/0010-invoking-mkfs-with-infinite-timeout.patch @@ -1,7 +1,7 @@ -From 9f5a048181cf29d241d96814e736b8235b3d42b1 Mon Sep 17 00:00:00 2001 +From abadd821acffd5dbc870f86dad3c3a6bf3f2f74f 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 12/13] invoking mkfs with infinite timeout +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. @@ -9,23 +9,24 @@ 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 ad166aa..7bf5075 100644 +index e9daa9e..2174cc3 100644 --- a/blivet/tasks/fsmkfs.py +++ b/blivet/tasks/fsmkfs.py -@@ -170,7 +170,7 @@ class FSMkfs(task.BasicApplication, FSMkfsTask): +@@ -207,7 +207,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) except OSError as e: raise FSError(e) --- -2.7.4 - diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0014-invoking-dd-with-infinite-timeout.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0011-invoking-dd-with-infinite-timeout.patch index 12a9e4f544..ea4cffa9b3 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0014-invoking-dd-with-infinite-timeout.patch +++ b/meta-python/recipes-extended/python-blivet/python3-blivet/0011-invoking-dd-with-infinite-timeout.patch @@ -1,4 +1,4 @@ -From 92fe7dfd01131c93a9b2013cabf77d5f46900fab Mon Sep 17 00:00:00 2001 +From 5ee527fab06f9d33b162a6cd0c068d7b3ac2ecb0 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 6 Mar 2018 17:28:56 +0800 Subject: [PATCH] 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(-) diff --git a/blivet/devices/partition.py b/blivet/devices/partition.py -index a7372fb..8947472 100644 +index 2d67be8..a4cf9a0 100644 --- a/blivet/devices/partition.py +++ b/blivet/devices/partition.py -@@ -594,7 +594,7 @@ class PartitionDevice(StorageDevice): +@@ -677,7 +677,7 @@ class PartitionDevice(StorageDevice): cmd = ["dd", "if=/dev/zero", "of=%s" % device, "bs=%d" % bs, "seek=%d" % start, "count=%d" % count] try: @@ -26,6 +26,3 @@ index a7372fb..8947472 100644 except OSError as e: log.error(str(e)) finally: --- -1.8.3.1 - diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0013-Revert-Adapt-to-logging-module-name-change.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0013-Revert-Adapt-to-logging-module-name-change.patch deleted file mode 100644 index 6bdf4ce949..0000000000 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0013-Revert-Adapt-to-logging-module-name-change.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bfdaf79a2109ac6aed408f0c94f69766991e60e2 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 27 Jul 2017 14:34:30 +0800 -Subject: [PATCH 13/13] Revert "Adapt to logging module name change" - -Upstream-Status: Inappropriate [oe specific, sync with anaconda f26-release] - -This reverts commit c367d62a516e541ad28636c8259321f1c53417ce. - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - blivet/__init__.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/blivet/__init__.py b/blivet/__init__.py -index 49277cb..a01e487 100644 ---- a/blivet/__init__.py -+++ b/blivet/__init__.py -@@ -124,7 +124,7 @@ def enable_installer_mode(): - from pyanaconda.constants import ROOT_PATH # pylint: disable=redefined-outer-name,no-name-in-module - _storage_root = _sysroot = ROOT_PATH - -- from pyanaconda.anaconda_logging import program_log_lock -+ from pyanaconda.anaconda_log import program_log_lock - util.program_log_lock = program_log_lock - - flags.installer_mode = True --- -2.7.4 - diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet_2.2.0.bb b/meta-python/recipes-extended/python-blivet/python3-blivet_2.2.0.bb deleted file mode 100644 index 46dc32de76..0000000000 --- a/meta-python/recipes-extended/python-blivet/python3-blivet_2.2.0.bb +++ /dev/null @@ -1,47 +0,0 @@ -DESCRIPTION = "A python module for system storage configuration" -HOMEPAGE = "http://fedoraproject.org/wiki/blivet" -LICENSE = "LGPLv2+" -SECTION = "devel/python" - -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -S = "${WORKDIR}/git" -B = "${S}" - -SRCREV = "39db82f20d8d4904c0c4dc8912e595177c59e091" -SRC_URI = "git://github.com/rhinstaller/blivet;branch=2.2-devel \ - file://0001-comment-out-selinux.patch \ - file://0002-run_program-support-timeout.patch\ - file://0003-support-infinit-timeout.patch \ - file://0004-Mount-var-volatile-during-install.patch \ - file://0005-update-fstab-by-appending.patch \ - file://0006-fix-new.roots-object-is-not-iterable.patch \ - file://0007-fix-incorrect-timeout-while-system-time-changed.patch \ - file://0008-tweak-btrfs-packages.patch \ - file://0009-invoking-mount-with-infinite-timeout.patch \ - file://0010-use-oe-variable-to-replace-hardcoded-dir.patch \ - file://0011-invoking-fsck-with-infinite-timeout.patch \ - file://0012-invoking-mkfs-with-infinite-timeout.patch \ - file://0013-Revert-Adapt-to-logging-module-name-change.patch \ - file://0014-invoking-dd-with-infinite-timeout.patch \ -" - -inherit distro_features_check -REQUIRED_DISTRO_FEATURES = "systemd" - -inherit setuptools3 python3native - -RDEPENDS_${PN} = "python3-pykickstart python3-pyudev \ - parted python3-pyparted multipath-tools \ - lsof cryptsetup libblockdev \ - libbytesize \ -" - -FILES_${PN} += " \ - ${datadir}/dbus-1/system-services \ -" - -inherit systemd - -SYSTEMD_AUTO_ENABLE = "disable" -SYSTEMD_SERVICE_${PN} = "blivet.service" 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.9.2.bb new file mode 100644 index 0000000000..f0ce981480 --- /dev/null +++ b/meta-python/recipes-extended/python-blivet/python3-blivet_3.9.2.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "A python module for system storage configuration" +HOMEPAGE = "http://fedoraproject.org/wiki/blivet" +LICENSE = "LGPL-2.0-or-later" +SECTION = "devel/python" + +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI += "\ + file://0002-run_program-support-timeout.patch \ + file://0003-support-infinit-timeout.patch \ + file://0005-fix-incorrect-timeout-while-system-time-changed.patch \ + file://0006-tweak-btrfs-packages.patch \ + file://0007-invoking-mount-with-infinite-timeout.patch \ + file://0008-use-oe-variable-to-replace-hardcoded-dir.patch \ + file://0009-invoking-fsck-with-infinite-timeout.patch \ + file://0010-invoking-mkfs-with-infinite-timeout.patch \ + file://0011-invoking-dd-with-infinite-timeout.patch \ +" +SRC_URI[sha256sum] = "9d97e37ebba01db28a1e6155cbd71c54fb55e9c2be5921982dc85bed316d8cfe" + +inherit pypi features_check systemd setuptools3_legacy + +REQUIRED_DISTRO_FEATURES = "systemd" + +RDEPENDS:${PN} += "python3-pykickstart python3-pyudev \ + parted python3-pyparted multipath-tools \ + lsof cryptsetup libblockdev \ + libbytesize \ +" + +FILES:${PN} += " \ + ${datadir}/dbus-1/system-services \ +" + +SYSTEMD_AUTO_ENABLE = "disable" +SYSTEMD_SERVICE:${PN} = "blivet.service" diff --git a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.5.bb b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.5.bb deleted file mode 100644 index 28c2565a14..0000000000 --- a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.5.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "GUI tool for storage configuration using blivet library" -HOMEPAGE = "https://github.com/rhinstaller/blivet-gui" -LICENSE = "GPLv2+" -SECTION = "devel/python" - -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -S = "${WORKDIR}/git" -B = "${S}" - -SRCREV = "52ae8c000843c05abd1d8749f44bbe2e5d891d3d" -SRC_URI = "git://github.com/rhinstaller/blivet-gui;branch=master \ -" - -inherit distro_features_check -REQUIRED_DISTRO_FEATURES = "x11 systemd" - -inherit setuptools3 python3native - -RDEPENDS_${PN} = "python3-pygobject python3 \ - python3-blivet gtk+3 \ - python3-pid libreport \ -" - -FILES_${PN} += " \ - ${datadir}/* \ - " 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.5.0.bb new file mode 100644 index 0000000000..124f36c6e0 --- /dev/null +++ b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.5.0.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "GUI tool for storage configuration using blivet library" +HOMEPAGE = "https://github.com/rhinstaller/blivet-gui" +LICENSE = "GPL-2.0-or-later" +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" + +S = "${WORKDIR}/git" + +inherit features_check setuptools3 +REQUIRED_DISTRO_FEATURES = "x11 systemd gobject-introspection-data" + +RDEPENDS:${PN} = "python3-pygobject python3 \ + python3-blivet gtk+3 \ + python3-pid libreport \ +" + +FILES:${PN} += "${datadir}/*" |