From da613acfb19236ec39f5e1a0c87da15ac20370a6 Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Thu, 27 Mar 2014 20:21:52 +0100 Subject: [PATCH 1/3] 0.4 --- README | 1 + site.conf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README b/README index 65e0a64..8a52702 100644 --- a/README +++ b/README @@ -1,4 +1,5 @@ Gluon versions used for specific Lübeck Freifunk Firmware builds: +* 0.4: v2014.1 * 0.4~1-beta2 (0.4 Beta 2): 2c751d3612a7229de878c40ae724611f2f4f0bee * 0.3.100-beta1 (0.4 Beta 1): 55a068104fa072ea7cd2decac9584a8f619badbf diff --git a/site.conf b/site.conf index 7b47617..845bf36 100644 --- a/site.conf +++ b/site.conf @@ -2,7 +2,7 @@ hostname_prefix => 'freifunk', site_name => 'Freifunk Lübeck', site_code => 'ffhl', - release => '0.4~2-exp' . nightly, + release => '0.4', prefix4 => '10.130.0.0/20', prefix6 => 'fdef:ffc0:3dd7::/64', From 3d44adc9367a9b20190b62dd0690d0e7b9107b9b Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Thu, 27 Mar 2014 20:22:51 +0100 Subject: [PATCH 2/3] 0.4-experimental --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 845bf36..97f2b6b 100644 --- a/site.conf +++ b/site.conf @@ -2,7 +2,7 @@ hostname_prefix => 'freifunk', site_name => 'Freifunk Lübeck', site_code => 'ffhl', - release => '0.4', + release => '0.4-exp' . nightly, prefix4 => '10.130.0.0/20', prefix6 => 'fdef:ffc0:3dd7::/64', From 4f1edbbdf12cd5d0af351623168e4413d3882ccc Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 27 Mar 2014 23:49:36 +0100 Subject: [PATCH 3/3] Add a number to the new experimental version string for nicer version ordering with future versions --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 97f2b6b..c49a219 100644 --- a/site.conf +++ b/site.conf @@ -2,7 +2,7 @@ hostname_prefix => 'freifunk', site_name => 'Freifunk Lübeck', site_code => 'ffhl', - release => '0.4-exp' . nightly, + release => '0.4+0-exp' . nightly, prefix4 => '10.130.0.0/20', prefix6 => 'fdef:ffc0:3dd7::/64',