summaryrefslogtreecommitdiffstats
path: root/patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-04-17 16:34:18 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-02 14:29:35 +0000
commit1923e97ad0156b9211f76e47a31298484763fddb (patch)
treedb07948471e78a7153ea07d72080745f9d4c28f0 /patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch
parentc8d4df8f8f0eb85ed44b97a987d231d9bc4dcc9f (diff)
bootstrap: Add 'armband-rtc-efi-fix' package
Older ThunderX and possibly other UEFI-enabled targets do not support rtc-efi properly, so they end up filling dmesg with useless complaints about not being able to read system time. armband-rtc-efi-fix validates rtc-efi can be used on the system, otherwise it rmmods rtc_efi kernel module via rcS script. This patch hardcodes the addition of armband-rtc-ef-fix package during bootstrap image build. NOTES: This could be later removed or, if other fixes need to be delivered like this, grouped in a meta package. Target OS (Ubuntu) still needs to be handled, preferably by blacklisting rtc-efi module and rebuilding initramfs during provisioning. Fuel 9.0 moved default package list to openstack.yaml fixture, see [1]. [1] https://github.com/openstack/fuel-web/commit/ 4ee42effe27694bd231663e3d0f10c0c42877177 Change-Id: I57d632e3915058bbb1fc56b3a7fbd5d15787f9d9 (cherry picked from commit f9b8d557900a105483168e75344059cba5435e6e)
Diffstat (limited to 'patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch')
-rw-r--r--patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch31
1 files changed, 31 insertions, 0 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
new file mode 100644
index 00000000..38b70450
--- /dev/null
+++ b/patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch
@@ -0,0 +1,31 @@
+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 c2fef69..3807ca7 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",