[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r496: Pull in automake 1.4 on build slaves for desktop-test build.

Jeff Licquia licquia at linuxfoundation.org
Mon Jul 15 15:53:05 UTC 2013


------------------------------------------------------------
revno: 496
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Mon 2013-07-15 11:53:05 -0400
message:
  Pull in automake 1.4 on build slaves for desktop-test build.
modified:
  modules/buildbot/manifests/slavepkgs.pp
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/slavepkgs.pp'
--- a/modules/buildbot/manifests/slavepkgs.pp	2013-07-11 17:18:23 +0000
+++ b/modules/buildbot/manifests/slavepkgs.pp	2013-07-15 15:53:05 +0000
@@ -123,6 +123,12 @@
         /^Fedora/ => 'bison',
         default   => 'bison',
     }
+
+    # automake 1.4 is needed by the gtkvts portion of desktop-test
+    $automakepkg = $operatingsystem ? {
+        /^Fedora/ => 'automake14',
+        default   => 'automake',
+    }
     
     # need libc.a to build a chroot test in runtime-test and for lsbrun
 
@@ -323,7 +329,7 @@
     # Most packages needed for a typical slave; see the definitions
     # above for $fontutilpkg and $xdevelpkg for the interesting ones.
     $pkglist = [ "$rpmpkg", "$gpluspluspkg", "$pkgconfigpkg", 'cvs',
-                 "$javapkg", 'autoconf', 'automake', 'libtool', "$bisonpkg",
+                 "$javapkg", 'autoconf', "$automakepkg", 'libtool', "$bisonpkg",
                  'flex', "$xgettextpkg", 'rsync', "$intltoolpkg",
                  "$glibdevelpkg", "$pamdevelpkg", "$expectpkg",
                  "$expatdevelpkg", 'perl', "$libcstaticpkg", 



More information about the lsb-messages mailing list