Remove obsolete/old downstream patches
This commit is contained in:
Vojtech Trefny
parent
43b699a261
commit
80785d6d1c
@ -1,32 +0,0 @@
|
|||||||
From 2f90040ff66eacc9715e370cd49ffb72d8d1f36f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Vojtech Trefny <vtrefny@redhat.com>
|
|
||||||
Date: Wed, 11 Jul 2018 15:36:24 +0200
|
|
||||||
Subject: [PATCH] Force command line based libblockdev LVM plugin
|
|
||||||
|
|
||||||
---
|
|
||||||
blivet/__init__.py | 9 +++++++--
|
|
||||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/blivet/__init__.py b/blivet/__init__.py
|
|
||||||
index c5a75bb8..cb759173 100644
|
|
||||||
--- a/blivet/__init__.py
|
|
||||||
+++ b/blivet/__init__.py
|
|
||||||
@@ -63,11 +63,16 @@ def log_bd_message(level, msg):
|
|
||||||
from gi.repository import GLib
|
|
||||||
from gi.repository import BlockDev as blockdev
|
|
||||||
if arch.is_s390():
|
|
||||||
- _REQUESTED_PLUGIN_NAMES = set(("lvm", "btrfs", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "s390", "nvdimm"))
|
|
||||||
+ _REQUESTED_PLUGIN_NAMES = set(("btrfs", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "s390", "nvdimm"))
|
|
||||||
else:
|
|
||||||
- _REQUESTED_PLUGIN_NAMES = set(("lvm", "btrfs", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "nvdimm"))
|
|
||||||
+ _REQUESTED_PLUGIN_NAMES = set(("btrfs", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "nvdimm"))
|
|
||||||
|
|
||||||
_requested_plugins = blockdev.plugin_specs_from_names(_REQUESTED_PLUGIN_NAMES)
|
|
||||||
+# XXX force non-dbus LVM plugin
|
|
||||||
+lvm_plugin = blockdev.PluginSpec()
|
|
||||||
+lvm_plugin.name = blockdev.Plugin.LVM
|
|
||||||
+lvm_plugin.so_name = "libbd_lvm.so.2"
|
|
||||||
+_requested_plugins.append(lvm_plugin)
|
|
||||||
try:
|
|
||||||
# do not check for dependencies during libblockdev initializtion, do runtime
|
|
||||||
# checks instead
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
From 48d19a9835ebb6743ec03e4c9182c8cc74db4cf8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Vojtech Trefny <vtrefny@redhat.com>
|
|
||||||
Date: Wed, 3 Oct 2018 14:11:08 +0200
|
|
||||||
Subject: [PATCH] Fix options for ISCSI functions (#1632656)
|
|
||||||
|
|
||||||
Correct mutual authentication options in UDisks are
|
|
||||||
"reverse-username" and "reverse-password".
|
|
||||||
---
|
|
||||||
blivet/iscsi.py | 8 ++++----
|
|
||||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/blivet/iscsi.py b/blivet/iscsi.py
|
|
||||||
index b979e01c..ca51f8ed 100644
|
|
||||||
--- a/blivet/iscsi.py
|
|
||||||
+++ b/blivet/iscsi.py
|
|
||||||
@@ -385,9 +385,9 @@ class iSCSI(object):
|
|
||||||
if password:
|
|
||||||
auth_info["password"] = GLib.Variant("s", password)
|
|
||||||
if r_username:
|
|
||||||
- auth_info["r_username"] = GLib.Variant("s", r_username)
|
|
||||||
+ auth_info["reverse-username"] = GLib.Variant("s", r_username)
|
|
||||||
if r_password:
|
|
||||||
- auth_info["r_password"] = GLib.Variant("s", r_password)
|
|
||||||
+ auth_info["reverse-password"] = GLib.Variant("s", r_password)
|
|
||||||
|
|
||||||
args = GLib.Variant("(sqa{sv})", (ipaddr, int(port), auth_info))
|
|
||||||
nodes, _n_nodes = self._call_initiator_method("DiscoverSendTargets", args)
|
|
||||||
@@ -423,9 +423,9 @@ class iSCSI(object):
|
|
||||||
if password:
|
|
||||||
auth_info["password"] = GLib.Variant("s", password)
|
|
||||||
if r_username:
|
|
||||||
- auth_info["r_username"] = GLib.Variant("s", r_username)
|
|
||||||
+ auth_info["reverse-username"] = GLib.Variant("s", r_username)
|
|
||||||
if r_password:
|
|
||||||
- auth_info["r_password"] = GLib.Variant("s", r_password)
|
|
||||||
+ auth_info["reverse-password"] = GLib.Variant("s", r_password)
|
|
||||||
|
|
||||||
try:
|
|
||||||
self._login(node, auth_info)
|
|
||||||
--
|
|
||||||
2.17.1
|
|
||||||
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
From 0910d469af8158a37cc6f103a22bd368c99cfb20 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Vendula Poncova <vponcova@redhat.com>
|
|
||||||
Date: Wed, 12 Jun 2019 13:39:13 +0200
|
|
||||||
Subject: [PATCH] Remove teardown_all from the populate method
|
|
||||||
|
|
||||||
It is not possible to protect devices from teardown when the
|
|
||||||
auto_dev_updates flag is set. So let's remove teardown_all from
|
|
||||||
the populate method and let users to do that.
|
|
||||||
---
|
|
||||||
blivet/populator/populator.py | 3 ---
|
|
||||||
1 file changed, 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/blivet/populator/populator.py b/blivet/populator/populator.py
|
|
||||||
index ebe205e6..465c272d 100644
|
|
||||||
--- a/blivet/populator/populator.py
|
|
||||||
+++ b/blivet/populator/populator.py
|
|
||||||
@@ -416,9 +416,6 @@ def populate(self, cleanup_only=False):
|
|
||||||
parted.clear_exn_handler()
|
|
||||||
self._hide_ignored_disks()
|
|
||||||
|
|
||||||
- if flags.auto_dev_updates:
|
|
||||||
- self.teardown_all()
|
|
||||||
-
|
|
||||||
def _populate(self):
|
|
||||||
log.info("DeviceTree.populate: ignored_disks is %s ; exclusive_disks is %s",
|
|
||||||
self.ignored_disks, self.exclusive_disks)
|
|
||||||
@ -1,40 +0,0 @@
|
|||||||
From 2050395b053e4813da20f1c3bc39d74a8e45803f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
Date: Thu, 7 Mar 2019 20:57:59 +0000
|
|
||||||
Subject: [PATCH] Support legacy MBR (msdos) as part of UEFI to enable hybrid
|
|
||||||
builds
|
|
||||||
|
|
||||||
The UEFI spec supports legacy MBR (msdos) in section 5.2 of the UEFI 2.7 spec [1].
|
|
||||||
There's a number of use cases where we might boot on a UEFI device but want to
|
|
||||||
support, but not by default, the creation of images using legacy MBR partitions.
|
|
||||||
One of these use cases is cloud images where we can produce a single image
|
|
||||||
tha will run on UEFI supported, including secure-boot, clouds but also
|
|
||||||
support AWS which only supports MBR partitioning schemes [2] and in the current
|
|
||||||
config anaconda fails the install where this is a perfectly valid and widely
|
|
||||||
supported deployment mechanism.
|
|
||||||
|
|
||||||
So enable the ability to use legacy msdos partitioning schemes, but don't use
|
|
||||||
it for default installs, so people may consume this mechanism using kickstarts
|
|
||||||
rather than having the install fail for a valid use case.
|
|
||||||
|
|
||||||
[1] https://uefi.org/sites/default/files/resources/UEFI%20Spec%202_7_A%20Sept%206.pdf
|
|
||||||
[2] https://docs.aws.amazon.com/vm-import/latest/userguide/vmie_prereqs.html
|
|
||||||
|
|
||||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
---
|
|
||||||
blivet/formats/disklabel.py | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/blivet/formats/disklabel.py b/blivet/formats/disklabel.py
|
|
||||||
index 75867d6a..8186d1a1 100644
|
|
||||||
--- a/blivet/formats/disklabel.py
|
|
||||||
+++ b/blivet/formats/disklabel.py
|
|
||||||
@@ -228,7 +228,7 @@ def get_platform_label_types(cls):
|
|
||||||
elif arch.is_efi() and arch.is_arm():
|
|
||||||
label_types = ["msdos", "gpt"]
|
|
||||||
elif arch.is_efi() and not arch.is_aarch64():
|
|
||||||
- label_types = ["gpt"]
|
|
||||||
+ label_types = ["gpt", "msdos"]
|
|
||||||
elif arch.is_s390():
|
|
||||||
label_types = ["msdos", "dasd"]
|
|
||||||
|
|
||||||
@ -1,181 +0,0 @@
|
|||||||
From ec8e27664a6a551647ace23bfd5d16036db95bd6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
Date: Tue, 7 Aug 2018 15:11:56 +0100
|
|
||||||
Subject: [PATCH 1/4] arch: arm: drop omap specifics for partitioning
|
|
||||||
|
|
||||||
We've long stopped supporting or using any specifics around OMAP
|
|
||||||
ARM machines and all ARM platforms support the extlinux means of
|
|
||||||
doing things one way or another.
|
|
||||||
|
|
||||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
---
|
|
||||||
blivet/arch.py | 4 ----
|
|
||||||
blivet/devices/partition.py | 3 ---
|
|
||||||
2 files changed, 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/blivet/arch.py b/blivet/arch.py
|
|
||||||
index 20fe4f57..f30b2d8b 100644
|
|
||||||
--- a/blivet/arch.py
|
|
||||||
+++ b/blivet/arch.py
|
|
||||||
@@ -352,10 +352,6 @@ def is_ipseries():
|
|
||||||
return is_ppc() and get_ppc_machine() in ("iSeries", "pSeries")
|
|
||||||
|
|
||||||
|
|
||||||
-def is_omap_arm():
|
|
||||||
- return is_arm() and get_arm_machine() == "omap"
|
|
||||||
-
|
|
||||||
-
|
|
||||||
def get_arch():
|
|
||||||
"""
|
|
||||||
:return: The hardware architecture
|
|
||||||
diff --git a/blivet/devices/partition.py b/blivet/devices/partition.py
|
|
||||||
index 47ff547b..623e1c9d 100644
|
|
||||||
--- a/blivet/devices/partition.py
|
|
||||||
+++ b/blivet/devices/partition.py
|
|
||||||
@@ -421,9 +421,6 @@ class PartitionDevice(StorageDevice):
|
|
||||||
# On ARM images '/' must be the last partition.
|
|
||||||
if self.format.mountpoint == "/":
|
|
||||||
weight = -100
|
|
||||||
- elif (arch.is_omap_arm() and
|
|
||||||
- self.format.mountpoint == "/boot/uboot" and self.format.type == "vfat"):
|
|
||||||
- weight = 5000
|
|
||||||
elif arch.is_ppc():
|
|
||||||
if arch.is_pmac() and self.format.type == "appleboot":
|
|
||||||
weight = 5000
|
|
||||||
--
|
|
||||||
2.18.0
|
|
||||||
|
|
||||||
|
|
||||||
From be145b613ceea45edf4e2d522d28113300d706fa Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
Date: Thu, 16 Aug 2018 14:32:19 +0100
|
|
||||||
Subject: [PATCH 2/4] arch: arm: drop get_arm_machine function
|
|
||||||
|
|
||||||
The get_arm_machine function was used when we had to have detection for which
|
|
||||||
arm specific kernel to install. The last userr of this was the omap check for
|
|
||||||
special partitioning which is no longer used due to extlinux support so we can
|
|
||||||
now drop this function too.
|
|
||||||
|
|
||||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
---
|
|
||||||
blivet/arch.py | 22 ----------------------
|
|
||||||
blivet/flags.py | 2 --
|
|
||||||
2 files changed, 24 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/blivet/arch.py b/blivet/arch.py
|
|
||||||
index f30b2d8b..55ce8108 100644
|
|
||||||
--- a/blivet/arch.py
|
|
||||||
+++ b/blivet/arch.py
|
|
||||||
@@ -33,7 +33,6 @@ from __future__ import absolute_import
|
|
||||||
|
|
||||||
import os
|
|
||||||
|
|
||||||
-from .flags import flags
|
|
||||||
from .storage_log import log_exception_info
|
|
||||||
|
|
||||||
import logging
|
|
||||||
@@ -182,27 +181,6 @@ def is_aarch64():
|
|
||||||
return os.uname()[4] == 'aarch64'
|
|
||||||
|
|
||||||
|
|
||||||
-def get_arm_machine():
|
|
||||||
- """
|
|
||||||
- :return: The ARM processor variety type, or None if not ARM.
|
|
||||||
- :rtype: string
|
|
||||||
-
|
|
||||||
- """
|
|
||||||
- if not is_arm():
|
|
||||||
- return None
|
|
||||||
-
|
|
||||||
- if flags.arm_platform:
|
|
||||||
- return flags.arm_platform
|
|
||||||
-
|
|
||||||
- arm_machine = os.uname()[2].rpartition('.')[2]
|
|
||||||
-
|
|
||||||
- if arm_machine.startswith('arm'):
|
|
||||||
- # @TBD - Huh? Don't you want the arm machine name here?
|
|
||||||
- return None
|
|
||||||
- else:
|
|
||||||
- return arm_machine
|
|
||||||
-
|
|
||||||
-
|
|
||||||
def is_cell():
|
|
||||||
"""
|
|
||||||
:return: True if the hardware is the Cell platform, False otherwise.
|
|
||||||
diff --git a/blivet/flags.py b/blivet/flags.py
|
|
||||||
index 18401218..4e26d82f 100644
|
|
||||||
--- a/blivet/flags.py
|
|
||||||
+++ b/blivet/flags.py
|
|
||||||
@@ -57,8 +57,6 @@ class Flags(object):
|
|
||||||
self.jfs = True
|
|
||||||
self.reiserfs = True
|
|
||||||
|
|
||||||
- self.arm_platform = None
|
|
||||||
-
|
|
||||||
self.gpt = False
|
|
||||||
|
|
||||||
# for this flag to take effect,
|
|
||||||
--
|
|
||||||
2.18.0
|
|
||||||
|
|
||||||
|
|
||||||
From 34595cfef911f9512558b02216eaf58d0fdd6786 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
Date: Thu, 16 Aug 2018 14:35:30 +0100
|
|
||||||
Subject: [PATCH 3/4] Aarch64 platforms: Fix gpt defaults for 64 bit arm
|
|
||||||
platforms
|
|
||||||
|
|
||||||
The 46165f589d commit added support for msdos needed on some aarch64 devices
|
|
||||||
but it messed up the gpt defaults, this was fixed in 4908746c3a but this now
|
|
||||||
defaults back to msdos so we put in an aarch64 options to put gpt first again.
|
|
||||||
|
|
||||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
---
|
|
||||||
blivet/formats/disklabel.py | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/blivet/formats/disklabel.py b/blivet/formats/disklabel.py
|
|
||||||
index 44f9834c..e93a4c13 100644
|
|
||||||
--- a/blivet/formats/disklabel.py
|
|
||||||
+++ b/blivet/formats/disklabel.py
|
|
||||||
@@ -223,6 +223,8 @@ class DiskLabel(DeviceFormat):
|
|
||||||
label_types = ["msdos", "gpt"]
|
|
||||||
if arch.is_pmac():
|
|
||||||
label_types = ["mac"]
|
|
||||||
+ elif arch.is_aarch64():
|
|
||||||
+ label_types = ["gpt", "msdos"]
|
|
||||||
elif arch.is_efi() and not arch.is_aarch64():
|
|
||||||
label_types = ["gpt"]
|
|
||||||
elif arch.is_s390():
|
|
||||||
--
|
|
||||||
2.18.0
|
|
||||||
|
|
||||||
|
|
||||||
From 461623d49963618a30bd960d48c6d34f1d076917 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
Date: Thu, 16 Aug 2018 14:38:16 +0100
|
|
||||||
Subject: [PATCH 4/4] arm: add support for EFI on ARMv7
|
|
||||||
|
|
||||||
We now can support EFI for ARMv7 so add/enabled the checks for ARM too.
|
|
||||||
|
|
||||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
---
|
|
||||||
blivet/formats/disklabel.py | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/blivet/formats/disklabel.py b/blivet/formats/disklabel.py
|
|
||||||
index e93a4c13..e13ab2f8 100644
|
|
||||||
--- a/blivet/formats/disklabel.py
|
|
||||||
+++ b/blivet/formats/disklabel.py
|
|
||||||
@@ -225,6 +225,8 @@ class DiskLabel(DeviceFormat):
|
|
||||||
label_types = ["mac"]
|
|
||||||
elif arch.is_aarch64():
|
|
||||||
label_types = ["gpt", "msdos"]
|
|
||||||
+ elif arch.is_efi() and arch.is_arm():
|
|
||||||
+ label_types = ["msdos", "gpt"]
|
|
||||||
elif arch.is_efi() and not arch.is_aarch64():
|
|
||||||
label_types = ["gpt"]
|
|
||||||
elif arch.is_s390():
|
|
||||||
--
|
|
||||||
2.18.0
|
|
||||||
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
From d01281a69e317d7bae4a7698edb6583b6310d5c1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Lehman <dlehman@redhat.com>
|
|
||||||
Date: Tue, 19 Mar 2019 11:51:47 -0400
|
|
||||||
Subject: [PATCH] Ensure correct type of mpath cache member list.
|
|
||||||
|
|
||||||
Related: rhbz#1672971
|
|
||||||
---
|
|
||||||
blivet/static_data/mpath_info.py | 7 +++++--
|
|
||||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/blivet/static_data/mpath_info.py b/blivet/static_data/mpath_info.py
|
|
||||||
index 49ba4709..64958ba8 100644
|
|
||||||
--- a/blivet/static_data/mpath_info.py
|
|
||||||
+++ b/blivet/static_data/mpath_info.py
|
|
||||||
@@ -42,8 +42,11 @@ def is_mpath_member(self, device):
|
|
||||||
:param str device: path of the device to query
|
|
||||||
|
|
||||||
"""
|
|
||||||
- if self._members is None and availability.BLOCKDEV_MPATH_PLUGIN.available:
|
|
||||||
- self._members = set(blockdev.mpath.get_mpath_members())
|
|
||||||
+ if self._members is None:
|
|
||||||
+ if availability.BLOCKDEV_MPATH_PLUGIN.available:
|
|
||||||
+ self._members = set(blockdev.mpath.get_mpath_members())
|
|
||||||
+ else:
|
|
||||||
+ self._members = set()
|
|
||||||
|
|
||||||
device = os.path.realpath(device)
|
|
||||||
device = device[len("/dev/"):]
|
|
||||||
Loading…
Reference in New Issue
Block a user