aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-10 22:43:47 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-10 22:43:47 +0200
commite6aeadf741d89446c058804b8737cf87286a6337 (patch)
treec6cb62c5a8950136ded11bc03ac2f8a09deff960
parenteaf1948214369f3ad4b7fe7639c7d7907ae43195 (diff)
Cleanup: Drop obsoleted hardcode, now in fixture.
We used to change the harcoded grub-pc with grub-efi-arm64, but since Mitaka now adds package list overrides in fixtures [1], we may remove this obsolete patch. [1] https://github.com/openstack/fuel-web/commit/ 4ee42effe27694bd231663e3d0f10c0c42877177 Change-Id: I6707b4dbf3823f356c7ff2367215a41e287b80ac Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch b/patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch
deleted file mode 100644
index 6dd23060..00000000
--- a/patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Tue, 8 Mar 2016 01:06:56 +0100
-Subject: [PATCH] FIXME: Ubuntu image: s/grub-pc/grub-efi-arm64/.
-
-This patch replaces previously hardcoded 'grub-pc' package
-requirement for target image building with 'grub-efi-arm64'.
-
-Naturally, target image will only support arm64 UEFI-enabled systems.
-
-Fuel 9.0 moved default package list to openstack.yaml fixture, see [1].
-TODO: At least make this arch-dependant for mos8 ...
-
-[1] https://github.com/openstack/fuel-web/commit/
- 4ee42effe27694bd231663e3d0f10c0c42877177
----
- fuel_agent/drivers/nailgun.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fuel_agent/drivers/nailgun.py b/fuel_agent/drivers/nailgun.py
-index 0ae81f9..bc532b4 100644
---- a/fuel_agent/drivers/nailgun.py
-+++ b/fuel_agent/drivers/nailgun.py
-@@ -684,7 +684,7 @@ class NailgunBuildImage(BaseDataDriver):
- "daemonize",
- "debconf-utils",
- "gdisk",
-- "grub-pc",
-+ "grub-efi-arm64",
- "hpsa-dkms",
- "i40e-dkms",
- "linux-firmware",