summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-05-21 18:34:22 +0200
committeranonym <anonym@riseup.net>2016-05-21 18:34:22 +0200
commitd25f418f43c0b68970f8bf70f15d3016346f86f6 (patch)
tree275597aadc5c4c7ba36e90bc6fac7ddc299cc659
parent8f975109fe467feb29b26c7d58fffe0ce2d82d1c (diff)
Simplify by making definition explicit.
-rw-r--r--wiki/src/contribute/APT_repository.mdwn17
1 files changed, 10 insertions, 7 deletions
diff --git a/wiki/src/contribute/APT_repository.mdwn b/wiki/src/contribute/APT_repository.mdwn
index 4f9e2e0..4a35f85 100644
--- a/wiki/src/contribute/APT_repository.mdwn
+++ b/wiki/src/contribute/APT_repository.mdwn
@@ -21,6 +21,11 @@ build from, we are building an ISO that is meant to be released (i.e.
whether there is a tag in Git corresponding the last entry in
debian/changelog).
+Note: when we say "building an ISO from the `B` branch" below, we only
+refer to the base branch, i.e. `B` is encoded in `config/base_branch`.
+Hence such statements also refers to topic branches with `B` as base
+branch.
+
Building an ISO from the `devel` branch always uses the freshest set
of APT repository snapshots available. Resolving what's the set of
freshest APT repository snapshots is done at the beginning of the
@@ -30,8 +35,8 @@ uses the exact same state of these
repositories. This is needed for reproducible builds, and has a nice
side effect: so long, `Hashsum mismatch`, and thanks for the fish.
-When building an ISO from the branch used to prepare the next major release
-(`testing`), or a topic branch based on it (`config/base_branch`):
+When building an ISO from the branch used to prepare the next major
+release (`testing`):
* **outside of the freeze period**: we use the latest set of APT
repository snapshots, just like when building from `devel`;
@@ -57,11 +62,9 @@ When building an ISO from the branch used to prepare the next major release
used; and then, we're back to the "outside of the freeze
period" case.
-When building an ISO from the branch used to prepare the next point-release
-(`stable`), or a topic branch based on it (`config/base_branch`
-contains `stable`), we
-use snapshots labeled with the Git tag of the latest Tails release,
-except:
+When building an ISO from the branch used to prepare the next
+point-release (`stable`) we use snapshots labeled with the Git tag of
+the latest Tails release, except:
* we generally use our latest snapshot of security.debian.org;
* at release time: when building from a tagged branch, similarly to