[tbb-commits] [tor-browser-bundle/master] Package clean-up in descriptors.

gk at torproject.org gk at torproject.org
Tue Sep 30 07:16:44 UTC 2014


commit 232148eea6b7ce3816da757eb2532d0d40dc7050
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Sep 19 13:26:59 2014 +0000

    Package clean-up in descriptors.
---
 gitian/descriptors/linux/gitian-bundle.yml                 |    7 ++-----
 gitian/descriptors/linux/gitian-firefox.yml                |   12 ++----------
 gitian/descriptors/linux/gitian-pluggable-transports.yml   |    9 ++++-----
 gitian/descriptors/linux/gitian-tor.yml                    |    9 +++------
 gitian/descriptors/linux/gitian-utils.yml                  |    8 ++------
 gitian/descriptors/mac/gitian-bundle.yml                   |   12 +++++-------
 gitian/descriptors/mac/gitian-firefox.yml                  |    6 ++----
 gitian/descriptors/mac/gitian-pluggable-transports.yml     |   10 ++++------
 gitian/descriptors/mac/gitian-tor.yml                      |    8 ++------
 gitian/descriptors/mac/gitian-utils.yml                    |    8 ++------
 gitian/descriptors/windows/gitian-bundle.yml               |    4 +---
 gitian/descriptors/windows/gitian-firefox.yml              |    6 ++----
 gitian/descriptors/windows/gitian-pluggable-transports.yml |   11 ++++-------
 gitian/descriptors/windows/gitian-tor.yml                  |    8 ++------
 gitian/descriptors/windows/gitian-utils.yml                |   12 ++++--------
 15 files changed, 41 insertions(+), 89 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml
index d3b030c..19233b6 100644
--- a/gitian/descriptors/linux/gitian-bundle.yml
+++ b/gitian/descriptors/linux/gitian-bundle.yml
@@ -6,13 +6,10 @@ architectures:
 - "i386"
 - "amd64"
 packages:
-- "git-core"
+- "faketime"
 - "unzip"
 - "zip"
-- "faketime"
-- "python"
-- "rnv"
-- "xz-utils"
+# Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5.
 - "libxslt1.1"
 - "sqlite3"
 reference_datetime: "2000-01-01 00:00:00"
diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml
index d7958b0..5d47b96 100644
--- a/gitian/descriptors/linux/gitian-firefox.yml
+++ b/gitian/descriptors/linux/gitian-firefox.yml
@@ -8,21 +8,13 @@ architectures:
 packages:
 - "unzip"
 - "zip"
-- "libglib2.0-dev"
+- "autoconf2.13"
 - "libgtk2.0-dev"
-- "libdbus-1-dev"
 - "libdbus-glib-1-dev"
 - "yasm-1"
 - "libasound2-dev"
-- "libcurl4-openssl-dev"
-- "libxt-dev"
-- "mesa-common-dev"
-- "autoconf"
-- "autoconf2.13"
-- "libtool"
-- "libiw-dev"
-- "hardening-wrapper"
 - "libgstreamer-plugins-base0.10-dev"
+- "hardening-wrapper"
 # To pass configure since ESR 31.
 - "libpulse-dev"
 # We built GCC but not the libmpc2, thus we need to install it.
diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml
index f9e2b51..7e23ec5 100644
--- a/gitian/descriptors/linux/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml
@@ -6,14 +6,13 @@ architectures:
 - "i386"
 - "amd64"
 packages:
-- "git-core"
+- "faketime"
 - "unzip"
-- "zip"
-- "swig"
-- "m4"
 - "python-setuptools"
 - "python-dev"
-- "faketime"
+# Needed by M2Crypto
+- "swig"
+- "zip"
 - "hardening-wrapper"
 reference_datetime: "2000-01-01 00:00:00"
 remotes:
diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml
index 2dccff6..aad9368 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -6,16 +6,13 @@ architectures:
 - "i386"
 - "amd64"
 packages:
-- "git-core"
+- "faketime"
 - "unzip"
-- "zip"
-- "autoconf"
-- "autoconf2.13"
 - "automake"
-- "faketime"
 - "libtool"
-- "hardening-wrapper"
 - "zlib1g-dev"
+- "zip"
+- "hardening-wrapper"
 reference_datetime: "2000-01-01 00:00:00"
 remotes:
 - "url": "https://git.torproject.org/tor.git"
diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml
index 59ef707..0c5e38c 100644
--- a/gitian/descriptors/linux/gitian-utils.yml
+++ b/gitian/descriptors/linux/gitian-utils.yml
@@ -6,14 +6,10 @@ architectures:
 - "i386"
 - "amd64"
 packages:
-- "git-core"
-- "unzip"
-- "zip"
-- "autoconf"
-- "autoconf2.13"
-- "automake"
 - "faketime"
+- "automake"
 - "libtool"
+- "zip"
 - "hardening-wrapper"
 # Needed for compiling gold.
 - "bison"
diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml
index bd8bb5d..82b6595 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -5,19 +5,17 @@ suites:
 architectures:
 - "amd64"
 packages:
-- "git-core"
+- "faketime"
 - "unzip"
 - "zip"
-- "faketime"
-- "python"
-- "hfsprogs"
+# Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5.
+- "python-lxml"
+- "sqlite3"
+# Needed for the .dmgs
 - "genisoimage"
 - "cmake"
 - "zlib1g-dev"
 - "libbz2-dev"
-# Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5.
-- "python-lxml"
-- "sqlite3"
 reference_datetime: "2000-01-01 00:00:00"
 remotes:
 - "url": "https://git.torproject.org/tor-launcher.git"
diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml
index b07a261..fc36472 100644
--- a/gitian/descriptors/mac/gitian-firefox.yml
+++ b/gitian/descriptors/mac/gitian-firefox.yml
@@ -5,12 +5,10 @@ suites:
 architectures:
 - "amd64"
 packages:
-- "git-core"
-- "unzip"
-- "zip"
-- "autoconf"
 - "autoconf2.13"
+- "unzip"
 - "yasm"
+- "zip"
 reference_datetime: "2000-01-01 00:00:00"
 remotes:
 - "url": "https://git.torproject.org/tor-browser.git"
diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml
index d0322f8..33df49f 100644
--- a/gitian/descriptors/mac/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml
@@ -5,15 +5,13 @@ suites:
 architectures:
 - "i386"
 packages:
-- "git-core"
+- "faketime"
 - "unzip"
-- "zip"
-- "swig"
-- "m4"
 - "python-setuptools"
 - "python-dev"
-- "faketime"
-- "libtool"
+# Needed by M2Crypto
+- "swig"
+- "zip"
 reference_datetime: "2000-01-01 00:00:00"
 remotes:
 - "url": "https://git.torproject.org/pluggable-transports/pyptlib.git"
diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml
index ee8a556..6022c0b 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -5,14 +5,10 @@ suites:
 architectures:
 - "i386"
 packages:
-- "git-core"
+- "faketime"
 - "unzip"
-- "zip"
-- "autoconf"
-- "autoconf2.13"
 - "automake"
-- "faketime"
-- "libtool"
+- "zip"
 reference_datetime: "2000-01-01 00:00:00"
 remotes:
 - "url": "https://git.torproject.org/tor.git"
diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml
index 3c6e4a7..785d88c 100644
--- a/gitian/descriptors/mac/gitian-utils.yml
+++ b/gitian/descriptors/mac/gitian-utils.yml
@@ -5,14 +5,10 @@ suites:
 architectures:
 - "i386"
 packages:
-- "git-core"
-- "unzip"
-- "zip"
-- "autoconf"
-- "autoconf2.13"
-- "automake"
 - "faketime"
+- "automake"
 - "libtool"
+- "zip"
 reference_datetime: "2000-01-01 00:00:00"
 remotes:
 - "url": "https://github.com/libevent/libevent.git"
diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml
index 2d50f9c..76f5c67 100644
--- a/gitian/descriptors/windows/gitian-bundle.yml
+++ b/gitian/descriptors/windows/gitian-bundle.yml
@@ -5,12 +5,10 @@ suites:
 architectures:
 - "i386"
 packages:
-- "git-core"
+- "faketime"
 - "unzip"
 - "zip"
 - "nsis"
-- "faketime"
-- "python"
 # Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5.
 - "python-lxml"
 - "sqlite3"
diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml
index bcffffe..07c082b 100644
--- a/gitian/descriptors/windows/gitian-firefox.yml
+++ b/gitian/descriptors/windows/gitian-firefox.yml
@@ -4,12 +4,10 @@ suites:
 architectures:
 - "i386"
 packages:
-- "git-core"
-- "unzip"
-- "zip"
-- "autoconf"
 - "autoconf2.13"
+- "unzip"
 - "yasm"
+- "zip"
 reference_datetime: "2000-01-01 00:00:00"
 remotes:
 - "url": "https://git.torproject.org/tor-browser.git"
diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml
index 93776b8..6a6301d 100644
--- a/gitian/descriptors/windows/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml
@@ -5,15 +5,12 @@ suites:
 architectures:
 - "i386"
 packages:
-- "git-core"
+- "faketime"
 - "unzip"
-- "zip"
-- "swig"
 - "p7zip-full"
-- "m4"
-- "python-dev"
-- "faketime"
-- "libtool"
+# Needed by M2Crypto
+- "swig"
+- "zip"
 reference_datetime: "2000-01-01 00:00:00"
 remotes:
 - "url": "https://git.torproject.org/pluggable-transports/pyptlib.git"
diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml
index c326157..0ac603c 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -5,14 +5,10 @@ suites:
 architectures:
 - "i386"
 packages:
-- "git-core"
+- "faketime"
 - "unzip"
-- "zip"
-- "autoconf"
 - "automake"
-- "autoconf2.13"
-- "faketime"
-- "libtool"
+- "zip"
 reference_datetime: "2000-01-01 00:00:00"
 remotes:
 - "url": "https://git.torproject.org/tor.git"
diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml
index 75e5662..f0deca0 100644
--- a/gitian/descriptors/windows/gitian-utils.yml
+++ b/gitian/descriptors/windows/gitian-utils.yml
@@ -5,15 +5,10 @@ suites:
 architectures:
 - "i386"
 packages:
-- "git-core"
-- "unzip"
-- "zip"
-- "autoconf"
-- "autoconf2.13"
-- "automake"
-- "mingw-w64"
 - "faketime"
+- "automake"
 - "libtool"
+- "zip"
 # XXX: Only needed to dump the spec.
 - "g++-mingw-w64-i686"
 # Needed for compiling gcc.
@@ -47,8 +42,9 @@ script: |
   cd binutils*
   # XXX: This is needed due to bug 10102.
   sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n  memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i ld/pe-dll.c
-  # Zeroing timestamps in PE headers reliably, see bug 12753.
+  # Needed for the hardening...
   patch -p1 < ../enable-reloc-section-ld.patch
+  # Zeroing timestamps in PE headers reliably, see bug 12753.
   patch -p1 < ../peXXigen.patch
   ./configure --prefix=$INSTDIR/mingw-w64 --target=i686-w64-mingw32 --disable-multilib
   make $MAKEOPTS





More information about the tbb-commits mailing list