From d6f0b449f673cd5a5514fa9b250bce6e691f67de Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 24 May 2016 16:14:18 +0200 Subject: 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 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 --- ...-fuel-agent-dependencies-to-Ubuntu-mirror.patch | 23 +++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'patches/fuel-mirror') 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 441e990c..5df52fa1 100644 --- 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" -- cgit 1.2.3-korg