From 37bf380103d25f87f28ca0978044b928b9f56fbb Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 12 Jun 2016 14:50:25 +0200 Subject: [PATCH] [dev-python/python-blivet] version bump to 1.0.10, required by Anaconda 22 --- dev-python/python-blivet/Manifest | 1 + ...package-names-to-reflect-Gentoo-ones.patch | 80 +++++++++++++++++++ ...e-UUID-for-dm-based-devices-in-fstab.patch | 28 +++++++ ...-udev.settle-when-committing-to-disk.patch | 24 ++++++ .../python-blivet-0.23.9-r3.ebuild | 5 +- .../python-blivet/python-blivet-1.0.10.ebuild | 50 ++++++++++++ profiles/package.mask | 2 + 7 files changed, 188 insertions(+), 2 deletions(-) create mode 100644 dev-python/python-blivet/files/1.0/0001-Update-package-names-to-reflect-Gentoo-ones.patch create mode 100644 dev-python/python-blivet/files/1.0/0002-devices-enable-UUID-for-dm-based-devices-in-fstab.patch create mode 100644 dev-python/python-blivet/files/1.0/0003-Call-udev.settle-when-committing-to-disk.patch create mode 100644 dev-python/python-blivet/python-blivet-1.0.10.ebuild diff --git a/dev-python/python-blivet/Manifest b/dev-python/python-blivet/Manifest index 50286488a..30816aacd 100644 --- a/dev-python/python-blivet/Manifest +++ b/dev-python/python-blivet/Manifest @@ -1 +1,2 @@ DIST blivet-0.23.9-1.tar.gz 230824 SHA256 4cf312640c7cf040e621f997cd16496b67b84f98a70cb9aee4adce4f3353abd7 SHA512 8ca5484291b1531c7af7f2122b6a05177b685f3f112d146d382fdd6e940c8e9c51c200439d7f0fe0fd9d80e5ae0bd1ae53c07d90159c1c63aa5fa6c739789b3e WHIRLPOOL ab1bf6d45f43172e15f8f149528fb02c615677b634cfde3780c2ff5f40b63e7c67d1ca844531aaeb4f33fa39404677268de1d7ecc8bf0e432ac0143138237a97 +DIST blivet-1.0.10-1.tar.gz 324830 SHA256 8d92da01a9a6499a758340fea00fcc30f797c6b8567e27966267f263b7c71b39 SHA512 500839ccce49d13a9d30d122683a3d794b04bbf0ceb7636729f5de184e96637657d7d7d22a713e7bbb1e7dcd267a08902f13c86dc9a00d3929c158e7d5867876 WHIRLPOOL 3592d33051f4de93755d303fafa0c9edd60d000bc119cb30370705c7a25149265f26f5df8c9be280d7dcf8737b092695281e17a9fec7d3149f02c4df8f4e3ac5 diff --git a/dev-python/python-blivet/files/1.0/0001-Update-package-names-to-reflect-Gentoo-ones.patch b/dev-python/python-blivet/files/1.0/0001-Update-package-names-to-reflect-Gentoo-ones.patch new file mode 100644 index 000000000..b30376649 --- /dev/null +++ b/dev-python/python-blivet/files/1.0/0001-Update-package-names-to-reflect-Gentoo-ones.patch @@ -0,0 +1,80 @@ +From 629da74f22048a618ce76fc88b6cb26cb45241a4 Mon Sep 17 00:00:00 2001 +From: Fabio Erculiani +Date: Sun, 12 Jun 2016 14:44:59 +0200 +Subject: [PATCH 1/3] Update package names to reflect Gentoo ones + +--- + blivet/devices/disk.py | 6 +++--- + blivet/devices/nfs.py | 2 +- + blivet/formats/fs.py | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/blivet/devices/disk.py b/blivet/devices/disk.py +index 8192e04..f5aaad2 100644 +--- a/blivet/devices/disk.py ++++ b/blivet/devices/disk.py +@@ -248,7 +248,7 @@ class DMRaidArrayDevice(DMDevice, ContainerDevice): + class MultipathDevice(DMDevice): + """ A multipath device """ + _type = "dm-multipath" +- _packages = ["device-mapper-multipath"] ++ _packages = ["multipath-tools"] + _services = ["multipathd"] + _partitionable = True + _isDisk = True +@@ -341,7 +341,7 @@ class MultipathDevice(DMDevice): + class iScsiDiskDevice(DiskDevice, NetworkStorageDevice): + """ An iSCSI disk. """ + _type = "iscsi" +- _packages = ["iscsi-initiator-utils", "dracut-network"] ++ _packages = ["open-iscsi"] + + def __init__(self, device, **kwargs): + """ +@@ -429,7 +429,7 @@ class iScsiDiskDevice(DiskDevice, NetworkStorageDevice): + class FcoeDiskDevice(DiskDevice, NetworkStorageDevice): + """ An FCoE disk. """ + _type = "fcoe" +- _packages = ["fcoe-utils", "dracut-network"] ++ _packages = ["fcoe-utils"] + + def __init__(self, device, **kwargs): + """ +diff --git a/blivet/devices/nfs.py b/blivet/devices/nfs.py +index 513a11c..947ed06 100644 +--- a/blivet/devices/nfs.py ++++ b/blivet/devices/nfs.py +@@ -30,7 +30,7 @@ from .network import NetworkStorageDevice + class NFSDevice(StorageDevice, NetworkStorageDevice): + """ An NFS device """ + _type = "nfs" +- _packages = ["dracut-network"] ++ _packages = [] + + def __init__(self, device, fmt=None, parents=None): + """ +diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py +index 681ff04..b1816a0 100644 +--- a/blivet/formats/fs.py ++++ b/blivet/formats/fs.py +@@ -1230,7 +1230,7 @@ class ReiserFS(FS): + _linuxNative = True + _dump = True + _check = True +- _packages = ["reiserfs-utils"] ++ _packages = ["reiserfsprogs"] + _infofs = "debugreiserfs" + _existingSizeFields = ["Count of blocks on the device:", "Blocksize:"] + partedSystem = fileSystemType["reiserfs"] +@@ -1319,7 +1319,7 @@ class HFSPlus(FS): + _udevTypes = ["hfsplus"] + _mkfs = "mkfs.hfsplus" + _fsck = "fsck.hfsplus" +- _packages = ["hfsplus-tools"] ++ _packages = ["hfsutils"] + _labelfs = fslabeling.HFSPlusLabeling() + _formattable = True + _mountType = "hfsplus" +-- +2.7.4 + diff --git a/dev-python/python-blivet/files/1.0/0002-devices-enable-UUID-for-dm-based-devices-in-fstab.patch b/dev-python/python-blivet/files/1.0/0002-devices-enable-UUID-for-dm-based-devices-in-fstab.patch new file mode 100644 index 000000000..301a64926 --- /dev/null +++ b/dev-python/python-blivet/files/1.0/0002-devices-enable-UUID-for-dm-based-devices-in-fstab.patch @@ -0,0 +1,28 @@ +From 29bf499b8681d883cc95ed0c542db012a895ce99 Mon Sep 17 00:00:00 2001 +From: Fabio Erculiani +Date: Sun, 12 Jun 2016 14:46:17 +0200 +Subject: [PATCH 2/3] devices: enable UUID= for dm-based devices in fstab + +--- + blivet/devices/dm.py | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/blivet/devices/dm.py b/blivet/devices/dm.py +index ca4dd15..f2e3a48 100644 +--- a/blivet/devices/dm.py ++++ b/blivet/devices/dm.py +@@ -84,11 +84,6 @@ class DMDevice(StorageDevice): + return d + + @property +- def fstabSpec(self): +- """ Return the device specifier for use in /etc/fstab. """ +- return self.path +- +- @property + def mapName(self): + """ This device's device-mapper map name """ + return self.name +-- +2.7.4 + diff --git a/dev-python/python-blivet/files/1.0/0003-Call-udev.settle-when-committing-to-disk.patch b/dev-python/python-blivet/files/1.0/0003-Call-udev.settle-when-committing-to-disk.patch new file mode 100644 index 000000000..eeecf0b13 --- /dev/null +++ b/dev-python/python-blivet/files/1.0/0003-Call-udev.settle-when-committing-to-disk.patch @@ -0,0 +1,24 @@ +From 1ae0b66f870e2c1bb97d8034544c4f1f46aeb2dd Mon Sep 17 00:00:00 2001 +From: Fabio Erculiani +Date: Sun, 12 Jun 2016 14:47:46 +0200 +Subject: [PATCH 3/3] Call udev.settle() when committing to disk. + +--- + blivet/formats/disklabel.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/blivet/formats/disklabel.py b/blivet/formats/disklabel.py +index ed42bef..676de82 100644 +--- a/blivet/formats/disklabel.py ++++ b/blivet/formats/disklabel.py +@@ -283,6 +283,7 @@ class DiskLabel(DeviceFormat): + raise DiskLabelCommitError(msg) + else: + self.updateOrigPartedDisk() ++ udev.settle() + + def addPartition(self, start, end, ptype=None): + """ Add a partition to the disklabel. +-- +2.7.4 + diff --git a/dev-python/python-blivet/python-blivet-0.23.9-r3.ebuild b/dev-python/python-blivet/python-blivet-0.23.9-r3.ebuild index 665ea8ae3..ab797f90e 100644 --- a/dev-python/python-blivet/python-blivet-0.23.9-r3.ebuild +++ b/dev-python/python-blivet/python-blivet-0.23.9-r3.ebuild @@ -24,10 +24,11 @@ RDEPEND=">=dev-util/pykickstart-1.99.22 >=sys-block/parted-1.8.1 sys-fs/cryptsetup >=dev-python/python-cryptsetup-0.1.1 - sys-fs/mdadm + sys-fs/btrfs-progs sys-fs/dosfstools >=sys-fs/e2fsprogs-1.41.0 - sys-fs/btrfs-progs + sys-fs/lvm2 + sys-fs/mdadm >=dev-python/pyblock-0.45 sys-fs/multipath-tools sys-process/lsof diff --git a/dev-python/python-blivet/python-blivet-1.0.10.ebuild b/dev-python/python-blivet/python-blivet-1.0.10.ebuild new file mode 100644 index 000000000..3b7a1b911 --- /dev/null +++ b/dev-python/python-blivet/python-blivet-1.0.10.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +SUPPORT_PYTHON_ABIS="1" + +inherit eutils distutils + +REAL_PN="${PN/python-}" + +DESCRIPTION="A python module for system storage configuration" +HOMEPAGE="https://fedoraproject.org/wiki/Blivet" +SRC_URI="https://github.com/rhinstaller/${REAL_PN}/archive/${REAL_PN}-${PV}-1.tar.gz" +RESTRICT="nomirror" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=dev-util/pykickstart-1.99.22 + >=sys-apps/util-linux-2.15.1 + >=sys-block/parted-1.8.1 + sys-fs/cryptsetup + >=dev-python/python-cryptsetup-0.1.1 + >=dev-python/pyparted-2.5 + dev-python/pyudev + sys-fs/mdadm + sys-fs/dosfstools + >=sys-fs/e2fsprogs-1.41.0 + sys-fs/btrfs-progs + >=dev-python/pyblock-0.45 + sys-fs/multipath-tools + =dev-python/python-blivet-1.0