Unverified Commit 4861f97c authored by Matthew Finkel's avatar Matthew Finkel
Browse files

Merge remote-tracking branch 'gkgl/bug_34234'

parents d3c7af80 8feea5ac
...@@ -193,7 +193,7 @@ of containers: the container-image project is still called, but it will ...@@ -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. just create an empty file instead of a real container image.
The build without containers is currently only supported for the Android 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 dependencies for all the components that are built. This can be done
with the following command: with the following command:
......
...@@ -56,13 +56,6 @@ targets: ...@@ -56,13 +56,6 @@ targets:
arch: amd64 arch: amd64
debootstrap_mirror: "http://archive.debian.org/debian/" debootstrap_mirror: "http://archive.debian.org/debian/"
stretch-amd64:
var:
minimal_apt_version: 1.4.9
container:
suite: stretch
arch: amd64
buster-amd64: buster-amd64:
var: var:
minimal_apt_version: 1.8.2 minimal_apt_version: 1.8.2
......
...@@ -10,14 +10,14 @@ var: ...@@ -10,14 +10,14 @@ var:
# HTTPS Everywhere is expected to be the same on all platforms. To avoid # HTTPS Everywhere is expected to be the same on all platforms. To avoid
# building the same thing 4 times, using 4 different container images # building the same thing 4 times, using 4 different container images
# (each one with a different suite or architecture), we set the container # (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 # container image, and also build the extension only one time as the
# filename does not contain the platform, and var/build_id should be # filename does not contain the platform, and var/build_id should be
# the same since there is now nothing platform specific in the build # the same since there is now nothing platform specific in the build
# inputs. This allows us to save a little time and disk space. # inputs. This allows us to save a little time and disk space.
container: container:
use_container: 1 use_container: 1
suite: stretch suite: buster
arch: amd64 arch: amd64
deps: deps:
- git - git
...@@ -34,4 +34,4 @@ input_files: ...@@ -34,4 +34,4 @@ input_files:
- project: python - project: python
name: python name: python
target_prepend: target_prepend:
- common-stretch - common-buster
...@@ -179,13 +179,13 @@ targets: ...@@ -179,13 +179,13 @@ targets:
# Don't create mar files to save time # Don't create mar files to save time
build_mar: 0 build_mar: 0
# The common-stretch target is used to build components that are common to all # The common-buster target is used to build components that are common to all
# platforms, using Debian stretch. # platforms, using Debian Buster.
common-stretch: common-buster:
var: var:
common: 1 common: 1
container: container:
suite: stretch suite: buster
arch: amd64 arch: amd64
pre_pkginst: '' pre_pkginst: ''
deps: deps:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment