[tbb-commits] [Git][tpo/applications/tor-browser-build][maint-12.0] Bug 40683: Reduce the number of custom containers
boklm (@boklm)
git at gitlab.torproject.org
Fri Dec 9 10:29:10 UTC 2022
boklm pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build
Commits:
b5077a28 by Nicolas Vigier at 2022-12-09T11:27:58+01:00
Bug 40683: Reduce the number of custom containers
Install a few more packages in the default containers to reduce the
number of custom containers we use.
- - - - -
14 changed files:
- projects/android-components/config
- projects/android-toolchain/config
- projects/application-services/config
- projects/bison/config
- projects/browser/config
- projects/fenix/config
- projects/gradle/config
- projects/libevent/config
- projects/rust/config
- projects/tor-android-service/config
- projects/tor-onion-proxy-library/config
- projects/tor/config
- projects/wasi-sysroot/config
- rbm.conf
Changes:
=====================================
projects/android-components/config
=====================================
@@ -19,8 +19,6 @@ var:
gradle_version: 7.0.2
glean_parser: 5.0.1
git_branch: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1'
- arch_deps:
- - python3-venv
targets:
nightly:
=====================================
projects/android-toolchain/config
=====================================
@@ -8,9 +8,6 @@ var:
version_30: 30.0.2
version_29: 29.0.2
version_28: 28.0.3
- deps:
- - unzip
- - python3
setup: |
mkdir -p /var/tmp/dist
tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %]
=====================================
projects/application-services/config
=====================================
@@ -13,8 +13,6 @@ var:
gradle_dependencies_version: 9
gradle_version: 6.7.1
glean_parser: 4.0.0
- arch_deps:
- - python3-venv
input_files:
- project: container-image
=====================================
projects/bison/config
=====================================
@@ -3,9 +3,6 @@ version: 3.8.2
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
container:
use_container: 1
- deps:
- - build_essential
- - xz-utils
input_files:
- URL: https://ftp.gnu.org/gnu/bison/bison-[% c("version") %].tar.xz
=====================================
projects/browser/config
=====================================
@@ -17,12 +17,16 @@ var:
- patch
targets:
- linux-i686:
+ linux:
var:
- mar_osname: linux32
arch_deps:
- # Install libc6-i386 to be able to run 32bit mar tools (bug 29812)
+ # Install libc6-i386 to be able to run 32bit mar tools in linux-i686
+ # builds (bug 29812). We don't need it in x86_64 builds, but we
+ # share the container to reduce space used.
- libc6-i386
+ linux-i686:
+ var:
+ mar_osname: linux32
linux-x86_64:
var:
mar_osname: linux64
=====================================
projects/fenix/config
=====================================
@@ -20,8 +20,6 @@ var:
gradle_dependencies_version: 37
gradle_version: 7.0.2
glean_parser: 5.0.1
- arch_deps:
- - python3-venv
targets:
release:
=====================================
projects/gradle/config
=====================================
@@ -5,8 +5,6 @@ container:
use_container: 1
var:
- deps:
- - unzip
gradle_sha256sum:
5.1.1: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798
5.6.4: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d
=====================================
projects/libevent/config
=====================================
@@ -12,10 +12,6 @@ var:
configure_opt_project: --disable-static
targets:
- macos:
- var:
- arch_deps:
- - faketime
windows:
var:
configure_opt_project: --disable-shared
=====================================
projects/rust/config
=====================================
@@ -7,23 +7,10 @@ container:
targets:
android:
var:
- arch_deps:
- - libssl-dev
- - pkg-config
- - zlib1g-dev
configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,armv7-linux-androideabi,thumbv7neon-linux-androideabi,aarch64-linux-android,i686-linux-android,x86_64-linux-android --set=target.armv7-linux-androideabi.cc=armv7a-linux-androideabi16-clang --set=target.armv7-linux-androideabi.ar=armv7a-linux-androideabi-ar --set=target.thumbv7neon-linux-androideabi.cc=armv7a-linux-androideabi16-clang --set=target.thumbv7neon-linux-androideabi.ar=armv7a-linux-androideabi-ar --set=target.aarch64-linux-android.cc=aarch64-linux-android21-clang --set=target.aarch64-linux-android.ar=aarch64-linux-android-ar --set=target.i686-linux-android.cc=i686-linux-android16-clang --set=target.i686-linux-android.ar=i686-linux-android-ar --set=target.x86_64-linux-android.cc=x86_64-linux-android21-clang --set=target.x86_64-linux-android.ar=x86_64-linux-android-ar
linux:
var:
- deps:
- - libc6-dev-i386
- - lib32stdc++6
- - build-essential
- - python
- - automake
- - libssl-dev
- - pkg-config
- - hardening-wrapper
# We use
# `--enable-local-rust` to avoid downloading the required compiler during
# build time
@@ -58,21 +45,17 @@ targets:
macos:
var:
+ configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/macosx-toolchain/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,[% c("var/build_target") %] --set=target.[% c("var/build_target") %].cc=[% c("var/build_target") %]-clang --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib
arch_deps:
- - libssl-dev
- pkg-config
- - zlib1g-dev
- configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/macosx-toolchain/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,[% c("var/build_target") %] --set=target.[% c("var/build_target") %].cc=[% c("var/build_target") %]-clang --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib
windows:
var:
- arch_deps:
- - libssl-dev
- - pkg-config
- - zlib1g-dev
# See tor-browser-build#29320
compiler: mingw-w64
configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/clang --target=x86_64-unknown-linux-gnu,[% c("arch") %]-pc-windows-gnu --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib
+ arch_deps:
+ - pkg-config
input_files:
- project: container-image
=====================================
projects/tor-android-service/config
=====================================
@@ -8,9 +8,6 @@ container:
use_container: 1
var:
- deps:
- - build-essential
- - unzip
# this should be updated when the list of gradle dependencies is changed
gradle_dependencies_version: 5
gradle_version: 5.6.4
=====================================
projects/tor-onion-proxy-library/config
=====================================
@@ -8,10 +8,6 @@ container:
use_container: 1
var:
- deps:
- - build-essential
- - unzip
- - zip
# this should be updated when the list of gradle dependencies is changed
gradle_dependencies_version: 5
gradle_version: 5.6.4
=====================================
projects/tor/config
=====================================
@@ -9,13 +9,6 @@ tag_gpg_id: 1
container:
use_container: 1
-var:
- deps:
- - build-essential
- - automake
- - zip
- - unzip
-
targets:
nightly:
version: '[% c("abbrev") %]'
@@ -27,25 +20,15 @@ targets:
libdir: lib32
sort_deps: 0
arch_deps:
- - libtool
- zlib1g-dev:i386
- - hardening-wrapper
linux-x86_64:
var:
libdir: lib64
arch_deps:
- - libtool
- zlib1g-dev
- - hardening-wrapper
- macos:
- var:
- arch_deps:
- - faketime
android:
var:
configure_opt_project: '--enable-android --enable-static-openssl --enable-static-libevent --enable-zstd --disable-tool-name-check --disable-system-torrc --disable-system-torrc'
- arch_deps:
- - libtinfo5
input_files:
- project: container-image
=====================================
projects/wasi-sysroot/config
=====================================
@@ -8,12 +8,6 @@ git_submodule: 1
container:
use_container: 1
-targets:
- linux:
- var:
- arch_deps:
- - patch
-
input_files:
- project: container-image
- name: binutils
=====================================
rbm.conf
=====================================
@@ -337,11 +337,15 @@ targets:
- bison
- python3
- python3-distutils
+ - python3-venv
- automake
- libtool
- zip
- unzip
- libtinfo5
+ - libssl-dev
+ - pkg-config
+ - zlib1g-dev
configure_opt: '--host=[% c("var/cross_prefix") %] CC=[% c("var/CC") %] [% c("var/configure_opt_project") %]'
pre_pkginst: |
@@ -434,6 +438,8 @@ targets:
deps:
- libc6-dev-i386
- lib32stdc++6
+ - pkg-config
+ - libssl-dev
- build-essential
- python
- bison
@@ -442,6 +448,8 @@ targets:
- libtool
- zip
- unzip
+ - xz-utils
+ - patch
linux-asan:
var:
asan: 1
@@ -500,6 +508,8 @@ targets:
- libtool
- zip
- unzip
+ - libssl-dev
+ - zlib1g-dev
torbrowser-macos:
- macos-universal
@@ -554,6 +564,7 @@ targets:
rlbox: 0
deps:
- build-essential
+ - faketime
- python3
- python3-distutils
- automake
@@ -561,6 +572,8 @@ targets:
- libtool
- zip
- unzip
+ - libssl-dev
+ - zlib1g-dev
faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1
# The no_build_id target can be useful if you want to quickly display
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b5077a28ba7f62f8cecdd4d81aedaf9d359ca15b
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b5077a28ba7f62f8cecdd4d81aedaf9d359ca15b
You're receiving this email because of your account on gitlab.torproject.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tbb-commits/attachments/20221209/cc3253fd/attachment-0001.htm>
More information about the tbb-commits
mailing list