[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r568: Fix word size setting for large-word s390x build slave.

[Jeff Licquia]

------------------------------------------------------------
revno: 568
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Wed 2014-04-23 16:40:14 -0400
message:
  Fix word size setting for large-word s390x build slave.
modified:
  documentation/buildbot.md
  modules/buildbot/manifests/slave.pp
-------------- next part --------------
=== modified file 'documentation/buildbot.md'
--- a/documentation/buildbot.md	2014-04-23 19:05:52 +0000
+++ b/documentation/buildbot.md	2014-04-23 20:40:14 +0000
@@ -16,14 +16,15 @@
 
     include buildbot::slave
 
-The one complication comes with some of the "small-word" build
-architectures (ppc32, s390).  Since we build those on "large-word"
-distributions, we have to indicate in some way that we should be
-building the "small-word" variant.
+The one complication comes with the architectures with "small" and
+"big" word architectures, where the native hardware is almost all
+"big".  This means we have to build the "small" architecture on a
+"big" system.  On these architectures, we need to configure which word
+size we're building.
 
 This is done in modules/buildbot/manifests/slave.pp.  Look for the
 setting for "$wordsize"; there, you will need to add the hostname of
-the build slave and make sure it's set to "small".
+the build slave and make sure it's set to "small" or "big".
 
 Restarting Buildbot
 -------------------

=== modified file 'modules/buildbot/manifests/slave.pp'
--- a/modules/buildbot/manifests/slave.pp	2014-04-23 19:54:19 +0000
+++ b/modules/buildbot/manifests/slave.pp	2014-04-23 20:40:14 +0000
@@ -29,6 +29,7 @@
         $wordsize = $chroot
     } else {
         $wordsize = $hostname ? {
+            'linfnd1'             => 'big',
             'linfnd2'             => 'small',
             'lfdev-build-power32' => 'small',
             'lfdev-build-power64' => 'big',