| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From 8932ae933f2b6acf5e98c9956beff69ae430eed2 Mon Sep 17 00:00:00 2001 |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Mon, 8 May 2017 16:33:15 +0800 |
| 4 | Subject: [PATCH 06/11] tweak btrfs packages |
| 5 | |
| 6 | In oe-cre/yocto, we name btrfs package with btrfs-tools, |
| 7 | rather than btrfs-progs. |
| 8 | |
| 9 | Upstream-Status: Inappropriate [oe specific] |
| 10 | |
| 11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 12 | --- |
| 13 | blivet/devices/btrfs.py | 2 +- |
| 14 | blivet/formats/fs.py | 2 +- |
| 15 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 16 | |
| 17 | diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py |
| 18 | index cada940..7e4d4b8 100644 |
| 19 | --- a/blivet/devices/btrfs.py |
| 20 | +++ b/blivet/devices/btrfs.py |
| 21 | @@ -55,7 +55,7 @@ class BTRFSDevice(StorageDevice): |
| 22 | |
| 23 | """ Base class for BTRFS volume and sub-volume devices. """ |
| 24 | _type = "btrfs" |
| 25 | - _packages = ["btrfs-progs"] |
| 26 | + _packages = ["btrfs-tools"] |
| 27 | _external_dependencies = [availability.BLOCKDEV_BTRFS_PLUGIN] |
| 28 | |
| 29 | def __init__(self, *args, **kwargs): |
| 30 | diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py |
| 31 | index 81e367f..55e5d57 100644 |
| 32 | --- a/blivet/formats/fs.py |
| 33 | +++ b/blivet/formats/fs.py |
| 34 | @@ -926,7 +926,7 @@ class BTRFS(FS): |
| 35 | _formattable = True |
| 36 | _linux_native = True |
| 37 | _supported = True |
| 38 | - _packages = ["btrfs-progs"] |
| 39 | + _packages = ["btrfs-tools"] |
| 40 | _min_size = Size("256 MiB") |
| 41 | _max_size = Size("16 EiB") |
| 42 | _mkfs_class = fsmkfs.BTRFSMkfs |
| 43 | -- |
| 44 | 2.7.4 |
| 45 | |