[tor-messenger-build/master] Simplify distribution configuration

22 Oct 2015

commit 6e21f0963a825b5350f89a3eb0c75914b5458a43
Author: Nicolas Vigier <boklm@torproject.org>
Date:   Tue Oct 20 23:54:30 2015 +0200

    Simplify distribution configuration
    
    Define distribution in rbm.conf rather than per project (it is still
    possible to override it in each project).
    
    Use the distribution option rather than lsb_release.
---
 projects/binutils/config         |    8 --------
 projects/docker-image/config     |    4 ++--
 projects/gcc/config              |    8 --------
 projects/instantbird/config      |   12 ------------
 projects/libdmg-hfsplus/config   |    4 ----
 projects/libgcrypt/config        |   13 -------------
 projects/libgpg-error/config     |   13 -------------
 projects/libotr/config           |   13 -------------
 projects/macosx-toolchain/config |    5 -----
 projects/mingw-w64/config        |    4 ----
 projects/python/config           |    6 +-----
 projects/tor-mail/config         |    5 +----
 projects/tor-messenger/config    |   15 +++------------
 rbm.conf                         |    8 +++++---
 14 files changed, 12 insertions(+), 106 deletions(-)

diff --git a/projects/binutils/config b/projects/binutils/config
index dee7ef0..019a6e3 100644
--- a/projects/binutils/config
+++ b/projects/binutils/config
@@ -2,10 +2,6 @@
 version: 2.25
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 remote_docker: 1
-lsb_release:
-  id: Ubuntu
-  release: 10.04
-  codename: lucid
 var:
   deps:
     - build-essential
@@ -16,10 +12,6 @@ targets:
   windows-i686:
     var:
       configure_opt: '--target=i686-w64-mingw32 --disable-multilib --enable-deterministic-archives'
-    lsb_release:
-      id: Ubuntu
-      release: 14.10
-      codename: utopic
 
 input_files:
   - URL: https://ftp.gnu.org/gnu/binutils/binutils-[% c("version") %].tar.bz2
diff --git a/projects/docker-image/config b/projects/docker-image/config
index 0a11fe4..8ab70f5 100644
--- a/projects/docker-image/config
+++ b/projects/docker-image/config
@@ -5,7 +5,7 @@ docker_image_prefix: 'tor-messenger_[% GET ENV.RBM_BUILDNAME ? ENV.RBM_BUILDNAME
 docker_save_image: '[% c("docker_image_prefix") %]:[% c("filename") %]'
 pkg_type: build
 
-docker_image: '[% c("lsb_release/id").lower %]:[% c("lsb_release/codename") %]'
+docker_image: '[% c("lsb_release/id").lower %]:[% c("lsb_release/release") %]'
 
 lsb_release:
   id: '[% pc(c("origin_project", { no_distro => 1 }), "lsb_release/id", { no_distro => 1 }) %]'
@@ -16,7 +16,7 @@ pre: |
   #!/bin/sh
   # [% c('docker_image') %]
   set -e
-  [% IF c('lsb_release/codename') == 'utopic' -%]
+  [% IF c('lsb_release/release') == '14.10' -%]
   sed -i 's/archive\.ubuntu\.com/old-releases.ubuntu.com/' /etc/apt/sources.list
   [% END -%]
   [% IF pc(c('origin_project'), 'var/pre_pkginst') -%]
diff --git a/projects/gcc/config b/projects/gcc/config
index e27929e..b6e0159 100644
--- a/projects/gcc/config
+++ b/projects/gcc/config
@@ -2,10 +2,6 @@
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 version: 4.9.1
 remote_docker: 1
-lsb_release:
-  id: Ubuntu
-  release: 10.04
-  codename: lucid
 var:
   configure_opt: --enable-multilib --enable-languages=c,c++ --with-arch_32=i686
   deps:
@@ -25,10 +21,6 @@ targets:
   osx-x86_64:
     var:
       configure_opt: --enable-multilib --enable-languages=c,c++
-    lsb_release:
-      id: Ubuntu
-      release: 12.04
-      codename: precise
 input_files:
   - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("version") %]/gcc-[% c("version") %].tar.bz2'
     sha256sum: d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e
diff --git a/projects/instantbird/config b/projects/instantbird/config
index 7f1e0fd..0fa9526 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -4,10 +4,6 @@ hg_url: https://hg.mozilla.org/releases/comm-release/
 hg_hash: THUNDERBIRD_41_0b1_RELEASE
 filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %].[% c('var/archive_suffix') %]"
 remote_docker: 1
-lsb_release:
-  id: Ubuntu
-  release: 10.04
-  codename: lucid
 var:
   archive_suffix: tar.bz2
   deps:
@@ -33,10 +29,6 @@ var:
     - ccache
 targets:
   windows-i686:
-    lsb_release:
-      id: Ubuntu
-      release: 14.10
-      codename: utopic
     var:
       archive_suffix: zip
       arch_deps:
@@ -54,10 +46,6 @@ targets:
         - lib32asound2-dev
         - yasm-1
   osx-x86_64:
-    lsb_release:
-      id: Ubuntu
-      release: 12.04
-      codename: precise
     var:
       arch_deps:
         - yasm
diff --git a/projects/libdmg-hfsplus/config b/projects/libdmg-hfsplus/config
index eb02168..9071078 100644
--- a/projects/libdmg-hfsplus/config
+++ b/projects/libdmg-hfsplus/config
@@ -4,10 +4,6 @@ git_url: https://github.com/vasi/libdmg-hfsplus
 git_hash: dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 remote_docker: 1
-lsb_release:
-  id: Ubuntu
-  release: 12.04
-  codename: precise
 var:
   deps:
     - build-essential
diff --git a/projects/libgcrypt/config b/projects/libgcrypt/config
index 25d3c8e..307643f 100644
--- a/projects/libgcrypt/config
+++ b/projects/libgcrypt/config
@@ -2,20 +2,12 @@
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 version: 1.6.4
 remote_docker: 1
-lsb_release:
-  id: Ubuntu
-  release: 10.04
-  codename: lucid
 var:
   deps:
     - build-essential
     - libmpc-dev
 targets:
   windows-i686:
-    lsb_release:
-      id: Ubuntu
-      release: 14.10
-      codename: utopic
     var:
       arch_deps:
         - gettext
@@ -23,11 +15,6 @@ targets:
     var:
       arch_deps:
         - libc6-dev-i386
-  osx-x86_64:
-    lsb_release:
-      id: Ubuntu
-      release: 12.04
-      codename: precise
 input_files:
   - URL: 'ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-[% c("version") %].tar.bz2'
     sig_ext: sig
diff --git a/projects/libgpg-error/config b/projects/libgpg-error/config
index 62978bf..a5ca6f6 100644
--- a/projects/libgpg-error/config
+++ b/projects/libgpg-error/config
@@ -2,20 +2,12 @@
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 version: 1.20
 remote_docker: 1
-lsb_release:
-  id: Ubuntu
-  release: 10.04
-  codename: lucid
 var:
   deps:
     - build-essential
     - libmpc-dev
 targets:
   windows-i686:
-    lsb_release:
-      id: Ubuntu
-      release: 14.10
-      codename: utopic
     var:
       arch_deps:
         - gettext
@@ -23,11 +15,6 @@ targets:
     var:
       arch_deps:
         - libc6-dev-i386
-  osx-x86_64:
-    lsb_release:
-      id: Ubuntu
-      release: 12.04
-      codename: precise
 input_files:
   - URL: 'ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-[% c("version") %].tar.bz2'
     sig_ext: sig
diff --git a/projects/libotr/config b/projects/libotr/config
index 73081c7..21e52e3 100644
--- a/projects/libotr/config
+++ b/projects/libotr/config
@@ -2,10 +2,6 @@
 version: 4.1.0
 filename: 'libotr-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 remote_docker: 1
-lsb_release:
-  id: Ubuntu
-  release: 10.04
-  codename: lucid
 var:
   deps:
     - build-essential
@@ -13,10 +9,6 @@ var:
     - file
 targets:
   windows-i686:
-    lsb_release:
-      id: Ubuntu
-      release: 14.10
-      codename: utopic
     var:
       arch_deps:
         - gettext
@@ -27,11 +19,6 @@ targets:
     var:
       arch_deps:
         - libc6-dev-i386
-  osx-x86_64:
-    lsb_release:
-      id: Ubuntu
-      release: 12.04
-      codename: precise
 input_files:
   - filename: 'libotr-[% c("version") %].tar.gz'
     URL: 'https://otr.cypherpunks.ca/libotr-[% c("version") %].tar.gz'
diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config
index 494ccb6..32b97e4 100644
--- a/projects/macosx-toolchain/config
+++ b/projects/macosx-toolchain/config
@@ -18,11 +18,6 @@ var:
     LD=$ccbindir/x86_64-apple-darwin10-ld
     STRIP=$ccbindir/x86_64-apple-darwin10-strip
 
-lsb_release:
-  id: Ubuntu
-  release: 12.04
-  codename: precise
-
 input_files:
   - name: clang
     URL: https://people.torproject.org/~mikeperry/mirrors/sources/x86_64-apple-darwin...
diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config
index 5817f74..d5fe5ab 100644
--- a/projects/mingw-w64/config
+++ b/projects/mingw-w64/config
@@ -4,10 +4,6 @@ git_url: http://git.code.sf.net/p/mingw-w64/mingw-w64
 git_hash: 548b1984042a1dd66cae95ad8c0003b5e5494a68
 version: '[% c("abbrev") %]'
 remote_docker: 1
-lsb_release:
-  id: Ubuntu
-  release: 14.10
-  codename: utopic
 var:
   gcc_version: 4.9.1
   deps:
diff --git a/projects/python/config b/projects/python/config
index 8362293..ade2cd5 100644
--- a/projects/python/config
+++ b/projects/python/config
@@ -1,10 +1,6 @@
 # vim: filetype=yaml sw=2
 version: 2.7.8
-filename: 'python-[% c("lsb_release/id") %]-[% c("lsb_release/codename") %]-[% c("var/build_id") %].tar.gz'
-lsb_release:
-  id: Ubuntu
-  release: 10.04
-  codename: lucid
+filename: 'python-[% c("lsb_release/id") %]-[% c("lsb_release/release") %]-[% c("var/build_id") %].tar.gz'
 remote_docker: 1
 var:
   deps:
diff --git a/projects/tor-mail/config b/projects/tor-mail/config
index fd1f417..ee29fb2 100644
--- a/projects/tor-mail/config
+++ b/projects/tor-mail/config
@@ -15,10 +15,7 @@ input_files:
   - project: docker-image
 
 remote_docker: 1
-lsb_release:
-  id: Ubuntu
-  release: 12.04
-  codename: precise
+distribution: Ubuntu-12.04
 var:
   deps:
     - bzip2
diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config
index 1e6a9d9..b38a263 100644
--- a/projects/tor-messenger/config
+++ b/projects/tor-messenger/config
@@ -29,10 +29,7 @@ input_files:
   - project: docker-image
 
 remote_docker: 1
-lsb_release:
-  id: Ubuntu
-  release: 12.04
-  codename: precise
+distribution: Ubuntu-12.04
 var:
   filename_ext: 'tar.xz'
   deps:
@@ -40,19 +37,13 @@ var:
     - bzip2
 targets:
   windows-i686:
-    lsb_release:
-      id: Ubuntu
-      release: 14.10
-      codename: utopic
+    distribution: Ubuntu-14.10
     var:
       filename_ext: 'exe'
       arch_deps:
         - nsis
   osx-x86_64:
-    lsb_release:
-      id: Ubuntu
-      release: 12.04
-      codename: precise
+    distribution: Ubuntu-12.04
     var:
       filename_ext: 'dmg'
       arch_deps:
diff --git a/rbm.conf b/rbm.conf
index 76cfcf8..a4d202a 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -12,9 +12,7 @@ var:
     [% c("version") %]
     [% IF c("git_hash"); GET c("abbrev"); END; %]
     [% IF c("remote_docker") -%]
-    [% c("lsb_release/id") %]
-    [% c("lsb_release/release") %]
-    [% c("lsb_release/codename") %]
+    [% c("distribution") %]
     [% END -%]
     input_files:
     [%
@@ -41,12 +39,14 @@ targets:
   noint:
     debug: 0
   linux-x86_64:
+    distribution: Ubuntu-10.04
     arch: x86_64
     var:
       linux: 1
       osname: linux-x86_64
       compiler: gcc
   linux-i686:
+    distribution: Ubuntu-10.04
     arch: i686
     var:
       linux: 1
@@ -54,6 +54,7 @@ targets:
       configure_opt: '--host=i686-linux-gnu CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32'
       compiler: gcc
   windows-i686:
+    distribution: Ubuntu-14.10
     arch: i686
     var:
       windows: 1
@@ -63,6 +64,7 @@ targets:
       LDFLAGS: '-specs=/var/tmp/dist/mingw-w64/msvcr100.spec -mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs'
       compiler: mingw-w64
   osx-x86_64:
+    distribution: Ubuntu-12.04
     arch: x86_64
     var:
       osx: 1

    

boklm＠torproject.org

tags

participants (1)