[tor-commits] [tor-browser-bundle/master] Remove Gitian result files from bundles. Include hashes instead.

[mikeperry at torproject.org]

commit a222f920ce68feac26e0527e8910e6c86d4f02bb
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue Jun 18 13:13:46 2013 -0700

    Remove Gitian result files from bundles. Include hashes instead.
    
    The Gitian result files contain information about the full set of packages on
    the system, which changes too often and doesn't normally otherwise alter build
    output.
---
 gitian/TODO                |    4 ----
 gitian/mkbundle-linux.sh   |    4 ++--
 gitian/mkbundle-mac.sh     |    4 ++--
 gitian/mkbundle-windows.sh |    4 ++--
 gitian/record-inputs.sh    |   13 +++++++++++--
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/gitian/TODO b/gitian/TODO
index b7e5ca1..84223f8 100644
--- a/gitian/TODO
+++ b/gitian/TODO
@@ -1,9 +1,5 @@
 Short Term:
  - Determinism issues
-   - including the res.yml files introduce more issues than they solve
-     (Random Ubuntu package versions change too frequently)
-     - Only include our own source code versions + hashes
-     - Don't forget gitian-builder!
    - One of the builds ended up using old Gitian descriptors somehow..
      - Refuse to build if `git diff --raw` is non-zero?
    - omni.ja (which is a zip file) still doesn't always match
diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh
index dbbcb6d..7d4d6ef 100755
--- a/gitian/mkbundle-linux.sh
+++ b/gitian/mkbundle-linux.sh
@@ -101,7 +101,7 @@ then
   fi
   
   cp -a build/out/tor-linux*-gbuilt.zip $GITIAN_DIR/inputs/
-  cp -a result/tor-linux-res.yml $GITIAN_DIR/inputs/
+  #cp -a result/tor-linux-res.yml $GITIAN_DIR/inputs/
 else
   echo 
   echo "****** SKIPPING already built Tor Component of Linux Bundle (1/3 for Linux) ******"
@@ -124,7 +124,7 @@ then
   fi
 
   cp -a build/out/tor-browser-linux*-gbuilt.zip $GITIAN_DIR/inputs/
-  cp -a result/torbrowser-linux-res.yml $GITIAN_DIR/inputs/
+  #cp -a result/torbrowser-linux-res.yml $GITIAN_DIR/inputs/
 else
   echo 
   echo "****** SKIPPING already built TorBrowser Component of Linux Bundle (2/3 for Linux) ******"
diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh
index 9c24a0f..3e9fb35 100755
--- a/gitian/mkbundle-mac.sh
+++ b/gitian/mkbundle-mac.sh
@@ -84,7 +84,7 @@ then
   fi
   
   cp -a build/out/tor-mac*-gbuilt.zip $GITIAN_DIR/inputs/
-  cp -a result/tor-mac-res.yml $GITIAN_DIR/inputs/
+  #cp -a result/tor-mac-res.yml $GITIAN_DIR/inputs/
 else
   echo 
   echo "****** SKIPPING already built Tor Component of Mac Bundle (1/3 for Mac) ******"
@@ -105,7 +105,7 @@ then
   fi
 
   cp -a build/out/tor-browser-mac*-gbuilt.zip $GITIAN_DIR/inputs/
-  cp -a result/torbrowser-mac-res.yml $GITIAN_DIR/inputs/
+  #cp -a result/torbrowser-mac-res.yml $GITIAN_DIR/inputs/
 else
   echo 
   echo "****** SKIPPING already built TorBrowser Component of Mac Bundle (2/3 for Mac) ******"
diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh
index 068f671..4a2ee49 100755
--- a/gitian/mkbundle-windows.sh
+++ b/gitian/mkbundle-windows.sh
@@ -84,7 +84,7 @@ then
   fi
   
   cp -a build/out/tor-win32-gbuilt.zip $GITIAN_DIR/inputs/
-  cp -a result/tor-windows-res.yml $GITIAN_DIR/inputs/
+  #cp -a result/tor-windows-res.yml $GITIAN_DIR/inputs/
 else
   echo 
   echo "****** SKIPPING already built Tor Component of Windows Bundle (1/3 for Windows) ******"
@@ -105,7 +105,7 @@ then
   fi
 
   cp -a build/out/tor-browser-win32-gbuilt.zip $GITIAN_DIR/inputs/
-  cp -a result/torbrowser-windows-res.yml $GITIAN_DIR/inputs/
+  #cp -a result/torbrowser-windows-res.yml $GITIAN_DIR/inputs/
 else
   echo 
   echo "****** SKIPPING already built Torbrowser Component of Windows Bundle (2/3 for Windows) ******"
diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh
index 709c91d..763b2ee 100755
--- a/gitian/record-inputs.sh
+++ b/gitian/record-inputs.sh
@@ -5,7 +5,7 @@
 WRAPPER_DIR=$PWD
 
 if [ -n $1 ]; then
-  INPUTS_DIR=../../gitian-builder/inputs
+  INPUTS_DIR=$PWD/../../gitian-builder/inputs
 else
   INPUTS_DIR=$1
 fi
@@ -14,13 +14,22 @@ cd $INPUTS_DIR
 
 rm -f bundle.inputs
 
+sha256sum apple* >> bundle.inputs
+sha256sum multiarch-darwin* >> bundle.inputs
+sha256sum mingw*.zip >> bundle.inputs
+echo >> bundle.inputs
 sha256sum relativelink-src.zip >> bundle.inputs
 sha256sum *-langpacks.zip >> bundle.inputs
 sha256sum noscript at noscript.net.xpi >> bundle.inputs
 sha256sum uriloader at pdf.js.xpi >> bundle.inputs
-
+sha256sum openssl-*gz >> bundle.inputs
+echo >> bundle.inputs
+echo "`cd zlib && git log --format=%H -1` zlib.git" >> bundle.inputs
+echo "`cd tor && git log --format=%H -1` tor.git" >> bundle.inputs
 echo "`cd torbutton && git log --format=%H -1` torbutton.git" >> bundle.inputs
 echo "`cd tor-launcher && git log --format=%H -1` tor-launcher.git" >> bundle.inputs
 echo "`cd https-everywhere && git log --format=%H -1` https-everywhere.git" >> bundle.inputs
+echo "`cd tbb-windows-installer && git log --format=%H -1` tbb-windows-installer.git" >> bundle.inputs
 echo "`cd $WRAPPER_DIR && git log --format=%H -1` tor-browser-bundle.git" >> bundle.inputs
+echo "`cd $INPUTS_DIR && git log --format=%H -1` gitian-builder.git" >> bundle.inputs