diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-26 15:02:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-05-26 15:02:18 +0000 |
| commit | db85b247c8d7098bdaf48f5d6cc1dee3c85f34f6 (patch) | |
| tree | bf95db630ca9785c20ca43a1696c8d99c1910a02 | |
| parent | f99f04973d6fb9bfd1f0fef411c8d7cfa5a4469f (diff) | |
| parent | d6f0b449f673cd5a5514fa9b250bce6e691f67de (diff) | |
Merge "bootstrap: Add lshw package (also in fuel-mirror)."
| -rw-r--r-- | patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch | 23 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0031-bootstrap-Add-lshw-package.patch | 30 |
2 files changed, 48 insertions, 5 deletions
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" 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 index 00000000..09ddb13f --- /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 |