[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r418: Update beta and released SDK.

[Jeff Licquia]

------------------------------------------------------------
revno: 418
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Tue 2013-04-02 00:17:28 -0400
message:
  Update beta and released SDK.
modified:
  modules/buildbot/manifests/slave.pp
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/slave.pp'
--- a/modules/buildbot/manifests/slave.pp	2013-03-13 17:43:50 +0000
+++ b/modules/buildbot/manifests/slave.pp	2013-04-02 04:17:28 +0000
@@ -34,28 +34,39 @@
     # Which SDKs should we use for released and beta builds?
 
     $releasedsdk = "${architecture}-${::chroot}" ? {
-        /^i386/         => 'lsb-sdk-4.1.5-1.ia32.tar.gz',
-        /^x86_64/       => 'lsb-sdk-4.1.5-1.x86_64.tar.gz',
-        /^ia64/         => 'lsb-sdk-4.1.5-1.ia64.tar.gz',
-        /^s390x-small$/ => 'lsb-sdk-4.1.5-1.s390.tar.gz',
-        /^s390x-big$/   => 'lsb-sdk-4.1.5-1.s390x.tar.gz',
-        /^ppc64-small$/ => 'lsb-sdk-4.1.5-1.ppc32.tar.gz',
-        /^ppc64-big$/   => 'lsb-sdk-4.1.5-1.ppc64.tar.gz',
+        /^i386/         => 'lsb-sdk-4.1.6-2.ia32.tar.gz',
+        /^x86_64/       => 'lsb-sdk-4.1.6-2.x86_64.tar.gz',
+        /^ia64/         => 'lsb-sdk-4.1.6-2.ia64.tar.gz',
+        /^s390x-small$/ => 'lsb-sdk-4.1.6-2.s390.tar.gz',
+        /^s390x-big$/   => 'lsb-sdk-4.1.6-2.s390x.tar.gz',
+        /^ppc64-small$/ => 'lsb-sdk-4.1.6-2.ppc32.tar.gz',
+        /^ppc64-big$/   => 'lsb-sdk-4.1.6-2.ppc64.tar.gz',
     }
 
     $releasedsdkpath = 'bundles/released-4.1.0/sdk'
 
-    $betasdk = "${architecture}-${::chroot}" ? {
-        /^i386/         => 'lsb-sdk-4.1.6-1.ia32.tar.gz',
-        /^x86_64/       => 'lsb-sdk-4.1.6-1.x86_64.tar.gz',
-        /^ia64/         => 'lsb-sdk-4.1.6-1.ia64.tar.gz',
-        /^s390x-small$/ => 'lsb-sdk-4.1.6-1.s390.tar.gz',
-        /^s390x-big$/   => 'lsb-sdk-4.1.6-1.s390x.tar.gz',
-        /^ppc64-small$/ => 'lsb-sdk-4.1.6-1.ppc32.tar.gz',
-        /^ppc64-big$/   => 'lsb-sdk-4.1.6-1.ppc64.tar.gz',
-    }
-
-    $betasdkpath = 'bundles/beta/sdk'
+    # For beta SDKs, most of the time we just want to use
+    # the released SDK for the beta SDK.  But when they are
+    # actually different, we need to specify that here.
+    # Use this set of declarations for a separate beta SDK.
+
+    #$betasdk = "${architecture}-${::chroot}" ? {
+    #    /^i386/         => 'lsb-sdk-4.1.6-1.ia32.tar.gz',
+    #    /^x86_64/       => 'lsb-sdk-4.1.6-1.x86_64.tar.gz',
+    #    /^ia64/         => 'lsb-sdk-4.1.6-1.ia64.tar.gz',
+    #    /^s390x-small$/ => 'lsb-sdk-4.1.6-1.s390.tar.gz',
+    #    /^s390x-big$/   => 'lsb-sdk-4.1.6-1.s390x.tar.gz',
+    #    /^ppc64-small$/ => 'lsb-sdk-4.1.6-1.ppc32.tar.gz',
+    #    /^ppc64-big$/   => 'lsb-sdk-4.1.6-1.ppc64.tar.gz',
+    #}
+
+    #$betasdkpath = 'bundles/beta/sdk'
+
+    # Use this set of declarations to set the beta SDK
+    # to be the same as the released SDK.
+
+    $betasdk = $releasedsdk
+    $betasdkpath = $releasedsdkpath
 
     # Special downloaded packages needed for builds from the LSB.
     # XXX: this should migrate to using package repositories and