Patrick Williams | 03514f1 | 2024-04-05 07:04:11 -0500 | [diff] [blame] | 1 | From b55b1023f8f1ad3121928eb9d0ee9902f5474752 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 |
Patrick Williams | 03514f1 | 2024-04-05 07:04:11 -0500 | [diff] [blame] | 4 | Subject: [PATCH] tweak btrfs packages |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 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 |
Patrick Williams | 03514f1 | 2024-04-05 07:04:11 -0500 | [diff] [blame] | 18 | index c446e7e..37c183e 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 19 | --- a/blivet/devices/btrfs.py |
| 20 | +++ b/blivet/devices/btrfs.py |
Patrick Williams | 03514f1 | 2024-04-05 07:04:11 -0500 | [diff] [blame] | 21 | @@ -58,7 +58,7 @@ class BTRFSDevice(StorageDevice): |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 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 |
Patrick Williams | 03514f1 | 2024-04-05 07:04:11 -0500 | [diff] [blame] | 31 | index 1e102b6..f16941e 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 32 | --- a/blivet/formats/fs.py |
| 33 | +++ b/blivet/formats/fs.py |
Patrick Williams | 03514f1 | 2024-04-05 07:04:11 -0500 | [diff] [blame] | 34 | @@ -1050,7 +1050,7 @@ class BTRFS(FS): |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 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 |