summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2013-05-31 13:53:30 +0200
committerDaniel Baumann <mail@daniel-baumann.ch>2013-05-31 13:53:30 +0200
commitbc3532387629b7bb4764535e398e82ec84d73fb8 (patch)
tree9d80d07eb0bdba802ae193d55449453f83b249c0
parente44fe9ba9e1bde676d35db7aede0bc0c66f4f76b (diff)
downloadvyos-live-build-bc3532387629b7bb4764535e398e82ec84d73fb8.tar.gz
vyos-live-build-bc3532387629b7bb4764535e398e82ec84d73fb8.zip
Updating versioning scheme references to match new scheme since wheezy.
-rwxr-xr-xfunctions/releases.sh6
-rwxr-xr-xscripts/build/bootstrap_archive-keys12
2 files changed, 9 insertions, 9 deletions
diff --git a/functions/releases.sh b/functions/releases.sh
index b166481d5..b3699efa6 100755
--- a/functions/releases.sh
+++ b/functions/releases.sh
@@ -9,13 +9,13 @@
# Debian releases
-RELEASE_wheezy="7.0.0"
+RELEASE_wheezy="7"
RELEASE_jessie="8"
RELEASE_sid="unstable"
# Progress Linux releases
-RELEASE_baureo="2.0"
-RELEASE_charon="unstable"
+RELEASE_baureo="2"
+RELEASE_charon="3"
# Ubuntu releases
RELEASE_hardy="8.04" # LTS: 2013-04-01
diff --git a/scripts/build/bootstrap_archive-keys b/scripts/build/bootstrap_archive-keys
index 2b4cb403b..b5f98c4b1 100755
--- a/scripts/build/bootstrap_archive-keys
+++ b/scripts/build/bootstrap_archive-keys
@@ -33,27 +33,27 @@ case "${LB_MODE}" in
progress-linux)
case "${LB_DISTRIBUTION}" in
artax)
- _KEYS="1.0-artax"
+ _KEYS="1-artax"
;;
artax-backports)
- _KEYS="1.0-artax 1.9-artax-backports"
+ _KEYS="1-artax 1+-artax-backports"
;;
baureo)
- _KEYS="2.0-baureo"
+ _KEYS="2-baureo"
;;
baureo-backports)
- _KEYS="2.0-baureo 2.9-baureo-backports"
+ _KEYS="2-baureo 2+-baureo-backports"
;;
chairon)
- _KEYS="3.0-chairon"
+ _KEYS="3-chairon"
;;
chairon-backports)
- _KEYS="3.0-chairon 3.9-chairon-backports"
+ _KEYS="3-chairon 3+-chairon-backports"
;;
esac