summaryrefslogtreecommitdiffstats
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-04-17 17:05:03 +0200
commitf9b8d557900a105483168e75344059cba5435e6e (patch)
tree2276606b2a351c5eda322003b113b009f1cfc13f
parent5569b8a7d32b33bdc0bf47d9d8567192605f15b6 (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
-rw-r--r--TODO.md2
-rw-r--r--patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch (renamed from patches/fuel-agent/0005-FIXME-s-grub-pc-grub-efi-arm64.patch)7
-rw-r--r--patches/opnfv-fuel/0006-bootstrap-Add-armband-rtc-efi-fix-package.patch38
-rw-r--r--patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch (renamed from patches/opnfv-fuel/0006-Allow-customizing-fuel-plugin-qemu.patch)0
-rw-r--r--patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch (renamed from patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-ovsnfv.patch)0
-rw-r--r--patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch (renamed from patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch)0
6 files changed, 44 insertions, 3 deletions
diff --git a/TODO.md b/TODO.md
index 12847c0f..d5dcac5c 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,7 +4,7 @@ List of missing features and things to do
Nice to have, should be fixed before rel
=========================================
* [fuel?] Disabling rx-vlan-filter from Fuel WebUI is not applied during netcheck
-* [thunderx] rtc-efi disable
+* [thunderx] rtc-efi disable (bootstrap handled, target image remaining)
Cleanup tasks
=========================================
diff --git a/patches/fuel-agent/0005-FIXME-s-grub-pc-grub-efi-arm64.patch b/patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch
index a9d3d5bf..38b70450 100644
--- a/patches/fuel-agent/0005-FIXME-s-grub-pc-grub-efi-arm64.patch
+++ b/patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch
@@ -1,8 +1,11 @@
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Tue, 8 Mar 2016 01:06:56 +0100
-Subject: [PATCH] FIXME: s/grub-pc/grub-efi-arm64/
+Subject: [PATCH] FIXME: Ubuntu image: s/grub-pc/grub-efi-arm64/.
-This hard replaced the previously hardcoded grub-pc req.
+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 ...
diff --git a/patches/opnfv-fuel/0006-bootstrap-Add-armband-rtc-efi-fix-package.patch b/patches/opnfv-fuel/0006-bootstrap-Add-armband-rtc-efi-fix-package.patch
new file mode 100644
index 00000000..90c4e977
--- /dev/null
+++ b/patches/opnfv-fuel/0006-bootstrap-Add-armband-rtc-efi-fix-package.patch
@@ -0,0 +1,38 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Sun, 17 Apr 2016 15:37:38 +0200
+Subject: [PATCH] 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.
+
+Fuel 9.0 moved default package list to openstack.yaml fixture, see [1].
+
+[1] https://github.com/openstack/fuel-web/commit/
+ 4ee42effe27694bd231663e3d0f10c0c42877177
+---
+ build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
+index 2e4843d..15d9e9d 100644
+--- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
++++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
+@@ -28,6 +28,7 @@
+ - xz-utils
+ - squashfs-tools
+ - msmtp-mta
++ - armband-rtc-efi-fix
+ bootstrap_images_dir: /var/www/nailgun/bootstraps
+ active_bootstrap_symlink: /var/www/nailgun/bootstraps/active_bootstrap
+ flavor: ubuntu
diff --git a/patches/opnfv-fuel/0006-Allow-customizing-fuel-plugin-qemu.patch b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch
index 4ce6d83e..4ce6d83e 100644
--- a/patches/opnfv-fuel/0006-Allow-customizing-fuel-plugin-qemu.patch
+++ b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch
diff --git a/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-ovsnfv.patch b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch
index c427394f..c427394f 100644
--- a/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-ovsnfv.patch
+++ b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch
diff --git a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch b/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch
index a444a493..a444a493 100644
--- a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch
+++ b/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch