bootstrap: Add lshw package (also in fuel-mirror).

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

Change-Id: Ie10c7819f305accf2a2c2045b1c350880e4c25b6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch b/patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch
index 441e990..5df52fa 100644 (file)
--- a/patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch
+++ b/patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch
@@ -13,12 +13,17 @@ missing deps from local mirror too?
 
 FIXME: Remove udev package from this patch when Ubuntu Trusty on arm64
 fixes persistent device names in the udev it ships out of the box.
+
+FIXME: Remove lshw package from this patch when Ubuntu Trusty on arm64
+fixes bug [1]: "AArch64: slow cpuinfo due to redundant loop".
+
+[1] https://bugs.launchpad.net/ubuntu/+source/lshw/+bug/1582181
 ---
- contrib/fuel_mirror/data/ubuntu.yaml | 3 +++
- 1 file changed, 3 insertions(+)
+ contrib/fuel_mirror/data/ubuntu.yaml | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 diff --git a/contrib/fuel_mirror/data/ubuntu.yaml b/contrib/fuel_mirror/data/ubuntu.yaml
-index 7bc0c4b..4509a9a 100644
+index cd86ec9..2ec4f1d 100644
 --- a/contrib/fuel_mirror/data/ubuntu.yaml
 +++ b/contrib/fuel_mirror/data/ubuntu.yaml
 @@ -77,6 +77,7 @@ packages: &packages
@@ -29,7 +34,15 @@ index 7bc0c4b..4509a9a 100644
       - "build-essential"
       - "cloud-init"
       - "conntrackd"
-@@ -113,6 +114,7 @@ packages: &packages
+@@ -101,6 +102,7 @@ packages: &packages
+      - "linux-image-generic-lts-trusty"
+      - "live-boot"
+      - "livecd-rootfs"
++     - "lshw"
+      - "mc"
+      - "memcached"
+      - "monit"
+@@ -116,6 +118,7 @@ packages: &packages
       - "puppet"
       - "python-lesscpy"
       - "python-pip"
@@ -37,7 +50,7 @@ index 7bc0c4b..4509a9a 100644
       - "rsyslog-gnutls"
       - "rsyslog-relp"
       - "screen"
-@@ -124,6 +126,7 @@ packages: &packages
+@@ -127,6 +130,7 @@ packages: &packages
       - "tmux"
       - "traceroute"
       - "ubuntu-standard"

diff --git a/patches/opnfv-fuel/0031-bootstrap-Add-lshw-package.patch b/patches/opnfv-fuel/0031-bootstrap-Add-lshw-package.patch
new file mode 100644 (file)
index 0000000..09ddb13
--- /dev/null
+++ b/patches/opnfv-fuel/0031-bootstrap-Add-lshw-package.patch
@@ -0,0 +1,30 @@
+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 15d9e9d..b45a14a 100644
+--- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
++++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
+@@ -29,6 +29,7 @@
+     - squashfs-tools
+     - msmtp-mta
+     - armband-rtc-efi-fix
++    - lshw
+   bootstrap_images_dir: /var/www/nailgun/bootstraps
+   active_bootstrap_symlink: /var/www/nailgun/bootstraps/active_bootstrap
+   flavor: ubuntu