diff options
| author | Tony SarajΓ€rvi <tony.sarajarvi@digia.com> | 2014-05-12 12:03:49 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-12 12:04:21 +0200 |
| commit | 948c917b99d6acf87b8875610fe19969be728b2c (patch) | |
| tree | 82b4c09c51495780a3d60a8ce2b2c8fb4eace7d1 | |
| parent | 3303062d9cad25b8ce9fa0a046e2509c007caaec (diff) | |
Remove restriction from QNX's install module
Puppet was restricted to install QNX's SPD only on
64 bit Ubuntu 12.04. This restriction is now removed
so that it is installed on all Ubuntus.
Change-Id: Id2fe0744fac517c67dfadb38f851bd39981a919e
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
| -rw-r--r-- | puppet/modules/qnx/manifests/linux.pp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/puppet/modules/qnx/manifests/linux.pp b/puppet/modules/qnx/manifests/linux.pp index ddac633..2b872f4 100644 --- a/puppet/modules/qnx/manifests/linux.pp +++ b/puppet/modules/qnx/manifests/linux.pp @@ -29,16 +29,12 @@ class qnx::linux } } - if $::lsbmajdistrelease == 12 { - if $::architecture == amd64 { - qnx_install { - "sdp": - filename => "$filename", - options => "xz --strip-components=1", - target => "$target", - url => "$url", - ; - } - } + qnx_install { + "sdp": + filename => "$filename", + options => "xz --strip-components=1", + target => "$target", + url => "$url", + ; } } |