EFI: Move patches to Fuel@OPNFV, upstream prep

Now we can kill fuel-astute submodule.

Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

2 files changed, 0 insertions, 114 deletions

diff --git a/patches/fuel-agent/0005-Add-esp-partition-flag.patch b/patches/fuel-agent/0005-Add-esp-partition-flag.patch
deleted file mode 100644
index 2ecec416..00000000
--- a/patches/fuel-agent/0005-Add-esp-partition-flag.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Tue, 8 Mar 2016 16:29:39 +0100
-Subject: [PATCH] Add <esp> partition flag.
-
-Parted flag <esp> (see [1]) will mark EFI system partition, allowing us
-to properly format and mount it during do_partitioning deployment phase.
-
-[1] https://www.gnu.org/software/parted/manual/html_node/set.html
----
- fuel_agent/drivers/nailgun.py | 2 +-
- fuel_agent/utils/partition.py | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/fuel_agent/drivers/nailgun.py b/fuel_agent/drivers/nailgun.py
-index c2fef69..0ae81f9 100644
---- a/fuel_agent/drivers/nailgun.py
-+++ b/fuel_agent/drivers/nailgun.py
-@@ -324,7 +324,7 @@ class Nailgun(BaseDataDriver):
-             # uefi partition (for future use)
-             LOG.debug('Adding UEFI partition on disk %s: size=200' %
-                       disk['name'])
--            parted.add_partition(size=200)
-+            parted.add_partition(size=200, flags=['esp'])
- 
-             LOG.debug('Looping over all volumes on disk %s' % disk['name'])
-             for volume in disk['volumes']:
-diff --git a/fuel_agent/utils/partition.py b/fuel_agent/utils/partition.py
-index acdd0b3..86349d2 100644
---- a/fuel_agent/utils/partition.py
-+++ b/fuel_agent/utils/partition.py
-@@ -93,7 +93,7 @@ def set_partition_flag(dev, num, flag, state='on'):
-     :param dev: A device file, e.g. /dev/sda.
-     :param num: Partition number
-     :param flag: Flag name. Must be one of 'bios_grub', 'legacy_boot',
--    'boot', 'raid', 'lvm'
-+    'boot', 'raid', 'lvm', 'esp'
-     :param state: Desiable flag state. 'on' or 'off'. Default is 'on'.
- 
-     :returns: None
-@@ -103,7 +103,7 @@ def set_partition_flag(dev, num, flag, state='on'):
-     # parted supports more flags but we are interested in
-     # setting only this subset of them.
-     # not all of these flags are compatible with one another.
--    if flag not in ('bios_grub', 'legacy_boot', 'boot', 'raid', 'lvm'):
-+    if flag not in ('bios_grub', 'legacy_boot', 'boot', 'raid', 'lvm', 'esp'):
-         raise errors.WrongPartitionSchemeError(
-             'Unsupported partition flag: %s' % flag)
-     if state not in ('on', 'off'):
diff --git a/patches/fuel-agent/0007-Add-fs-for-efi-partition.patch b/patches/fuel-agent/0007-Add-fs-for-efi-partition.patch
deleted file mode 100644
index 0fb94215..00000000
--- a/patches/fuel-agent/0007-Add-fs-for-efi-partition.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
-Date: Tue, 8 Mar 2016 21:08:55 +0100
-Subject: [PATCH] Add fs for efi partition
-
----
- debian/control                |  1 +
- fuel_agent/drivers/nailgun.py | 13 ++++++++++---
- specs/fuel-agent.spec         |  1 +
- 3 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/debian/control b/debian/control
-index 189dc00..acfda35 100644
---- a/debian/control
-+++ b/debian/control
-@@ -39,6 +39,7 @@ Depends: bzip2,
- 	 qemu-user-static,
- 	 binfmt-support,
- 	 dmidecode,
-+	 dosfstools,
- 	 ethtool,
- 	 gdisk,
- 	 genisoimage,
-diff --git a/fuel_agent/drivers/nailgun.py b/fuel_agent/drivers/nailgun.py
-index bc532b4..f092865 100644
---- a/fuel_agent/drivers/nailgun.py
-+++ b/fuel_agent/drivers/nailgun.py
-@@ -81,6 +81,9 @@ class Nailgun(BaseDataDriver):
-         # was already allocated on first matching volume
-         # or not
-         self._boot_partition_done = False
-+        # this var states whether ESP partition was already
-+        # allocated on the first matching volume or not
-+        self._esp_partition_done = False
-         # this var is used as a flag that /boot fs
-         # has already been added. we need this to
-         # get rid of md over all disks for /boot partition.
-@@ -321,10 +324,14 @@ class Nailgun(BaseDataDriver):
-             LOG.debug('Adding bios_grub partition on disk %s: size=24' %
-                       disk['name'])
-             parted.add_partition(size=24, flags=['bios_grub'])
--            # uefi partition (for future use)
--            LOG.debug('Adding UEFI partition on disk %s: size=200' %
-+            # uefi partition - added only once.
-+            if self._is_boot_disk(disk) and not self._esp_partition_done:
-+                LOG.debug('Adding UEFI partition on disk %s: size=200' %
-                       disk['name'])
--            parted.add_partition(size=200, flags=['esp'])
-+                prt = parted.add_partition(size=200, flags=['esp'])
-+                partition_scheme.add_fs(device=prt.name, mount='/boot/efi',
-+                                        fs_type='vfat')
-+                self._esp_partition_done = True
- 
-             LOG.debug('Looping over all volumes on disk %s' % disk['name'])
-             for volume in disk['volumes']:
-diff --git a/specs/fuel-agent.spec b/specs/fuel-agent.spec
-index a43f693..c2b9b51 100644
---- a/specs/fuel-agent.spec
-+++ b/specs/fuel-agent.spec
-@@ -50,6 +50,7 @@ Requires:    xfsprogs
- Requires:    pciutils
- Requires:    ethtool
- Requires:    debootstrap
-+Requires:    dosfstools
- Requires:    dpkg
- Requires:    qemu-user-static
- Requires:    xz