summaryrefslogtreecommitdiffstats
path: root/meta-python
diff options
context:
space:
mode:
Diffstat (limited to 'meta-python')
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch20
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch10
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivet/0003-support-infinit-timeout.patch16
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivet/0004-Mount-var-volatile-during-install.patch59
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivet/0004-fix-new.roots-object-is-not-iterable.patch (renamed from meta-python/recipes-extended/python-blivet/python3-blivet/0006-fix-new.roots-object-is-not-iterable.patch)8
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivet/0005-fix-incorrect-timeout-while-system-time-changed.patch (renamed from meta-python/recipes-extended/python-blivet/python3-blivet/0007-fix-incorrect-timeout-while-system-time-changed.patch)8
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivet/0005-update-fstab-by-appending.patch32
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivet/0006-tweak-btrfs-packages.patch (renamed from meta-python/recipes-extended/python-blivet/python3-blivet/0008-tweak-btrfs-packages.patch)10
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivet/0007-invoking-mount-with-infinite-timeout.patch (renamed from meta-python/recipes-extended/python-blivet/python3-blivet/0009-invoking-mount-with-infinite-timeout.patch)8
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivet/0008-use-oe-variable-to-replace-hardcoded-dir.patch (renamed from meta-python/recipes-extended/python-blivet/python3-blivet/0010-use-oe-variable-to-replace-hardcoded-dir.patch)6
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivet/0009-invoking-fsck-with-infinite-timeout.patch (renamed from meta-python/recipes-extended/python-blivet/python3-blivet/0011-invoking-fsck-with-infinite-timeout.patch)6
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivet/0010-invoking-mkfs-with-infinite-timeout.patch (renamed from meta-python/recipes-extended/python-blivet/python3-blivet/0012-invoking-mkfs-with-infinite-timeout.patch)4
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivet/0011-invoking-dd-with-infinite-timeout.patch (renamed from meta-python/recipes-extended/python-blivet/python3-blivet/0014-invoking-dd-with-infinite-timeout.patch)10
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivet/0013-Revert-Adapt-to-logging-module-name-change.patch30
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivet_3.0.1.bb (renamed from meta-python/recipes-extended/python-blivet/python3-blivet_2.2.0.bb)25
15 files changed, 64 insertions, 188 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
index 0ee32057cb..c77b86a455 100644
--- 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
@@ -1,7 +1,7 @@
1From 7d483c27ac0a23ca3bba7f320918afc40013bd8e Mon Sep 17 00:00:00 2001 1From 648a18bfc447f076d48ae4147d984b8ef56e37aa Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 8 May 2017 14:25:52 +0800 3Date: Mon, 30 Jul 2018 16:13:40 +0800
4Subject: [PATCH 01/13] comment out selinux 4Subject: [PATCH 01/11] comment out selinux
5 5
6Upstream-Status: Inappropriate [oe specific] 6Upstream-Status: Inappropriate [oe specific]
7 7
@@ -12,7 +12,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12 2 files changed, 8 insertions(+), 3 deletions(-) 12 2 files changed, 8 insertions(+), 3 deletions(-)
13 13
14diff --git a/blivet/flags.py b/blivet/flags.py 14diff --git a/blivet/flags.py b/blivet/flags.py
15index 06822db..b55a93f 100644 15index 1840121..8789390 100644
16--- a/blivet/flags.py 16--- a/blivet/flags.py
17+++ b/blivet/flags.py 17+++ b/blivet/flags.py
18@@ -20,7 +20,7 @@ 18@@ -20,7 +20,7 @@
@@ -24,7 +24,7 @@ index 06822db..b55a93f 100644
24 24
25 25
26 class Flags(object): 26 class Flags(object):
27@@ -49,7 +49,8 @@ class Flags(object): 27@@ -47,7 +47,8 @@ class Flags(object):
28 # 28 #
29 # enable/disable functionality 29 # enable/disable functionality
30 # 30 #
@@ -35,19 +35,19 @@ index 06822db..b55a93f 100644
35 self.dmraid = True 35 self.dmraid = True
36 self.ibft = True 36 self.ibft = True
37diff --git a/blivet/util.py b/blivet/util.py 37diff --git a/blivet/util.py b/blivet/util.py
38index e3e71ce..0cf5188 100644 38index 7334ff6..0f2a995 100644
39--- a/blivet/util.py 39--- a/blivet/util.py
40+++ b/blivet/util.py 40+++ b/blivet/util.py
41@@ -4,7 +4,7 @@ import glob 41@@ -3,7 +3,7 @@ import functools
42 import glob
42 import itertools 43 import itertools
43 import os 44 import os
44 import shutil
45-import selinux 45-import selinux
46+#import selinux 46+#import selinux
47 import subprocess 47 import subprocess
48 import re 48 import re
49 import sys 49 import sys
50@@ -431,6 +431,8 @@ def get_cow_sysfs_path(dev_path, dev_sysfsPath): 50@@ -430,6 +430,8 @@ def get_cow_sysfs_path(dev_path, dev_sysfsPath):
51 def match_path_context(path): 51 def match_path_context(path):
52 """ Return the default SELinux context for the given path. """ 52 """ Return the default SELinux context for the given path. """
53 context = None 53 context = None
@@ -56,7 +56,7 @@ index e3e71ce..0cf5188 100644
56 try: 56 try:
57 context = selinux.matchpathcon(os.path.normpath(path), 0)[1] 57 context = selinux.matchpathcon(os.path.normpath(path), 0)[1]
58 except OSError as e: 58 except OSError as e:
59@@ -455,6 +457,8 @@ def set_file_context(path, context, root=None): 59@@ -454,6 +456,8 @@ def set_file_context(path, context, root=None):
60 60
61 True if successful, False if not. 61 True if successful, False if not.
62 """ 62 """
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..fea2254074 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,7 +1,7 @@
1From 86744d408b91acdcb086a03d7779fcda152f2ac3 Mon Sep 17 00:00:00 2001 1From 596979ed58109141a7fee680ab95b27296c022b1 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 8 May 2017 14:39:56 +0800 3Date: Mon, 8 May 2017 14:39:56 +0800
4Subject: [PATCH 02/13] run_program support timeout 4Subject: [PATCH 02/11] run_program support timeout
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
@@ -11,10 +11,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11 1 file changed, 39 insertions(+), 29 deletions(-) 11 1 file changed, 39 insertions(+), 29 deletions(-)
12 12
13diff --git a/blivet/util.py b/blivet/util.py 13diff --git a/blivet/util.py b/blivet/util.py
14index 0cf5188..d4bd9bb 100644 14index 0f2a995..05a253c 100644
15--- a/blivet/util.py 15--- a/blivet/util.py
16+++ b/blivet/util.py 16+++ b/blivet/util.py
17@@ -158,6 +158,30 @@ class Path(str): 17@@ -157,6 +157,30 @@ class Path(str):
18 def __hash__(self): 18 def __hash__(self):
19 return self._path.__hash__() 19 return self._path.__hash__()
20 20
@@ -45,7 +45,7 @@ index 0cf5188..d4bd9bb 100644
45 45
46 def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=False, binary_output=False): 46 def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=False, binary_output=False):
47 if env_prune is None: 47 if env_prune is None:
48@@ -180,36 +204,22 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa 48@@ -179,36 +203,22 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa
49 stderr_dir = subprocess.STDOUT 49 stderr_dir = subprocess.STDOUT
50 else: 50 else:
51 stderr_dir = subprocess.PIPE 51 stderr_dir = subprocess.PIPE
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..38f061ed0e 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 @@
1From 923265e04df5920fc99393aa05f584032aa1b383 Mon Sep 17 00:00:00 2001 1From 325898f3f2951bbde07da47888175c427b11ddc3 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 8 May 2017 16:18:02 +0800 3Date: Mon, 8 May 2017 16:18:02 +0800
4Subject: [PATCH 03/13] support infinit timeout 4Subject: [PATCH 03/11] support infinit timeout
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
@@ -11,10 +11,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11 1 file changed, 8 insertions(+), 4 deletions(-) 11 1 file changed, 8 insertions(+), 4 deletions(-)
12 12
13diff --git a/blivet/util.py b/blivet/util.py 13diff --git a/blivet/util.py b/blivet/util.py
14index d4bd9bb..44a2da5 100644 14index 05a253c..d6804be 100644
15--- a/blivet/util.py 15--- a/blivet/util.py
16+++ b/blivet/util.py 16+++ b/blivet/util.py
17@@ -158,6 +158,7 @@ class Path(str): 17@@ -157,6 +157,7 @@ class Path(str):
18 def __hash__(self): 18 def __hash__(self):
19 return self._path.__hash__() 19 return self._path.__hash__()
20 20
@@ -22,7 +22,7 @@ index d4bd9bb..44a2da5 100644
22 def timeout_command(argv, timeout, *args, **kwargs): 22 def timeout_command(argv, timeout, *args, **kwargs):
23 """call shell-command and either return its output or kill it 23 """call shell-command and either return its output or kill it
24 if it doesn't normally exit within timeout seconds and return None""" 24 if it doesn't normally exit within timeout seconds and return None"""
25@@ -169,7 +170,7 @@ def timeout_command(argv, timeout, *args, **kwargs): 25@@ -168,7 +169,7 @@ def timeout_command(argv, timeout, *args, **kwargs):
26 while proc.poll() is None: 26 while proc.poll() is None:
27 time.sleep(0.1) 27 time.sleep(0.1)
28 now = datetime.datetime.now() 28 now = datetime.datetime.now()
@@ -31,7 +31,7 @@ index d4bd9bb..44a2da5 100644
31 os.kill(proc.pid, signal.SIGKILL) 31 os.kill(proc.pid, signal.SIGKILL)
32 os.waitpid(-1, os.WNOHANG) 32 os.waitpid(-1, os.WNOHANG)
33 program_log.debug("%d seconds timeout" % timeout) 33 program_log.debug("%d seconds timeout" % timeout)
34@@ -183,7 +184,7 @@ def timeout_command(argv, timeout, *args, **kwargs): 34@@ -182,7 +183,7 @@ def timeout_command(argv, timeout, *args, **kwargs):
35 program_log.debug("Return code: %d", proc.returncode) 35 program_log.debug("Return code: %d", proc.returncode)
36 return (proc.returncode, proc.stdout.read()) 36 return (proc.returncode, proc.stdout.read())
37 37
@@ -40,7 +40,7 @@ index d4bd9bb..44a2da5 100644
40 if env_prune is None: 40 if env_prune is None:
41 env_prune = [] 41 env_prune = []
42 42
43@@ -192,7 +193,10 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa 43@@ -191,7 +192,10 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa
44 os.chroot(root) 44 os.chroot(root)
45 45
46 with program_log_lock: # pylint: disable=not-context-manager 46 with program_log_lock: # pylint: disable=not-context-manager
@@ -52,7 +52,7 @@ index d4bd9bb..44a2da5 100644
52 52
53 env = os.environ.copy() 53 env = os.environ.copy()
54 env.update({"LC_ALL": "C", 54 env.update({"LC_ALL": "C",
55@@ -205,7 +209,7 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa 55@@ -204,7 +208,7 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa
56 else: 56 else:
57 stderr_dir = subprocess.PIPE 57 stderr_dir = subprocess.PIPE
58 58
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 @@
1From c3959bd00665e24a955bbdbea1ef555e76372f12 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 8 May 2017 16:25:16 +0800
4Subject: [PATCH 04/13] Mount /var/volatile during install
5
6The installed system needs /var/volatile clean, otherwise it
7caused systemd's journalctl failed to record boot log.
8
9Upstream-Status: Inappropriate [oe specific]
10
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12---
13 blivet/osinstall.py | 9 +++++++++
14 1 file changed, 9 insertions(+)
15
16diff --git a/blivet/osinstall.py b/blivet/osinstall.py
17index a4f9535..61819c2 100644
18--- a/blivet/osinstall.py
19+++ b/blivet/osinstall.py
20@@ -294,6 +294,7 @@ class FSSet(object):
21 self._sysfs = None
22 self._proc = None
23 self._devshm = None
24+ self._volatile = None
25 self._usb = None
26 self._selinux = None
27 self._run = None
28@@ -335,6 +336,12 @@ class FSSet(object):
29 return self._devshm
30
31 @property
32+ def volatile(self):
33+ if not self._volatile:
34+ self._volatile = NoDevice(fmt=get_format("tmpfs", device="tmpfs", mountpoint="/var/volatile"))
35+ return self._volatile
36+
37+ @property
38 def usb(self):
39 if not self._usb:
40 self._usb = NoDevice(fmt=get_format("usbfs", device="usbfs", mountpoint="/proc/bus/usb"))
41@@ -591,6 +598,7 @@ class FSSet(object):
42
43 devices = list(self.mountpoints.values()) + self.swap_devices
44 devices.extend([self.dev, self.devshm, self.devpts, self.sysfs,
45+ self.volatile,
46 self.proc, self.selinux, self.usb, self.run])
47 if isinstance(_platform, EFI):
48 devices.append(self.efivars)
49@@ -650,6 +658,7 @@ class FSSet(object):
50 """ unmount filesystems, except swap if swapoff == False """
51 devices = list(self.mountpoints.values()) + self.swap_devices
52 devices.extend([self.dev, self.devshm, self.devpts, self.sysfs,
53+ self.volatile,
54 self.proc, self.usb, self.selinux, self.run])
55 if isinstance(_platform, EFI):
56 devices.append(self.efivars)
57--
582.7.4
59
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/0004-fix-new.roots-object-is-not-iterable.patch
index f5ff754d8d..be997ac4f4 100644
--- 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/0004-fix-new.roots-object-is-not-iterable.patch
@@ -1,7 +1,7 @@
1From cd92eea8fab37ba6b0c7f03daa5255343dc75716 Mon Sep 17 00:00:00 2001 1From c31df1c0f5323ddc70e0d1c6d11db2fbf7a024ad Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 8 May 2017 16:30:20 +0800 3Date: Mon, 8 May 2017 16:30:20 +0800
4Subject: [PATCH 06/13] fix new.roots object is not iterable 4Subject: [PATCH 04/11] fix new.roots object is not iterable
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
@@ -11,10 +11,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
12 12
13diff --git a/blivet/blivet.py b/blivet/blivet.py 13diff --git a/blivet/blivet.py b/blivet/blivet.py
14index 6a33e9c..79ae91a 100644 14index 3405810..f42b73b 100644
15--- a/blivet/blivet.py 15--- a/blivet/blivet.py
16+++ b/blivet/blivet.py 16+++ b/blivet/blivet.py
17@@ -1761,7 +1761,7 @@ class Blivet(object): 17@@ -1198,7 +1198,7 @@ class Blivet(object):
18 p = partition.disk.format.parted_disk.getPartitionByPath(partition.path) 18 p = partition.disk.format.parted_disk.getPartitionByPath(partition.path)
19 partition.parted_partition = p 19 partition.parted_partition = p
20 20
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..ecb95039d0 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 @@
1From 78ee2b9090f9400ccc4f730e674f5ae972740ccb Mon Sep 17 00:00:00 2001 1From b30a74671ca603e6bfd514f72d4fd7fd6fceef54 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 26 Aug 2016 02:02:49 -0400 3Date: Fri, 26 Aug 2016 02:02:49 -0400
4Subject: [PATCH 07/13] fix incorrect timeout while system time changed 4Subject: [PATCH 05/11] fix incorrect timeout while system time changed
5 5
6While system time changed by NTP, invoking timeout_command 6While system time changed by NTP, invoking timeout_command
7breaks with incorrect timeout. 7breaks with incorrect timeout.
@@ -22,10 +22,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
22 1 file changed, 3 insertions(+), 3 deletions(-) 22 1 file changed, 3 insertions(+), 3 deletions(-)
23 23
24diff --git a/blivet/util.py b/blivet/util.py 24diff --git a/blivet/util.py b/blivet/util.py
25index 44a2da5..b3c45ac 100644 25index d6804be..bc08af5 100644
26--- a/blivet/util.py 26--- a/blivet/util.py
27+++ b/blivet/util.py 27+++ b/blivet/util.py
28@@ -163,14 +163,14 @@ def timeout_command(argv, timeout, *args, **kwargs): 28@@ -162,14 +162,14 @@ def timeout_command(argv, timeout, *args, **kwargs):
29 """call shell-command and either return its output or kill it 29 """call shell-command and either return its output or kill it
30 if it doesn't normally exit within timeout seconds and return None""" 30 if it doesn't normally exit within timeout seconds and return None"""
31 import subprocess, datetime, os, time, signal 31 import subprocess, datetime, os, time, signal
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 @@
1From 386ff899763f8473eb93a7a1578fb7cc4f86f66d Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 8 May 2017 16:28:12 +0800
4Subject: [PATCH 05/13] update fstab by appending
5
6The 'storage.write()' has updated fstab by overwriting
7the original one, we should update fstab by appending
8to keep original tmpfs partitions.
9
10Upstream-Status: Inappropriate [oe specific]
11
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13---
14 blivet/osinstall.py | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/blivet/osinstall.py b/blivet/osinstall.py
18index 61819c2..afa82db 100644
19--- a/blivet/osinstall.py
20+++ b/blivet/osinstall.py
21@@ -728,7 +728,7 @@ class FSSet(object):
22 # /etc/fstab
23 fstab_path = os.path.normpath("%s/etc/fstab" % get_sysroot())
24 fstab = self.fstab()
25- open(fstab_path, "w").write(fstab)
26+ open(fstab_path, "a").write(fstab)
27
28 # /etc/crypttab
29 crypttab_path = os.path.normpath("%s/etc/crypttab" % get_sysroot())
30--
312.7.4
32
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..da568a4b06 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 @@
1From 6f661a511eea096c073888c7adb836a9a880b476 Mon Sep 17 00:00:00 2001 1From 0659d8a85bcdd76c0b23b8b5af6958783d35ac65 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 8 May 2017 16:33:15 +0800 3Date: Mon, 8 May 2017 16:33:15 +0800
4Subject: [PATCH 08/13] tweak btrfs packages 4Subject: [PATCH 06/11] tweak btrfs packages
5 5
6In oe-cre/yocto, we name btrfs package with btrfs-tools, 6In oe-cre/yocto, we name btrfs package with btrfs-tools,
7rather than btrfs-progs. 7rather than btrfs-progs.
@@ -15,7 +15,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15 2 files changed, 2 insertions(+), 2 deletions(-) 15 2 files changed, 2 insertions(+), 2 deletions(-)
16 16
17diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py 17diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py
18index c5cb21f..9d417b2 100644 18index cada940..7e4d4b8 100644
19--- a/blivet/devices/btrfs.py 19--- a/blivet/devices/btrfs.py
20+++ b/blivet/devices/btrfs.py 20+++ b/blivet/devices/btrfs.py
21@@ -55,7 +55,7 @@ class BTRFSDevice(StorageDevice): 21@@ -55,7 +55,7 @@ class BTRFSDevice(StorageDevice):
@@ -28,10 +28,10 @@ index c5cb21f..9d417b2 100644
28 28
29 def __init__(self, *args, **kwargs): 29 def __init__(self, *args, **kwargs):
30diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py 30diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py
31index a49826f..e8f216d 100644 31index 81e367f..55e5d57 100644
32--- a/blivet/formats/fs.py 32--- a/blivet/formats/fs.py
33+++ b/blivet/formats/fs.py 33+++ b/blivet/formats/fs.py
34@@ -918,7 +918,7 @@ class BTRFS(FS): 34@@ -926,7 +926,7 @@ class BTRFS(FS):
35 _formattable = True 35 _formattable = True
36 _linux_native = True 36 _linux_native = True
37 _supported = True 37 _supported = True
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..e30121948d 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 @@
1From a6ac2157ee6793302e23ddbc5e3b249fa7da5b7e Mon Sep 17 00:00:00 2001 1From 9c7a15312259854f12137a30229e52c30fb7c770 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 31 Aug 2016 21:30:32 -0400 3Date: Wed, 31 Aug 2016 21:30:32 -0400
4Subject: [PATCH 09/13] invoking mount with infinite timeout 4Subject: [PATCH 07/11] invoking mount with infinite timeout
5 5
6This large timeout is needed when running on machines with 6This large timeout is needed when running on machines with
7lots of disks, or with slow disks. 7lots of disks, or with slow disks.
@@ -14,10 +14,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/blivet/util.py b/blivet/util.py 16diff --git a/blivet/util.py b/blivet/util.py
17index b3c45ac..9f02b18 100644 17index bc08af5..b672787 100644
18--- a/blivet/util.py 18--- a/blivet/util.py
19+++ b/blivet/util.py 19+++ b/blivet/util.py
20@@ -257,7 +257,7 @@ def mount(device, mountpoint, fstype, options=None): 20@@ -256,7 +256,7 @@ def mount(device, mountpoint, fstype, options=None):
21 21
22 argv = ["mount", "-t", fstype, "-o", options, device, mountpoint] 22 argv = ["mount", "-t", fstype, "-o", options, device, mountpoint]
23 try: 23 try:
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..feb5647ce7 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,7 +1,7 @@
1From e07133dbcf3c52e1ddd2f12797dcd16145269273 Mon Sep 17 00:00:00 2001 1From 7f57b2cd145d67c20beb02d5495b502f7af012cd Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 8 May 2017 03:54:12 -0400 3Date: Mon, 8 May 2017 03:54:12 -0400
4Subject: [PATCH 10/13] use oe variable to replace hardcoded dir 4Subject: [PATCH 08/11] use oe variable to replace hardcoded dir
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
@@ -11,7 +11,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11 1 file changed, 4 insertions(+), 4 deletions(-) 11 1 file changed, 4 insertions(+), 4 deletions(-)
12 12
13diff --git a/setup.py b/setup.py 13diff --git a/setup.py b/setup.py
14index 4d06a33..a994d06 100644 14index 7edab2c..9be3187 100644
15--- a/setup.py 15--- a/setup.py
16+++ b/setup.py 16+++ b/setup.py
17@@ -61,10 +61,10 @@ class blivet_sdist(sdist): 17@@ -61,10 +61,10 @@ class blivet_sdist(sdist):
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..30d2d3ec95 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 @@
1From e9ab4376a18cc1bd413c000b036320833eec80d7 Mon Sep 17 00:00:00 2001 1From c757666f42f543baeed5df61269798c085665d9b Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 1 Jun 2017 16:05:27 +0800 3Date: Thu, 1 Jun 2017 16:05:27 +0800
4Subject: [PATCH 11/13] invoking fsck with infinite timeout 4Subject: [PATCH 09/11] invoking fsck with infinite timeout
5 5
6This large timeout is needed when running on machines with 6This large timeout is needed when running on machines with
7lots of disks, or with slow disks. 7lots of disks, or with slow disks.
@@ -14,7 +14,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/blivet/tasks/fsck.py b/blivet/tasks/fsck.py 16diff --git a/blivet/tasks/fsck.py b/blivet/tasks/fsck.py
17index c4214dc..e13ac6b 100644 17index 5274f13..6e074c4 100644
18--- a/blivet/tasks/fsck.py 18--- a/blivet/tasks/fsck.py
19+++ b/blivet/tasks/fsck.py 19+++ b/blivet/tasks/fsck.py
20@@ -77,7 +77,7 @@ class FSCK(task.BasicApplication, fstask.FSTask): 20@@ -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..b2f4501497 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 @@
1From 9f5a048181cf29d241d96814e736b8235b3d42b1 Mon Sep 17 00:00:00 2001 1From 42d8e57c748951098534bf7f52c4ebc790ef66e9 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 16 Jun 2017 15:43:00 +0800 3Date: Fri, 16 Jun 2017 15:43:00 +0800
4Subject: [PATCH 12/13] invoking mkfs with infinite timeout 4Subject: [PATCH 10/11] invoking mkfs with infinite timeout
5 5
6This large timeout is needed when running on machines with 6This large timeout is needed when running on machines with
7lots of disks, or with slow disks. 7lots of disks, or with slow disks.
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..f24ce0a801 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,7 +1,7 @@
1From 92fe7dfd01131c93a9b2013cabf77d5f46900fab Mon Sep 17 00:00:00 2001 1From a4753b3cbbd5aee59dc53eb16564cafd9862763e Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 6 Mar 2018 17:28:56 +0800 3Date: Tue, 6 Mar 2018 17:28:56 +0800
4Subject: [PATCH] invoking dd with infinite timeout 4Subject: [PATCH 11/11] invoking dd with infinite timeout
5 5
6This large timeout is needed when running on machines with 6This large timeout is needed when running on machines with
7lots of disks, or with slow disks. 7lots of disks, or with slow disks.
@@ -14,10 +14,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/blivet/devices/partition.py b/blivet/devices/partition.py 16diff --git a/blivet/devices/partition.py b/blivet/devices/partition.py
17index a7372fb..8947472 100644 17index 47ff547..0cd1614 100644
18--- a/blivet/devices/partition.py 18--- a/blivet/devices/partition.py
19+++ b/blivet/devices/partition.py 19+++ b/blivet/devices/partition.py
20@@ -594,7 +594,7 @@ class PartitionDevice(StorageDevice): 20@@ -621,7 +621,7 @@ class PartitionDevice(StorageDevice):
21 cmd = ["dd", "if=/dev/zero", "of=%s" % device, "bs=%d" % bs, 21 cmd = ["dd", "if=/dev/zero", "of=%s" % device, "bs=%d" % bs,
22 "seek=%d" % start, "count=%d" % count] 22 "seek=%d" % start, "count=%d" % count]
23 try: 23 try:
@@ -27,5 +27,5 @@ index a7372fb..8947472 100644
27 log.error(str(e)) 27 log.error(str(e))
28 finally: 28 finally:
29-- 29--
301.8.3.1 302.7.4
31 31
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 @@
1From bfdaf79a2109ac6aed408f0c94f69766991e60e2 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 27 Jul 2017 14:34:30 +0800
4Subject: [PATCH 13/13] Revert "Adapt to logging module name change"
5
6Upstream-Status: Inappropriate [oe specific, sync with anaconda f26-release]
7
8This reverts commit c367d62a516e541ad28636c8259321f1c53417ce.
9
10Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11---
12 blivet/__init__.py | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/blivet/__init__.py b/blivet/__init__.py
16index 49277cb..a01e487 100644
17--- a/blivet/__init__.py
18+++ b/blivet/__init__.py
19@@ -124,7 +124,7 @@ def enable_installer_mode():
20 from pyanaconda.constants import ROOT_PATH # pylint: disable=redefined-outer-name,no-name-in-module
21 _storage_root = _sysroot = ROOT_PATH
22
23- from pyanaconda.anaconda_logging import program_log_lock
24+ from pyanaconda.anaconda_log import program_log_lock
25 util.program_log_lock = program_log_lock
26
27 flags.installer_mode = True
28--
292.7.4
30
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet_2.2.0.bb b/meta-python/recipes-extended/python-blivet/python3-blivet_3.0.1.bb
index 045e0f48dc..218c158c69 100644
--- a/meta-python/recipes-extended/python-blivet/python3-blivet_2.2.0.bb
+++ b/meta-python/recipes-extended/python-blivet/python3-blivet_3.0.1.bb
@@ -8,22 +8,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
8S = "${WORKDIR}/git" 8S = "${WORKDIR}/git"
9B = "${S}" 9B = "${S}"
10 10
11SRCREV = "39db82f20d8d4904c0c4dc8912e595177c59e091" 11SRCREV = "ddc24c71bad10208b11ea0c45853898fadd7030b"
12SRC_URI = "git://github.com/rhinstaller/blivet;branch=2.2-devel \ 12SRC_URI = "git://github.com/rhinstaller/blivet;branch=3.1-release \
13 file://0001-comment-out-selinux.patch \ 13 file://0001-comment-out-selinux.patch \
14 file://0002-run_program-support-timeout.patch\ 14 file://0002-run_program-support-timeout.patch \
15 file://0003-support-infinit-timeout.patch \ 15 file://0003-support-infinit-timeout.patch \
16 file://0004-Mount-var-volatile-during-install.patch \ 16 file://0004-fix-new.roots-object-is-not-iterable.patch \
17 file://0005-update-fstab-by-appending.patch \ 17 file://0005-fix-incorrect-timeout-while-system-time-changed.patch \
18 file://0006-fix-new.roots-object-is-not-iterable.patch \ 18 file://0006-tweak-btrfs-packages.patch \
19 file://0007-fix-incorrect-timeout-while-system-time-changed.patch \ 19 file://0007-invoking-mount-with-infinite-timeout.patch \
20 file://0008-tweak-btrfs-packages.patch \ 20 file://0008-use-oe-variable-to-replace-hardcoded-dir.patch \
21 file://0009-invoking-mount-with-infinite-timeout.patch \ 21 file://0009-invoking-fsck-with-infinite-timeout.patch \
22 file://0010-use-oe-variable-to-replace-hardcoded-dir.patch \ 22 file://0010-invoking-mkfs-with-infinite-timeout.patch \
23 file://0011-invoking-fsck-with-infinite-timeout.patch \ 23 file://0011-invoking-dd-with-infinite-timeout.patch \
24 file://0012-invoking-mkfs-with-infinite-timeout.patch \
25 file://0013-Revert-Adapt-to-logging-module-name-change.patch \
26 file://0014-invoking-dd-with-infinite-timeout.patch \
27" 24"
28 25
29UPSTREAM_CHECK_GITTAGREGEX = "blivet-(?P<pver>\d+(\.\d+)+)$" 26UPSTREAM_CHECK_GITTAGREGEX = "blivet-(?P<pver>\d+(\.\d+)+)$"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-22 16:21:15 +0000