summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/arm64-bug-fixes
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-04-09 15:42:01 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-04-24 16:32:58 +0000
commitf4296ca4cf69c632b53ce1dacf9333b290b8a014 (patch)
treee77bdc912eccf7b9ccdd60acb7079c78ce4c6307 /patches/opnfv-fuel/arm64-bug-fixes
parentbf84b5e16c0c54c76b86393ce674ec6b604ddeb1 (diff)
fuel, docs: fuel-menu: Align defaults with OPNFV
Since Armband alters the bootstrap package list and/or kernel version, hanlded previously by fuel_bootstrap_cli.yaml, we need to refactor our patches a bit. NOTE: deploy-cache: We no longer include bootstrap package list in the bootstrap fingerprint; we only rely on the repo mirrors fingerprints, since bootstrap package list is mostly static across release cycles. Upstream-bug: https://bugs.launchpad.net/fuel/+bug/1679636 JIRA: FUEL-266 JIRA: ARMBAND-225 Change-Id: I6c1b090df6eff69d60fa7ca779b3dde527e77879 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 48a9297abfe3b35da1a5c3e8b44a823be24af00e)
Diffstat (limited to 'patches/opnfv-fuel/arm64-bug-fixes')
-rw-r--r--patches/opnfv-fuel/arm64-bug-fixes/0001-bootstrap-Add-lshw-package.patch38
-rw-r--r--patches/opnfv-fuel/arm64-bug-fixes/0002-bootstrap-dea_base-Pin-kernel-to-4.8.0-9944.patch79
2 files changed, 0 insertions, 117 deletions
diff --git a/patches/opnfv-fuel/arm64-bug-fixes/0001-bootstrap-Add-lshw-package.patch b/patches/opnfv-fuel/arm64-bug-fixes/0001-bootstrap-Add-lshw-package.patch
deleted file mode 100644
index 7f1d3b3b..00000000
--- a/patches/opnfv-fuel/arm64-bug-fixes/0001-bootstrap-Add-lshw-package.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Tue, 24 May 2016 16:42:21 +0200
-Subject: [PATCH] bootstrap: Add lshw package.
-
-Until Ubuntu Trusty fixes the following bug on AArch64 [1]:
-"AArch64: slow cpuinfo due to redundant loop"
-we will be using a patched version of <lshw> from Armband MOS repos.
-
-This change enforces replacing the lshw from Ubuntu with our custom,
-patched package.
-
-[1] https://bugs.launchpad.net/ubuntu/+source/lshw/+bug/1582181
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- 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 fcf4257..264ae0e 100644
---- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
-+++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
-@@ -24,6 +24,7 @@
- - linux-headers-generic
- - live-boot
- - live-boot-initramfs-tools
-+ - lshw
- - mc
- - mcollective
- - msmtp-mta
diff --git a/patches/opnfv-fuel/arm64-bug-fixes/0002-bootstrap-dea_base-Pin-kernel-to-4.8.0-9944.patch b/patches/opnfv-fuel/arm64-bug-fixes/0002-bootstrap-dea_base-Pin-kernel-to-4.8.0-9944.patch
deleted file mode 100644
index b0269419..00000000
--- a/patches/opnfv-fuel/arm64-bug-fixes/0002-bootstrap-dea_base-Pin-kernel-to-4.8.0-9944.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Tue, 14 Mar 2017 19:56:50 +0100
-Subject: [PATCH] bootstrap, dea_base: Pin kernel to 4.8.0-9944
-
-Since newer kernels have issues with AAVMF + vhost_net,
-we need to also temporarily blacklist vhost_net.
-
-TODO: Remove vhost_net blacklist (later).
-
-JIRA: https://jira.opnfv.org/browse/ARMBAND-161
-JIRA: https://jira.opnfv.org/browse/ARMBAND-171
-JIRA: https://jira.opnfv.org/browse/ARMBAND-227
-JIRA: https://jira.opnfv.org/browse/ARMBAND-230
-JIRA: https://jira.opnfv.org/browse/ARMBAND-239
-JIRA: https://jira.opnfv.org/browse/ARMBAND-244
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml | 5 +++--
- deploy/config/dea_base.yaml | 8 ++++++--
- 2 files changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
-index ff5baa8..42765b6 100644
---- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
-+++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
-@@ -13,14 +13,15 @@
- extra_dirs:
- - /usr/share/fuel_bootstrap_cli/files/xenial
- output_dir: /tmp/
-- kernel_flavor: linux-image-generic-lts-xenial
-+ kernel_flavor: linux-image-4.8.0-9944-generic
- packages:
- - daemonize
- - fuel-agent
- - hwloc
- - i40e-dkms
- - linux-firmware
-- - linux-headers-generic
-+ - linux-image-extra-4.8.0-9944-generic
-+ - linux-headers-4.8.0-9944-generic
- - live-boot
- - live-boot-initramfs-tools
- - lshw
-diff --git a/deploy/config/dea_base.yaml b/deploy/config/dea_base.yaml
-index 386686f..2a5928e 100644
---- a/deploy/config/dea_base.yaml
-+++ b/deploy/config/dea_base.yaml
-@@ -534,6 +534,8 @@ settings:
-
- anacron
-
-+ armband-vhost-net-blacklist
-+
- bash-completion
-
- bridge-utils
-@@ -560,9 +562,11 @@ settings:
-
- linux-firmware
-
-- linux-headers-generic-lts-xenial
-+ linux-image-4.8.0-9944-generic
-+
-+ linux-image-extra-4.8.0-9944-generic
-
-- linux-image-generic-lts-xenial
-+ linux-headers-4.8.0-9944-generic
-
- lvm2
-