Commit 22dcc8da authored by Georg Koppen's avatar Georg Koppen
Browse files

Revert "Bug 21104: Remove 32bit support for sandboxed-tor-browser" 

This reverts commit ce546c41.

Part 6 of sandbox backout for maint-7.0
parent 95407f0d

gitian/descriptors/linux/gitian-sandbox.yml

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ distro: "debian" 
suites:

- "jessie"

architectures:

- "i386"

- "amd64"

packages:

- "unzip"
@@ -26,6 +27,7 @@ remotes: 
  "dir": "sandbox"

files:

- "versions"

- "go-linux32-utils.zip"

- "go-linux64-utils.zip"

- "dzip.sh"

- "gb-build-dir.patch"

gitian/make-vms.sh

+9 −0
Original line number Diff line number Diff line
@@ -89,6 +89,15 @@ do 
  echo

done



while ! build_and_test_vm jessie i386 32

do

  stop-target 32 jessie

  rm ./base-jessie-amd64*

  echo

  echo "Jessie i386 VM build failed... Trying again"

  echo

done



while ! build_and_test_vm jessie amd64 64

do

  stop-target 64 jessie

gitian/mkbundle-linux.sh

+4 −3
Original line number Diff line number Diff line
@@ -239,7 +239,8 @@ else 
  SB_TAG=${SANDBOX_TAG#sandboxed-tor-browser-}

fi



if [ ! -f inputs/sandbox-$SB_TAG-linux64.zip ];

if [ ! -f inputs/sandbox-$SB_TAG-linux32.zip -o \

     ! -f inputs/sandbox-$SB_TAG-linux64.zip ];

then

  echo

  echo "****** Starting Sandbox Component of Linux Bundle (5/6 for Linux) ******"
@@ -251,7 +252,7 @@ then 
    exit 1

  fi



  cp -a build/out/sandbox-$SB_TAG-linux64.zip inputs/

  cp -a build/out/sandbox-$SB_TAG-linux*.zip inputs/

  #cp -a result/sandbox-linux-res.yml inputs/

else

  echo
@@ -279,7 +280,7 @@ then 
  cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1

  cp -a inputs/mar-tools-linux*.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1

  cp -a inputs/*debug.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1

  cp -a inputs/sandbox-$SB_TAG-linux64.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1

  cp -a inputs/sandbox-$SB_TAG-linux*.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1

  touch inputs/bundle-linux.gbuilt

else

  echo