[tor-commits] [tor-browser-bundle/master] Remove extra firefox-bin in linux build descriptors.

[mikeperry at torproject.org]

commit d73f29a46bd781f21092d54d5c8dc27149659c0e
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Nov 12 06:26:59 2013 +0000

    Remove extra firefox-bin in linux build descriptors.
    
     * CHANGE loop which does strip+objcopy on all `Browser/*.so` files to do the
       same for all `Browser/components/*.so` files and also for
       `Browser/plugin-container`.
     * REMOVE non-stripped `Browser/firefox-bin` in gitian-firefox.yml descriptors
       for linux builds.
     * REMOVE the strip+objcopy commands for `Browser/firefox` and add them to the
       above loop, so that all the creation of all debuginfos is done in one
       place.
     * FIXES #10126 for linux.
---
 gitian/descriptors/linux/gitian-firefox.yml |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml
index d852e73..faf0aba 100644
--- a/gitian/descriptors/linux/gitian-firefox.yml
+++ b/gitian/descriptors/linux/gitian-firefox.yml
@@ -84,22 +84,21 @@ script: |
   make $MAKEOPTS -f client.mk build
   make -C obj-* package INNER_MAKE_PACKAGE=true
   cp -a obj-*/dist/firefox/* $INSTDIR/Browser/
+  # Remove firefox-bin (we don't use it, see ticket #10126)
+  rm -f $INSTDIR/Browser/firefox-bin
   # TODO: There goes FIPS-140.. We could upload these somewhere unique and
   # subsequent builds could test to see if they've been uploaded before...
   # But let's find out if it actually matters first..
   rm -f $INSTDIR/Browser/*.chk
   #
+  # Strip and generate debuginfo for the firefix binary that we keep, all *.so
+  # files, and the plugin-container (see ticket #10126)
   cd $INSTDIR
-  # Strip and generate debuginfo for libs
-  objcopy --only-keep-debug $INSTDIR/Browser/firefox $INSTDIR/Debug/Browser/firefox
-  strip $INSTDIR/Browser/firefox
-  objcopy --add-gnu-debuglink=./Debug/Browser/firefox $INSTDIR/Browser/firefox
-  for i in $INSTDIR/Browser/*.so
+  for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/components/*.so
   do
-    LIB=`basename $i`
-    objcopy --only-keep-debug $INSTDIR/Browser/$LIB $INSTDIR/Debug/Browser/$LIB
-    strip $INSTDIR/Browser/$LIB
-    objcopy --add-gnu-debuglink=./Debug/Browser/$LIB $INSTDIR/Browser/$LIB
+    objcopy --only-keep-debug $LIB Debug/$LIB
+    strip $LIB
+    objcopy --add-gnu-debuglink=./Debug/$LIB $LIB
   done
   ~/build/re-dzip.sh Browser/omni.ja
   ~/build/re-dzip.sh Browser/webapprt/omni.ja