commit ce546c418980229020684e09396595d3e9aed143
Author: Georg Koppen <gk(a)torproject.org>
Date: Wed Jan 11 11:09:20 2017 +0000
Bug 21104: Remove 32bit support for sandboxed-tor-browser
---
gitian/descriptors/linux/gitian-sandbox.yml | 2 --
gitian/make-vms.sh | 9 ---------
gitian/mkbundle-linux.sh | 7 +++----
3 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/gitian/descriptors/linux/gitian-sandbox.yml b/gitian/descriptors/linux/gitian-sandbox.yml
index 9e13c17..ab8df05 100644
--- a/gitian/descriptors/linux/gitian-sandbox.yml
+++ b/gitian/descriptors/linux/gitian-sandbox.yml
@@ -4,7 +4,6 @@ distro: "debian"
suites:
- "jessie"
architectures:
-- "i386"
- "amd64"
packages:
- "unzip"
@@ -27,7 +26,6 @@ remotes:
"dir": "sandbox"
files:
- "versions"
-- "go-linux32-utils.zip"
- "go-linux64-utils.zip"
- "dzip.sh"
- "gb-build-dir.patch"
diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh
index 7edd2b4..59632da 100755
--- a/gitian/make-vms.sh
+++ b/gitian/make-vms.sh
@@ -89,15 +89,6 @@ 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
diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh
index f1da2e0..6dbbe51 100755
--- a/gitian/mkbundle-linux.sh
+++ b/gitian/mkbundle-linux.sh
@@ -261,8 +261,7 @@ else
SB_TAG=${SANDBOX_TAG#sandboxed-tor-browser-}
fi
-if [ ! -f inputs/sandbox-$SB_TAG-linux32.zip -o \
- ! -f inputs/sandbox-$SB_TAG-linux64.zip ];
+if [ ! -f inputs/sandbox-$SB_TAG-linux64.zip ];
then
echo
echo "****** Starting Sandbox Component of Linux Bundle (6/7 for Linux) ******"
@@ -274,7 +273,7 @@ then
exit 1
fi
- cp -a build/out/sandbox-$SB_TAG-linux*.zip inputs/
+ cp -a build/out/sandbox-$SB_TAG-linux64.zip inputs/
#cp -a result/sandbox-linux-res.yml inputs/
else
echo
@@ -302,7 +301,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-linux*.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1
+ cp -a inputs/sandbox-$SB_TAG-linux64.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1
touch inputs/bundle-linux.gbuilt
else
echo