summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivet/0006-tweak-btrfs-packages.patch12
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivet/0011-invoking-dd-with-infinite-timeout.patch8
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivet_3.9.2.bb (renamed from meta-python/recipes-extended/python-blivet/python3-blivet_3.9.1.bb)2
3 files changed, 11 insertions, 11 deletions
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0006-tweak-btrfs-packages.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0006-tweak-btrfs-packages.patch
index b98dafeab3..6c53f03db1 100644
--- a/meta-python/recipes-extended/python-blivet/python3-blivet/0006-tweak-btrfs-packages.patch
+++ b/meta-python/recipes-extended/python-blivet/python3-blivet/0006-tweak-btrfs-packages.patch
@@ -1,7 +1,7 @@
1From 359bc9f60a4bcf6be64a72c3825af65269f6c6c9 Mon Sep 17 00:00:00 2001 1From b55b1023f8f1ad3121928eb9d0ee9902f5474752 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 06/11] tweak btrfs packages 4Subject: [PATCH] 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,10 +15,10 @@ 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 259bcf8..8e4eb2b 100644 18index c446e7e..37c183e 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@@ -57,7 +57,7 @@ class BTRFSDevice(StorageDevice): 21@@ -58,7 +58,7 @@ class BTRFSDevice(StorageDevice):
22 22
23 """ Base class for BTRFS volume and sub-volume devices. """ 23 """ Base class for BTRFS volume and sub-volume devices. """
24 _type = "btrfs" 24 _type = "btrfs"
@@ -28,10 +28,10 @@ index 259bcf8..8e4eb2b 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 932307a..865b863 100644 31index 1e102b6..f16941e 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@@ -1049,7 +1049,7 @@ class BTRFS(FS): 34@@ -1050,7 +1050,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/0011-invoking-dd-with-infinite-timeout.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0011-invoking-dd-with-infinite-timeout.patch
index 48ffaf2cb5..ea4cffa9b3 100644
--- a/meta-python/recipes-extended/python-blivet/python3-blivet/0011-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 3d398173f02bb641473299abb1166fdcc3643666 Mon Sep 17 00:00:00 2001 1From 5ee527fab06f9d33b162a6cd0c068d7b3ac2ecb0 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 11/11] invoking dd with infinite timeout 4Subject: [PATCH] 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 b60b9b4..fa8858b 100644 17index 2d67be8..a4cf9a0 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@@ -667,7 +667,7 @@ class PartitionDevice(StorageDevice): 20@@ -677,7 +677,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:
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet_3.9.1.bb b/meta-python/recipes-extended/python-blivet/python3-blivet_3.9.2.bb
index e9c27548ed..f0ce981480 100644
--- a/meta-python/recipes-extended/python-blivet/python3-blivet_3.9.1.bb
+++ b/meta-python/recipes-extended/python-blivet/python3-blivet_3.9.2.bb
@@ -16,7 +16,7 @@ SRC_URI += "\
16 file://0010-invoking-mkfs-with-infinite-timeout.patch \ 16 file://0010-invoking-mkfs-with-infinite-timeout.patch \
17 file://0011-invoking-dd-with-infinite-timeout.patch \ 17 file://0011-invoking-dd-with-infinite-timeout.patch \
18" 18"
19SRC_URI[sha256sum] = "fda09ac9ddbbacbb0c00e867006cf36b213b8f5707accdfaaebfd27378f362d8" 19SRC_URI[sha256sum] = "9d97e37ebba01db28a1e6155cbd71c54fb55e9c2be5921982dc85bed316d8cfe"
20 20
21inherit pypi features_check systemd setuptools3_legacy 21inherit pypi features_check systemd setuptools3_legacy
22 22