mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-04-20 11:38:34 +00:00
a6439a2179
0002-run_program-support-timeout.patch 0003-support-infinit-timeout.patch 0005-fix-incorrect-timeout-while-system-time-changed.patch 0006-tweak-btrfs-packages.patch 0007-invoking-mount-with-infinite-timeout.patch 0008-use-oe-variable-to-replace-hardcoded-dir.patch 0010-invoking-mkfs-with-infinite-timeout.patch 0011-invoking-dd-with-infinite-timeout.patch refreshed for 3.9.1 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From 359bc9f60a4bcf6be64a72c3825af65269f6c6c9 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 06/11] tweak btrfs packages
|
|
|
|
In oe-cre/yocto, we name btrfs package with btrfs-tools,
|
|
rather than btrfs-progs.
|
|
|
|
Upstream-Status: Inappropriate [oe specific]
|
|
|
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
|
---
|
|
blivet/devices/btrfs.py | 2 +-
|
|
blivet/formats/fs.py | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py
|
|
index 259bcf8..8e4eb2b 100644
|
|
--- a/blivet/devices/btrfs.py
|
|
+++ b/blivet/devices/btrfs.py
|
|
@@ -57,7 +57,7 @@ class BTRFSDevice(StorageDevice):
|
|
|
|
""" Base class for BTRFS volume and sub-volume devices. """
|
|
_type = "btrfs"
|
|
- _packages = ["btrfs-progs"]
|
|
+ _packages = ["btrfs-tools"]
|
|
_external_dependencies = [availability.BLOCKDEV_BTRFS_PLUGIN]
|
|
|
|
def __init__(self, *args, **kwargs):
|
|
diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py
|
|
index 932307a..865b863 100644
|
|
--- a/blivet/formats/fs.py
|
|
+++ b/blivet/formats/fs.py
|
|
@@ -1049,7 +1049,7 @@ class BTRFS(FS):
|
|
_formattable = True
|
|
_linux_native = True
|
|
_supported = True
|
|
- _packages = ["btrfs-progs"]
|
|
+ _packages = ["btrfs-tools"]
|
|
_min_size = Size("256 MiB")
|
|
_max_size = Size("16 EiB")
|
|
_mkfs_class = fsmkfs.BTRFSMkfs
|