diff options
| author | Tony SarajΓ€rvi <tony.sarajarvi@digia.com> | 2013-10-10 13:06:01 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-10 13:58:07 +0200 |
| commit | 9e815ee5523fae1cc90b0128d634085a8574d621 (patch) | |
| tree | 7d87cf881cf702d5dff5b9cafb7e5cbbc7631e9f | |
| parent | ea4a1373d0bb9bc82d761cebd6414715e4737a93 (diff) | |
Modified Puppet's qt_prereqs to support OpenSuSE
Task-number: QTQAINFRA-745
Change-Id: I56a1c16fd937d7b77c848843f88fc7241eff1209
Reviewed-by: Heikki Halmet <heikki.halmet@digia.com>
| -rw-r--r-- | puppet/modules/qt_prereqs/manifests/init.pp | 3 | ||||
| -rw-r--r-- | puppet/modules/qt_prereqs/manifests/opensuse.pp | 30 | ||||
| -rw-r--r-- | puppet/modules/qt_prereqs/manifests/ubuntu.pp (renamed from puppet/modules/qt_prereqs/manifests/linux.pp) | 2 |
3 files changed, 33 insertions, 2 deletions
diff --git a/puppet/modules/qt_prereqs/manifests/init.pp b/puppet/modules/qt_prereqs/manifests/init.pp index 2a41a1b..05dc431 100644 --- a/puppet/modules/qt_prereqs/manifests/init.pp +++ b/puppet/modules/qt_prereqs/manifests/init.pp @@ -18,7 +18,8 @@ class qt_prereqs( case $::operatingsystem { Darwin: { include qt_prereqs::mac } - Ubuntu: { include qt_prereqs::linux } + Ubuntu: { include qt_prereqs::ubuntu } + OpenSuSE: { include qt_prereqs::opensuse } Linux: { include qt_prereqs::linux } Solaris: { include qt_prereqs::solaris } } diff --git a/puppet/modules/qt_prereqs/manifests/opensuse.pp b/puppet/modules/qt_prereqs/manifests/opensuse.pp new file mode 100644 index 0000000..02c4b3a --- /dev/null +++ b/puppet/modules/qt_prereqs/manifests/opensuse.pp @@ -0,0 +1,30 @@ +class qt_prereqs::opensuse inherits qt_prereqs::unix { + + package { + # for android: + "java-1_7_0-openjdk-devel": ensure => installed; + + "gcc-c++": ensure => installed; + "make": ensure => installed; + + # List from http://qt-project.org/wiki/Building-Qt-5-from-Git + # libxcb +# "xorg-x11-libxcb-devel": ensure => installed; # does not exist + "xcb-util-devel": ensure => installed; + "xcb-util-image-devel": ensure => installed; + "xcb-util-keysyms-devel": ensure => installed; + "xcb-util-renderutil-devel": ensure => installed; + "xcb-util-wm-devel": ensure => installed; + "xorg-x11-devel": ensure => installed; + "libxkbcommon-devel": ensure => installed; + # Qt WebKit + "flex": ensure => installed; + "bison": ensure => installed; + "gperf": ensure => installed; + "libicu-devel": ensure => installed; + + # DBus development libraries + "dbus-1-devel": ensure => installed; + } +} + diff --git a/puppet/modules/qt_prereqs/manifests/linux.pp b/puppet/modules/qt_prereqs/manifests/ubuntu.pp index 0af000b..3a0aa84 100644 --- a/puppet/modules/qt_prereqs/manifests/linux.pp +++ b/puppet/modules/qt_prereqs/manifests/ubuntu.pp @@ -1,4 +1,4 @@ -class qt_prereqs::linux inherits qt_prereqs::unix { +class qt_prereqs::ubuntu inherits qt_prereqs::unix { $gstreamer = $::operatingsystem ? { Ubuntu => "libgstreamer0.10-dev", |