bootstrap, dea_base, nailgun: Pin 4.8.0-43 kernel

Since newer kernels have issues with AAVMF + vhost_net,
we need to also temporarily blacklist vhost_net.

NOTE: This change also adds linux-image-extra packages to both x86_64
      and AArch64 target image(s).

TODO: Remove vhost_net blacklist (later).

JIRA: ARMBAND-161
JIRA: ARMBAND-171
JIRA: ARMBAND-227
JIRA: ARMBAND-230
JIRA: ARMBAND-239
JIRA: ARMBAND-244

Change-Id: I456f4235d04375905df9d6f776b84f2e0eee22d6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 8f772f7e9d9d3e41575e3f7010a1717d3b6894ae)

2 files changed, 79 insertions, 39 deletions

diff --git a/patches/opnfv-fuel/arm64-bug-fixes/0002-bootstrap-Pin-kernel-to-4.4.0-45.patch b/patches/opnfv-fuel/arm64-bug-fixes/0002-bootstrap-Pin-kernel-to-4.4.0-45.patch
deleted file mode 100644
index b75c1ffa..00000000
--- a/patches/opnfv-fuel/arm64-bug-fixes/0002-bootstrap-Pin-kernel-to-4.4.0-45.patch
+++ /dev/null
@@ -1,39 +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: Pin kernel to 4.4.0-45
-
-JIRA: https://jira.opnfv.org/browse/ARMBAND-239
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
-index ff5baa8..794cca8 100644
---- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
-+++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
-@@ -13,13 +13,13 @@
-   extra_dirs:
-     - /usr/share/fuel_bootstrap_cli/files/xenial
-   output_dir: /tmp/
--  kernel_flavor: linux-image-generic-lts-xenial
-+  kernel_flavor: linux-image-4.4.0-45-generic
-   packages:
-     - daemonize
-     - fuel-agent
-     - hwloc
-     - i40e-dkms
-     - linux-firmware
-+    - linux-headers-4.4.0-45-generic
--    - linux-headers-generic
-     - live-boot
-     - live-boot-initramfs-tools
diff --git a/patches/opnfv-fuel/arm64-bug-fixes/0002-bootstrap-dea_base-Pin-kernel-to-4.8.0-43.patch b/patches/opnfv-fuel/arm64-bug-fixes/0002-bootstrap-dea_base-Pin-kernel-to-4.8.0-43.patch
new file mode 100644
index 00000000..44677b25
--- /dev/null
+++ b/patches/opnfv-fuel/arm64-bug-fixes/0002-bootstrap-dea_base-Pin-kernel-to-4.8.0-43.patch
@@ -0,0 +1,79 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: 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-43
+
+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-43-generic
+   packages:
+     - daemonize
+     - fuel-agent
+     - hwloc
+     - i40e-dkms
+     - linux-firmware
+-    - linux-headers-generic
++    - linux-image-extra-4.8.0-43-generic
++    - linux-headers-4.8.0-43-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-43-generic
++
++          linux-image-extra-4.8.0-43-generic
+
+-          linux-image-generic-lts-xenial
++          linux-headers-4.8.0-43-generic
+
+           lvm2
+