diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-01-03 14:11:04 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-01-03 05:46:29 +0100 |
| commit | 18a9c4643b7bd1b57284c1beebc1bdafcad34e3f (patch) | |
| tree | 2155c15a9483d9f6f06ae0fcbf11d0b616d3c66c | |
| parent | 27444cdf15fb0eea9effa5c04e6b178edf04417a (diff) | |
armel_cross: add some new dev-armel-cross packages
openssl-dev-armel-cross is added for testing of SSL.
libedit-dev-armel-cross is added for testing of jsondb.
Change-Id: I7a264ef58d989f0c3b1112d7472bd6c9910110c9
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
| -rw-r--r-- | puppet/modules/armel_cross/manifests/ubuntu.pp | 12 | ||||
| -rw-r--r-- | puppet/modules/armel_cross/templates/armel_cross-qtqa.list.erb | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/puppet/modules/armel_cross/manifests/ubuntu.pp b/puppet/modules/armel_cross/manifests/ubuntu.pp index 213d1a1..8e1d390 100644 --- a/puppet/modules/armel_cross/manifests/ubuntu.pp +++ b/puppet/modules/armel_cross/manifests/ubuntu.pp @@ -1,12 +1,16 @@ class armel_cross::ubuntu { - $mesa_dev_armel_cross_version = '7.11.2-0qtqa7' - - package { "mesa-dev-armel-cross": - ensure => $mesa_dev_armel_cross_version, + # Everything depends on this + Package { require => File["/etc/apt/sources.list.d/armel_cross-qtqa.list"], } + package { + "mesa-dev-armel-cross": ensure => '7.11.2-0qtqa7'; # for QtGui + "openssl-dev-armel-cross": ensure => '1.0.0e-0qtqa1'; # for QtNetwork + "libedit-dev-armel-cross": ensure => '2.11-20080614-2.2qtqa5'; # for QtJsonDb + } + package { "g++-arm-linux-gnueabi": ensure => present, } diff --git a/puppet/modules/armel_cross/templates/armel_cross-qtqa.list.erb b/puppet/modules/armel_cross/templates/armel_cross-qtqa.list.erb index cbe8e7f..ad060ec 100644 --- a/puppet/modules/armel_cross/templates/armel_cross-qtqa.list.erb +++ b/puppet/modules/armel_cross/templates/armel_cross-qtqa.list.erb @@ -1,2 +1,2 @@ -# qtqa-cross provides package mesa-dev-armel-cross for compiling qt5 for ARM. +# qtqa-cross provides some packages for compiling qt5 for ARM. deb http://ppa.launchpad.net/rohanpm/qtqa-cross/ubuntu <%= lsbdistcodename %> main |