commit 8feea5ace569b0529d6281b98d95340a0414ce91 Author: Georg Koppen gk@torproject.org Date: Fri Aug 21 13:18:36 2020 +0000

Bug 34234: Move HTTPS Everywhere build to Debian Buster

Additionally, clean up all Debian Stretch references. --- README | 2 +- projects/debootstrap-image/config | 7 ------- projects/https-everywhere/config | 6 +++--- rbm.conf | 8 ++++---- 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/README b/README index a95f466..3e98d02 100644 --- a/README +++ b/README @@ -193,7 +193,7 @@ of containers: the container-image project is still called, but it will just create an empty file instead of a real container image.

The build without containers is currently only supported for the Android -builds, and will require that you run Debian Stretch and install build +builds, and will require that you run Debian Buster and install build dependencies for all the components that are built. This can be done with the following command:

diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index 8e83d81..6ee4a64 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -56,13 +56,6 @@ targets: arch: amd64 debootstrap_mirror: "http://archive.debian.org/debian/"

- stretch-amd64: - var: - minimal_apt_version: 1.4.9 - container: - suite: stretch - arch: amd64 - buster-amd64: var: minimal_apt_version: 1.8.2 diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index a5be759..f75a841 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -10,14 +10,14 @@ var: # HTTPS Everywhere is expected to be the same on all platforms. To avoid # building the same thing 4 times, using 4 different container images # (each one with a different suite or architecture), we set the container - # to stretch/amd64 for all platforms. This allows us to create only one + # to buster/amd64 for all platforms. This allows us to create only one # container image, and also build the extension only one time as the # filename does not contain the platform, and var/build_id should be # the same since there is now nothing platform specific in the build # inputs. This allows us to save a little time and disk space. container: use_container: 1 - suite: stretch + suite: buster arch: amd64 deps: - git @@ -34,4 +34,4 @@ input_files: - project: python name: python target_prepend: - - common-stretch + - common-buster diff --git a/rbm.conf b/rbm.conf index 8f1143e..ac56689 100644 --- a/rbm.conf +++ b/rbm.conf @@ -179,13 +179,13 @@ targets: # Don't create mar files to save time build_mar: 0

- # The common-stretch target is used to build components that are common to all - # platforms, using Debian stretch. - common-stretch: + # The common-buster target is used to build components that are common to all + # platforms, using Debian Buster. + common-buster: var: common: 1 container: - suite: stretch + suite: buster arch: amd64 pre_pkginst: '' deps: