summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorRunar Borge <runar@borge.nu>2019-07-22 21:54:20 +0200
committerRunar Borge <runar@borge.nu>2019-07-22 21:54:20 +0200
commit6056acfa06c2b79ee8981b9f36a1ced2dac29111 (patch)
tree613944f1de089105950a86501507b6aa2151380d /README.md
parentb229f0bd958a42c6faa345c91500c2ed8ccdc919 (diff)
parent8c22ceead487b745d6b7c058c4d1c0a0eaa051c8 (diff)
downloadvyos-build-6056acfa06c2b79ee8981b9f36a1ced2dac29111.tar.gz
vyos-build-6056acfa06c2b79ee8981b9f36a1ced2dac29111.zip
Merge remote-tracking branch 'origin/current' into equuleus
fixed merge errors in: * scripts/live-build-config - kernel parameters * scripts/build-packages - fixed list of packages to compile
Diffstat (limited to 'README.md')
-rw-r--r--README.md9
1 files changed, 6 insertions, 3 deletions
diff --git a/README.md b/README.md
index 885f2fba..8e1636ce 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ $ sudo debootstrap jessie vyos-chroot
$ sudo chroot vyos-chroot
$ echo "deb http://archive.debian.org/debian/ jessie-backports main" >> /etc/apt/sources.list
-$ apt-get update
+$ apt-get update -o Acquire::Check-Valid-Until=false
```
**NOTE:** We recommend to use the Docker build method
@@ -272,6 +272,9 @@ In packages that originate from VyOS the master branch is kept in sync with
last legacy package is gone, we will switch to using the `master` branch and
retire `current`.
-For branch naming we switched to use constellations:
-* `crux`
+Post-1.2.0 branches are named after constellations sorted by from smallest to largest.
+There are 88 of them, here's the [complete list](https://en.wikipedia.org/wiki/IAU_designated_constellations_by_area).
+
+* 1.2.0: `crux` (Southern Cross)
+* Future 1.3.0: `equuleus`
* ...