From 1923e97ad0156b9211f76e47a31298484763fddb Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 17 Apr 2016 16:34:18 +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. 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) --- TODO.md | 2 +- ...ME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch} | 7 ++-- ...bootstrap-Add-armband-rtc-efi-fix-package.patch | 38 ++++++++++++++++++++++ ... 0007-Allow-customizing-fuel-plugin-qemu.patch} | 0 ...008-Allow-customizing-fuel-plugin-ovsnfv.patch} | 0 ...low-customizing-fuel-plugin-opendaylight.patch} | 0 6 files changed, 44 insertions(+), 3 deletions(-) rename patches/fuel-agent/{0005-FIXME-s-grub-pc-grub-efi-arm64.patch => 0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch} (76%) create mode 100644 patches/opnfv-fuel/0006-bootstrap-Add-armband-rtc-efi-fix-package.patch rename patches/opnfv-fuel/{0006-Allow-customizing-fuel-plugin-qemu.patch => 0007-Allow-customizing-fuel-plugin-qemu.patch} (100%) rename patches/opnfv-fuel/{0007-Allow-customizing-fuel-plugin-ovsnfv.patch => 0008-Allow-customizing-fuel-plugin-ovsnfv.patch} (100%) rename patches/opnfv-fuel/{0008-Allow-customizing-fuel-plugin-opendaylight.patch => 0009-Allow-customizing-fuel-plugin-opendaylight.patch} (100%) 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 similarity index 76% rename from patches/fuel-agent/0005-FIXME-s-grub-pc-grub-efi-arm64.patch rename to 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 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 +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 similarity index 100% rename from patches/opnfv-fuel/0006-Allow-customizing-fuel-plugin-qemu.patch rename to 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 similarity index 100% rename from patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-ovsnfv.patch rename to 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 similarity index 100% rename from patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch rename to patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch -- 2.16.6