From f9b8d557900a105483168e75344059cba5435e6e Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sun, 17 Apr 2016 16:34:18 +0200
Subject: 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
---
TODO.md | 2 +-
.../0005-FIXME-s-grub-pc-grub-efi-arm64.patch | 28 ----------------
...XME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch | 31 ++++++++++++++++++
.../0006-Allow-customizing-fuel-plugin-qemu.patch | 21 ------------
...bootstrap-Add-armband-rtc-efi-fix-package.patch | 38 ++++++++++++++++++++++
...0007-Allow-customizing-fuel-plugin-ovsnfv.patch | 22 -------------
.../0007-Allow-customizing-fuel-plugin-qemu.patch | 21 ++++++++++++
...llow-customizing-fuel-plugin-opendaylight.patch | 26 ---------------
...0008-Allow-customizing-fuel-plugin-ovsnfv.patch | 22 +++++++++++++
...llow-customizing-fuel-plugin-opendaylight.patch | 26 +++++++++++++++
10 files changed, 139 insertions(+), 98 deletions(-)
delete mode 100644 patches/fuel-agent/0005-FIXME-s-grub-pc-grub-efi-arm64.patch
create mode 100644 patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch
delete mode 100644 patches/opnfv-fuel/0006-Allow-customizing-fuel-plugin-qemu.patch
create mode 100644 patches/opnfv-fuel/0006-bootstrap-Add-armband-rtc-efi-fix-package.patch
delete mode 100644 patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-ovsnfv.patch
create mode 100644 patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch
delete mode 100644 patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch
create mode 100644 patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch
create mode 100644 patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch
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/0005-FIXME-s-grub-pc-grub-efi-arm64.patch
deleted file mode 100644
index a9d3d5bf..00000000
--- a/patches/fuel-agent/0005-FIXME-s-grub-pc-grub-efi-arm64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/
-
-This hard replaced the previously hardcoded grub-pc req.
-
-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",
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",
diff --git a/patches/opnfv-fuel/0006-Allow-customizing-fuel-plugin-qemu.patch b/patches/opnfv-fuel/0006-Allow-customizing-fuel-plugin-qemu.patch
deleted file mode 100644
index 4ce6d83e..00000000
--- a/patches/opnfv-fuel/0006-Allow-customizing-fuel-plugin-qemu.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
-Date: Fri, 4 Mar 2016 14:27:48 +0100
-Subject: [PATCH] Allow customizing fuel-plugin-qemu
-
----
- build/f_isoroot/f_qemupluginbuild/config.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/build/f_isoroot/f_qemupluginbuild/config.mk b/build/f_isoroot/f_qemupluginbuild/config.mk
-index 0b84654..e7fb65a 100644
---- a/build/f_isoroot/f_qemupluginbuild/config.mk
-+++ b/build/f_isoroot/f_qemupluginbuild/config.mk
-@@ -7,6 +7,6 @@
- # http://www.apache.org/licenses/LICENSE-2.0
- ##############################################################################
-
--QEMU_BRANCH=c35ce3377bcf382a4e36f1df49758100cd2910b1
--QEMU_REPO=https://review.openstack.org/openstack/fuel-plugin-qemu
-+QEMU_BRANCH:=c35ce3377bcf382a4e36f1df49758100cd2910b1
-+QEMU_REPO:=https://review.openstack.org/openstack/fuel-plugin-qemu
- QEMU_CHANGE=
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/0007-Allow-customizing-fuel-plugin-ovsnfv.patch b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-ovsnfv.patch
deleted file mode 100644
index c427394f..00000000
--- a/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-ovsnfv.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
-Date: Sat, 5 Mar 2016 15:08:10 +0100
-Subject: [PATCH] Allow customizing fuel-plugin-ovsnfv
-
----
- build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk
-index 1893fce..f29dab5 100644
---- a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk
-+++ b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk
-@@ -7,7 +7,7 @@
- # http://www.apache.org/licenses/LICENSE-2.0
- ##############################################################################
-
--OVSNFV_DPDK_BRANCH=stable/brahmaputra
--OVSNFV_DPDK_REPO=https://gerrit.opnfv.org/gerrit/p/ovsnfv.git
-+OVSNFV_DPDK_BRANCH:=stable/brahmaputra
-+OVSNFV_DPDK_REPO:=https://gerrit.opnfv.org/gerrit/p/ovsnfv.git
- OVSNFV_DPDK_DIR=fuel-plugin-ovsnfv
- OVSNFV_DPDK_CHANGE=
diff --git a/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch
new file mode 100644
index 00000000..4ce6d83e
--- /dev/null
+++ b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch
@@ -0,0 +1,21 @@
+From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
+Date: Fri, 4 Mar 2016 14:27:48 +0100
+Subject: [PATCH] Allow customizing fuel-plugin-qemu
+
+---
+ build/f_isoroot/f_qemupluginbuild/config.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build/f_isoroot/f_qemupluginbuild/config.mk b/build/f_isoroot/f_qemupluginbuild/config.mk
+index 0b84654..e7fb65a 100644
+--- a/build/f_isoroot/f_qemupluginbuild/config.mk
++++ b/build/f_isoroot/f_qemupluginbuild/config.mk
+@@ -7,6 +7,6 @@
+ # http://www.apache.org/licenses/LICENSE-2.0
+ ##############################################################################
+
+-QEMU_BRANCH=c35ce3377bcf382a4e36f1df49758100cd2910b1
+-QEMU_REPO=https://review.openstack.org/openstack/fuel-plugin-qemu
++QEMU_BRANCH:=c35ce3377bcf382a4e36f1df49758100cd2910b1
++QEMU_REPO:=https://review.openstack.org/openstack/fuel-plugin-qemu
+ QEMU_CHANGE=
diff --git a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch
deleted file mode 100644
index a444a493..00000000
--- a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Florin Dumitrascu <florin.dumitrascu@enea.com>
-Date: Thu, 17 Mar 2016 19:37:19 +0100
-Subject: [PATCH] Allow customizing fuel-plugin-opendaylight
-
-Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com>
----
- build/f_isoroot/f_odlpluginbuild/config.mk | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk
-index 4ebf519..86d7b76 100644
---- a/build/f_isoroot/f_odlpluginbuild/config.mk
-+++ b/build/f_isoroot/f_odlpluginbuild/config.mk
-@@ -7,9 +7,9 @@
- # http://www.apache.org/licenses/LICENSE-2.0
- ##############################################################################
-
--ODL_BRANCH=brahmaputra-sr2
--ODL_CHANGE=ec9474c1178e7451ec75f6e306ac84424a84a28a
--ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git"
-+ODL_BRANCH:=brahmaputra-sr2
-+ODL_CHANGE:=ec9474c1178e7451ec75f6e306ac84424a84a28a
-+ODL_REPO:="https://github.com/openstack/fuel-plugin-opendaylight.git"
-
- export USE_JAVA8=true
- export JAVA8_URL:=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb
diff --git a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch
new file mode 100644
index 00000000..c427394f
--- /dev/null
+++ b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch
@@ -0,0 +1,22 @@
+From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
+Date: Sat, 5 Mar 2016 15:08:10 +0100
+Subject: [PATCH] Allow customizing fuel-plugin-ovsnfv
+
+---
+ build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk
+index 1893fce..f29dab5 100644
+--- a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk
++++ b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk
+@@ -7,7 +7,7 @@
+ # http://www.apache.org/licenses/LICENSE-2.0
+ ##############################################################################
+
+-OVSNFV_DPDK_BRANCH=stable/brahmaputra
+-OVSNFV_DPDK_REPO=https://gerrit.opnfv.org/gerrit/p/ovsnfv.git
++OVSNFV_DPDK_BRANCH:=stable/brahmaputra
++OVSNFV_DPDK_REPO:=https://gerrit.opnfv.org/gerrit/p/ovsnfv.git
+ OVSNFV_DPDK_DIR=fuel-plugin-ovsnfv
+ OVSNFV_DPDK_CHANGE=
diff --git a/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch b/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch
new file mode 100644
index 00000000..a444a493
--- /dev/null
+++ b/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch
@@ -0,0 +1,26 @@
+From: Florin Dumitrascu <florin.dumitrascu@enea.com>
+Date: Thu, 17 Mar 2016 19:37:19 +0100
+Subject: [PATCH] Allow customizing fuel-plugin-opendaylight
+
+Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com>
+---
+ build/f_isoroot/f_odlpluginbuild/config.mk | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk
+index 4ebf519..86d7b76 100644
+--- a/build/f_isoroot/f_odlpluginbuild/config.mk
++++ b/build/f_isoroot/f_odlpluginbuild/config.mk
+@@ -7,9 +7,9 @@
+ # http://www.apache.org/licenses/LICENSE-2.0
+ ##############################################################################
+
+-ODL_BRANCH=brahmaputra-sr2
+-ODL_CHANGE=ec9474c1178e7451ec75f6e306ac84424a84a28a
+-ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git"
++ODL_BRANCH:=brahmaputra-sr2
++ODL_CHANGE:=ec9474c1178e7451ec75f6e306ac84424a84a28a
++ODL_REPO:="https://github.com/openstack/fuel-plugin-opendaylight.git"
+
+ export USE_JAVA8=true
+ export JAVA8_URL:=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb
--
cgit