merge of ad980e031ab94ad3b8f2d1e29f2bbae35f47d710

     and ae1272cefbd4147e462e255072a2484f4f9a7a1b

10 files changed, 15 insertions, 12 deletions

diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index 16c54c77da..88be1c516c 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -6,7 +6,7 @@
 # STANDARD DebianSlug DEFINITIONS
 #----------------------------------------------------------------------------------
 DISTRO_NAME = "DebianSlug"
-DISTRO_VERSION = "3.2-beta"
+# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
 DISTRO_FEED = "unstable"
 DISTRO_TYPE = "beta"
 SLUGOS_IMAGENAME = "debianslug"
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 8c1a16c77f..80b650dce0 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -6,7 +6,7 @@
 # STANDARD OpenSlug DEFINITIONS
 #----------------------------------------------------------------------------------
 DISTRO_NAME = "OpenSlug"
-DISTRO_VERSION = "3.2-beta"
+# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
 DISTRO_FEED = "unstable"
 DISTRO_TYPE = "beta"
 SLUGOS_IMAGENAME = "openslug"
diff --git a/conf/distro/slugos-bag.conf b/conf/distro/slugos-bag.conf
index 3710243dab..9da0eb0707 100644
--- a/conf/distro/slugos-bag.conf
+++ b/conf/distro/slugos-bag.conf
@@ -6,7 +6,7 @@
 
 # This slugos variant corresponds to OpenSlug
 DISTRO_NAME ?= "slugos-bag"
-DISTRO_VERSION ?= "3.2-beta"
+# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
 DISTRO_FEED ?= "unstable"
 DISTRO_TYPE ?= "beta"
 
diff --git a/conf/distro/slugos-bau.conf b/conf/distro/slugos-bau.conf
index 9a025d1bbd..b9070cb234 100644
--- a/conf/distro/slugos-bau.conf
+++ b/conf/distro/slugos-bau.conf
@@ -7,7 +7,7 @@
 # This slugos variant is not supported - there are no nslu2-linux.org
 # regular builds and there is no feed.
 DISTRO_NAME ?= "slugos-bau"
-DISTRO_VERSION ?= "3.2-beta"
+# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
 DISTRO_FEED ?= "unstable"
 DISTRO_TYPE ?= "alpha"
 
diff --git a/conf/distro/slugos-btu.conf b/conf/distro/slugos-btu.conf
index 33f5d0a952..12a9553197 100644
--- a/conf/distro/slugos-btu.conf
+++ b/conf/distro/slugos-btu.conf
@@ -6,7 +6,7 @@
 
 # This slugos variant corresponds to UcSlugC
 DISTRO_NAME ?= "slugos-btu"
-DISTRO_VERSION ?= "3.2-beta"
+# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
 DISTRO_FEED ?= "unstable"
 DISTRO_TYPE ?= "beta"
 
diff --git a/conf/distro/slugos-lag.conf b/conf/distro/slugos-lag.conf
index ddfeba3c59..b5d069dc34 100644
--- a/conf/distro/slugos-lag.conf
+++ b/conf/distro/slugos-lag.conf
@@ -5,7 +5,7 @@
 # This slugos variant is not supported - there are no nslu2-linux.org
 # regular builds and there is no feed.
 DISTRO_NAME ?= "slugos-lag"
-DISTRO_VERSION ?= "3.2-beta"
+# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
 DISTRO_FEED ?= "unstable"
 DISTRO_TYPE ?= "alpha"
 
diff --git a/conf/distro/slugos-lau.conf b/conf/distro/slugos-lau.conf
index 6dc2c1f77b..c83cdff881 100644
--- a/conf/distro/slugos-lau.conf
+++ b/conf/distro/slugos-lau.conf
@@ -5,7 +5,7 @@
 # This slugos variant is not supported - there are no nslu2-linux.org
 # regular builds and there is no feed.
 DISTRO_NAME ?= "slugos-lau"
-DISTRO_VERSION ?= "3.2-beta"
+# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
 DISTRO_FEED ?= "unstable"
 DISTRO_TYPE ?= "alpha"
 
diff --git a/conf/distro/slugos-ltu.conf b/conf/distro/slugos-ltu.conf
index 9e02bd1bb9..652be9d481 100644
--- a/conf/distro/slugos-ltu.conf
+++ b/conf/distro/slugos-ltu.conf
@@ -5,9 +5,9 @@
 # This slugos variant is not supported - there are no nslu2-linux.org
 # regular builds and there is no feed.
 DISTRO_NAME ?= "slugos-ltu"
-DISTRO_VERSION ?= "3.2-beta"
+# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
 DISTRO_FEED ?= "unstable"
-DISTRO_TYPE ?= "alpha"
+DISTRO_TYPE ?= "beta"
 
 ARCH_BYTE_SEX = "le"
 ARM_INSTRUCTION_SET = "thumb"
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index 16a5999738..964176a270 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -33,10 +33,14 @@
 # The following must be set in the top level distro file:
 #
 #DISTRO_NAME
-#DISTRO_VERSION
 #DISTRO_FEED
 #DISTRO_TYPE
 
+# The following may be overridden to make sub-versions
+SLUGOS_VERSION = "3.4"
+DISTRO_REVISION ?= ""
+DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
+
 # The following must also be set, they define the basic format of the build
 #
 #ARCH_BYTE_SEX "be" or "le"
@@ -50,7 +54,6 @@ USE_NLS ?= "no"
 
 # To make errors easier to identify:
 DISTRO_NAME ?= "INVALID-${ARCH_BYTE_SEX}-${ARM_INSTRUCTION_SET}-${TARGET_OS}"
-DISTRO_VERSION ?= "INVALID"
 DISTRO_FEED ?= "INVALID"
 DISTRO_TYPE ?= "INVALID"
 
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index 45daeb6632..52cc4ab106 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -4,7 +4,7 @@
 
 # This is SLUGOS-BTU with a different name...
 DISTRO_NAME = "UcSlugC"
-DISTRO_VERSION = "3.2-beta"
+# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
 DISTRO_FEED = "unstable"
 DISTRO_TYPE = "beta"
 SLUGOS_IMAGENAME = "ucslugc"