[tbb-commits] [tor-browser-build/master] Bug 40368: Use system's python3 for https-everywhere

[boklm at torproject.org]

commit ce2c78e4ccc24a4b46ff9336f54b1ec8129e430c
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Sep 30 14:40:45 2021 +0200

    Bug 40368: Use system's python3 for https-everywhere
---
 projects/https-everywhere/build  |  1 -
 projects/https-everywhere/config |  6 ++----
 rbm.conf                         | 17 -----------------
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/projects/https-everywhere/build b/projects/https-everywhere/build
index 88431e0..10dd4bf 100644
--- a/projects/https-everywhere/build
+++ b/projects/https-everywhere/build
@@ -1,6 +1,5 @@
 #!/bin/bash
 [% c("var/set_default_env") -%]
-[% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %]
 tar xf [% project %]-[% c('version') %].tar.gz
 cd [% project %]-[% c('version') %]
 ./make.sh
diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config
index 13fd3bd..9af5ff6 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -27,11 +27,9 @@ var:
     - rsync
     - zip
     - unzip
+    - python3
+    - python3-distutils
   pre_pkginst: ''
 
 input_files:
   - project: container-image
-  - project: python
-    name: python
-    target_prepend:
-      - common-bullseye
diff --git a/rbm.conf b/rbm.conf
index b5c0566..7295953 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -247,23 +247,6 @@ targets:
       # Don't create mar files to save time
       build_mar: 0
 
-  # The common-bullseye target is used to build components that are common to all
-  # platforms, using Debian Bullseye.
-  common-bullseye:
-    var:
-      common: 1
-      container:
-        suite: bullseye
-        arch: amd64
-      pre_pkginst: ''
-      deps:
-        - build-essential
-        - python
-        - automake
-        - libtool
-        - zip
-        - unzip
-
   torbrowser-android-armv7:
     - android-armv7
     - android