kernel-flavor: Add linux-image-generic-lts-xenial

Ubuntu arm64: While keeping kernel 4.2 for Trusty
(linux-image-generic-lts-trusty), add 4.4 backported from Xenial
(linux-image-generic-lts-xenial) to Armband ISO.

Xenial kernel 4.4 for Trusty has been tested with:
- AMD Softiron;
- APM Mustang;
- Cavium ThunderX;

While at it, remove obsoleted armband-rtc-efi-fix Debian package,
which was only needed on targets that are not compatible with 4.4,
and we plan on retiring soon.

v2->v3:
- keep 4.2 kernel instead of replacing it;
- selecting 4.4 kernel will be done via deploy settings, by
  overriding kernel flavor when calling `fuel-bootstrap`;
- dropped test changes, not needed when both 4.2 and 4.4 are in;

TODO:
- switch default kernel flavor to 4.4 when all our PODs are ready;

Closes: ARMBAND-48
Change-Id: I37600f12dd01facbd552f1d2d721bc7a3e0e2750
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

3 files changed, 27 insertions, 40 deletions

diff --git a/patches/fuel-mirror/0003-kernel-flavor-Add-linux-image-generic-lts-xenial.patch b/patches/fuel-mirror/0003-kernel-flavor-Add-linux-image-generic-lts-xenial.patch
new file mode 100644
index 00000000..6be21dac
--- /dev/null
+++ b/patches/fuel-mirror/0003-kernel-flavor-Add-linux-image-generic-lts-xenial.patch
@@ -0,0 +1,26 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Wed, 13 Jul 2016 21:33:04 +0200
+Subject: [PATCH] kernel-flavor: Add linux-image-generic-lts-xenial
+
+Ubuntu arm64: While keeping kernel 4.2 for Trusty
+(linux-image-generic-lts-trusty), add 4.4 backported from Xenial
+(linux-image-generic-lts-xenial) to local mirror in Armband ISO.
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ contrib/fuel_mirror/data/ubuntu.yaml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/fuel_mirror/data/ubuntu.yaml b/contrib/fuel_mirror/data/ubuntu.yaml
+index 2ec4f1d..b8c0ae4 100644
+--- a/contrib/fuel_mirror/data/ubuntu.yaml
++++ b/contrib/fuel_mirror/data/ubuntu.yaml
+@@ -98,6 +98,8 @@ packages: &packages
+      - "linux-firmware-nonfree"
+      - "linux-headers-generic-lts-trusty"
+      - "linux-image-generic-lts-trusty"
++     - "linux-headers-generic-lts-xenial"
++     - "linux-image-generic-lts-xenial"
+      - "live-boot"
+      - "livecd-rootfs"
+      - "lshw"
diff --git a/patches/opnfv-fuel/0023-bootstrap-Add-armband-rtc-efi-fix-package.patch b/patches/opnfv-fuel/0023-bootstrap-Add-armband-rtc-efi-fix-package.patch
deleted file mode 100644
index 813fbafb..00000000
--- a/patches/opnfv-fuel/0023-bootstrap-Add-armband-rtc-efi-fix-package.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
-@@ -7,6 +7,7 @@
-   output_dir: /tmp/
-   kernel_flavor: linux-image-generic-lts-trusty
-   packages:
-+    - armband-rtc-efi-fix
-     - fuel-agent
-     - hwloc
-     - hpsa-dkms
diff --git a/patches/opnfv-fuel/0028-bootstrap-Add-lshw-package.patch b/patches/opnfv-fuel/0028-bootstrap-Add-lshw-package.patch
index 7120086e..a811f2f3 100644
--- a/patches/opnfv-fuel/0028-bootstrap-Add-lshw-package.patch
+++ b/patches/opnfv-fuel/0028-bootstrap-Add-lshw-package.patch
@@ -20,8 +20,7 @@ diff --git a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml b/build/f_isoro
 index 15d9e9d..b45a14a 100644
 --- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
 +++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
-@@ -17,6 +17,7 @@
-     - linux-headers-generic
+@@ -17,5 +17,6 @@
      - live-boot
      - live-boot-initramfs-tools
 +    - lshw