commit 00655fddf7d890d0f85bedbc430a9246a4ebc055 Author: Nicolas Vigier boklm@torproject.org Date: Fri Sep 24 16:04:27 2021 +0200

Bug 40367: Switch to bullseye for android builds --- projects/android-toolchain/config | 2 +- projects/ninja/build | 2 +- projects/node/config | 4 ++++ projects/nss/build | 5 ++++- projects/nss/config | 1 + projects/nss/use-python3.patch | 12 ++++++++++++ rbm.conf | 6 +++--- 7 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 5196528..0689bd2 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -9,7 +9,7 @@ var: use_container: 1 deps: - unzip - - python + - python3 setup: | mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] diff --git a/projects/ninja/build b/projects/ninja/build index 527f1b6..57aac77 100644 --- a/projects/ninja/build +++ b/projects/ninja/build @@ -10,7 +10,7 @@ mkdir /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %]

-[% IF c("var/windows") || c("var/osx") -%] +[% IF !c("var/linux") -%] # Starting with Debian Bullseye, /usr/bin/python does not exist, so # we need to use python3 explicitly sed -i 's/env python$/env python3/' configure.py diff --git a/projects/node/config b/projects/node/config index 300e59c..0dfa76c 100644 --- a/projects/node/config +++ b/projects/node/config @@ -16,6 +16,10 @@ targets: var: arch_deps: - python2 + android: + var: + arch_deps: + - python2

input_files: - project: container-image diff --git a/projects/nss/build b/projects/nss/build index 786eec4..f7e962e 100644 --- a/projects/nss/build +++ b/projects/nss/build @@ -44,6 +44,8 @@ patch -p2 < $rootdir/config.patch # side. patch -p2 < $rootdir/bug_13028.patch

+patch -p1 < $rootdir/use-python3.patch + # Building NSPR mkdir $builddir/nspr_build cd $builddir/nspr_build @@ -72,7 +74,8 @@ gyp -f ninja-android "$builddir/nss/nss.gyp" \ -Dsign_libs=0 \ -Denable_sslkeylogfile=0 \ -Ddisable_tests=1 \ - -Ddisable_libpkix=1 + -Ddisable_libpkix=1 \ + -Dpython=python3

gendir="$builddir/nss/out/Release" ninja -C "$gendir" diff --git a/projects/nss/config b/projects/nss/config index 0224dca..0da66d1 100644 --- a/projects/nss/config +++ b/projects/nss/config @@ -23,3 +23,4 @@ input_files: - filename: configure.patch - filename: config.patch - filename: bug_13028.patch + - filename: use-python3.patch diff --git a/projects/nss/use-python3.patch b/projects/nss/use-python3.patch new file mode 100644 index 0000000..4046dea --- /dev/null +++ b/projects/nss/use-python3.patch @@ -0,0 +1,12 @@ +diff -ru nss-3.65/nss/lib/ckfw/builtins/builtins.gyp nss-3.65.n/nss/lib/ckfw/builtins/builtins.gyp +--- nss-3.65/nss/lib/ckfw/builtins/builtins.gyp 2021-09-29 12:48:34.982000000 +0200 ++++ nss-3.65.n/nss/lib/ckfw/builtins/builtins.gyp 2021-09-29 12:48:43.152000000 +0200 +@@ -30,7 +30,7 @@ + { + 'msvs_cygwin_shell': 0, + 'action': [ +- 'python', ++ 'python3', + 'certdata.py', + 'certdata.txt', + '<@(_outputs)', diff --git a/rbm.conf b/rbm.conf index 5321bc0..19d41ce 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,12 +24,13 @@ steps: output_dir: "out/[% project %]/cargo_vendor" var: container: - suite: buster + suite: bullseye arch: amd64 pre_pkginst: '' deps: - cargo - patch + - bzip2 cargo_vendor: | #!/bin/bash [% c("var/set_default_env") %] @@ -307,14 +308,13 @@ targets: # This is needed to get the offline build part for Glean right. glean_parser: 1.29.0 container: - suite: buster + suite: bullseye arch: amd64 disable_network: # Disable network in the script for merging GeckoView .aar files merge_aars: 1 deps: - build-essential - - python - python3 - python3-distutils - automake