[tor-commits] [tor-browser-build/master] Bug 30377: Remove selfrando from our build system
boklm at torproject.org
boklm at torproject.org
Thu May 9 17:30:35 UTC 2019
commit 9f2de1690a822e1933356065010378f60ea2cf2c
Author: Georg Koppen <gk at torproject.org>
Date: Thu May 9 17:22:27 2019 +0000
Bug 30377: Remove selfrando from our build system
---
keyring/elfutils.gpg | Bin 10483 -> 0 bytes
keyring/selfrando.gpg | Bin 2759 -> 0 bytes
projects/elfutils/build | 23 ---------------
projects/elfutils/config | 22 ---------------
projects/firefox/build | 12 --------
projects/firefox/config | 7 -----
projects/selfrando/build | 25 -----------------
projects/selfrando/config | 31 ---------------------
.../tor-browser/RelativeLink/start-tor-browser | 4 ---
rbm.conf | 1 -
10 files changed, 125 deletions(-)
diff --git a/keyring/elfutils.gpg b/keyring/elfutils.gpg
deleted file mode 100644
index f1cd4b3..0000000
Binary files a/keyring/elfutils.gpg and /dev/null differ
diff --git a/keyring/selfrando.gpg b/keyring/selfrando.gpg
deleted file mode 100644
index 276955d..0000000
Binary files a/keyring/selfrando.gpg and /dev/null differ
diff --git a/projects/elfutils/build b/projects/elfutils/build
deleted file mode 100644
index 5e24dba..0000000
--- a/projects/elfutils/build
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-[% c("var/set_default_env") -%]
-distdir=/var/tmp/dist/[% project %]
-[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
-
-mkdir -p /var/tmp/dist
-
-tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %]
-export PATH="/var/tmp/dist/binutils/bin:$PATH"
-
-mkdir -p /var/tmp/build
-tar -C /var/tmp/build -xf $rootdir/[% c('input_files_by_name/elfutils') %]
-
-cd /var/tmp/build/[% project %]-[% c("version") %]
-./configure --prefix="$distdir"
-make -j[% c("buildconf/num_procs") %]
-make install
-
-cd /var/tmp/dist
-[% c('tar', {
- tar_src => [ project ],
- tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
- }) %]
diff --git a/projects/elfutils/config b/projects/elfutils/config
deleted file mode 100644
index 2c21cf2..0000000
--- a/projects/elfutils/config
+++ /dev/null
@@ -1,22 +0,0 @@
-# vim: filetype=yaml sw=2
-version: '0.166'
-filename: 'elfutils-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-tag_gpg_id: 1
-
-var:
- container:
- use_container: 1
- arch_deps:
- - zlib1g-dev
-
-input_files:
- - project: container-image
- - name: elfutils
- URL: 'https://sourceware.org/elfutils/ftp/[% c("version") %]/elfutils-[% c("version") %].tar.bz2'
- file_gpg_id: 1
- gpg_keyring: elfutils.gpg
- sig_ext: sig
- - name: '[% c("var/compiler") %]'
- project: '[% c("var/compiler") %]'
- - project: binutils
- name: binutils
diff --git a/projects/firefox/build b/projects/firefox/build
index 8146f5d..5cf86a4 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -58,14 +58,6 @@ EOF
export PATH="/var/tmp/dist/binutils/bin:$PATH"
[% END -%]
-[% IF c("var/selfrando") -%]
- tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/selfrando') %]
- # Selfrando wrapper
- export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH"
- # We need to avoid the shuffling while building as this breaks compilation
- export SELFRANDO_skip_shuffle=
-[% END -%]
-
mkdir -p /var/tmp/dist
tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %]
export PATH="/var/tmp/dist/rust/bin:$PATH"
@@ -276,10 +268,6 @@ cd $distdir
objcopy --only-keep-debug $LIB Debug/$LIB
strip $LIB
objcopy --add-gnu-debuglink=./Debug/$LIB $LIB
- [% IF c("var/selfrando") -%]
- # remove RUNPATH added by selfrando (see #22242)
- chrpath -d $LIB
- [% END -%]
done
[% END %]
diff --git a/projects/firefox/config b/projects/firefox/config
index 096fca1..566cbc0 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -75,8 +75,6 @@ targets:
- libx11-xcb-dev
# We built GCC but not the libmpc2, thus we need to install it
- libmpc2
- # needed to remove RUNPATH added by selfrando (see #22242)
- - chrpath
linux-i686:
var:
@@ -95,8 +93,6 @@ targets:
- libx11-xcb-dev:i386
# We built GCC but not the libmpc2, thus we need to install it
- libmpc2
- # needed to remove RUNPATH added by selfrando (see #22242)
- - chrpath
- hardening-wrapper
osx-x86_64:
@@ -128,9 +124,6 @@ input_files:
- project: binutils
name: binutils
enable: '[% c("var/linux") %]'
- - project: selfrando
- name: selfrando
- enable: '[% c("var/selfrando") %]'
- filename: fix-info-plist.py
enable: '[% c("var/osx") %]'
- URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll
diff --git a/projects/selfrando/build b/projects/selfrando/build
deleted file mode 100644
index 14d9dcf..0000000
--- a/projects/selfrando/build
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-[% c("var/set_default_env") -%]
-distdir=/var/tmp/dist/[% project %]
-[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
-
-mkdir -p /var/tmp/dist
-
-tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/elfutils') %]
-tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %]
-export PATH="/var/tmp/dist/binutils/bin:$PATH"
-
-tar -C /var/tmp/dist -xf $rootdir/[% project %]-[% c("version") %].tar.gz
-
-cd /var/tmp/dist
-mv [% project %]-[% c("version") %] [% project %]
-cd [% project %]
-scons -Q arch=[% c("var/selfrando_arch") %] LIBELF_PATH="/var/tmp/dist/elfutils" NO_MREMAP=1 FORCE_INPLACE=1 DEBUG_LEVEL=env WRITE_LAYOUTS=env LOG=console
-# Fix the path where we install selfrando
-sed -i 's|^SR_PATH=.*|SR_PATH=/var/tmp/dist/selfrando/out/[% c("var/selfrando_arch") %]/bin|' Tools/TorBrowser/tc-wrapper/ld
-
-cd /var/tmp/dist
-[% c('tar', {
- tar_src => [ project ],
- tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
- }) %]
diff --git a/projects/selfrando/config b/projects/selfrando/config
deleted file mode 100644
index 82acc23..0000000
--- a/projects/selfrando/config
+++ /dev/null
@@ -1,31 +0,0 @@
-# vim: filetype=yaml sw=2
-filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-version: 0.4.2
-git_hash: 'tb-v[% c("version") %]'
-git_url: https://github.com/immunant/selfrando.git
-gpg_keyring: selfrando.gpg
-tag_gpg_id: 1
-
-var:
- container:
- use_container: 1
- arch_deps:
- - scons
- - zlib1g-dev
-
-targets:
- linux-x86_64:
- var:
- selfrando_arch: x86_64
- linux-i686:
- var:
- selfrando_arch: x86
-
-input_files:
- - project: container-image
- - name: binutils
- project: binutils
- - name: elfutils
- project: elfutils
- - name: '[% c("var/compiler") %]'
- project: '[% c("var/compiler") %]'
diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser
index 474360b..0a1dcbf 100755
--- a/projects/tor-browser/RelativeLink/start-tor-browser
+++ b/projects/tor-browser/RelativeLink/start-tor-browser
@@ -273,10 +273,6 @@ if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then
exit 1
fi
-[% IF ! c("var/release") %]
-export SELFRANDO_write_layout_file=
-[% END %]
-
[% IF c("var/asan") -%]
# We need to disable LSan which is enabled by default now. Otherwise we'll get
# a crash during shutdown: https://bugs.torproject.org/10599#comment:59
diff --git a/rbm.conf b/rbm.conf
index b9db843..2202776 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -238,7 +238,6 @@ targets:
# channels for now.
snowflake: '[% c("var/alpha") || c("var/nightly") %]'
fteproxy: 1
- selfrando: '[% c("var/linux-x86_64") && ! c("var/release") %]'
container:
suite: wheezy
arch: amd64
More information about the tor-commits
mailing list