new distro: eneanfvaccess distro config

NFV Access ditribution needs to have it's own distro configration
file.

Signed-off-by: Adrian Calianu <adrian.calianu@enea.com>
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>

7 files changed, 16 insertions, 16 deletions

diff --git a/conf/distro/eneanfvaccess.conf b/conf/distro/eneanfvaccess.conf
new file mode 100644
index 0000000..8c360a3
--- /dev/null
+++ b/conf/distro/eneanfvaccess.conf
@@ -0,0 +1,10 @@
+require conf/distro/enea.conf
+
+DISTRO_NAME = "Enea NFV Access"
+DISTRO_VERSION_MAJOR = "1"
+DISTRO_VERSION_MINOR ??= ".1.1"
+DISTRO_VERSION = "${DISTRO_VERSION_MAJOR}${DISTRO_VERSION_MINOR}"
+
+PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native"
+PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
+PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
diff --git a/conf/template.cn8304-dev/local.conf.sample b/conf/template.cn8304-dev/local.conf.sample
index 92847ac..226e3cb 100644
--- a/conf/template.cn8304-dev/local.conf.sample
+++ b/conf/template.cn8304-dev/local.conf.sample
@@ -86,7 +86,7 @@ MACHINE ?= "cn8304"
 # Ultimately when creating custom policy, people will likely end up subclassing
 # these defaults.
 #
-DISTRO ?= "enea"
+DISTRO ?= "eneanfvaccess"
 # As an example of a subclass there is a "bleeding" edge policy configuration
 # where many versions are set to the absolute latest code from the upstream
 # source control systems. This is just mentioned here as an example, its not
diff --git a/conf/template.cn8304/local.conf.sample b/conf/template.cn8304/local.conf.sample
index b4bd9a2..f668402 100644
--- a/conf/template.cn8304/local.conf.sample
+++ b/conf/template.cn8304/local.conf.sample
@@ -37,9 +37,6 @@
 # This sets the default machine to be qemux86 if no other machine is selected:
 MACHINE ?= "cn8304"
 
-PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native"
-PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
-PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
 
 #
 # Where to place downloads
@@ -90,7 +87,7 @@ PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
 # Ultimately when creating custom policy, people will likely end up subclassing
 # these defaults.
 #
-DISTRO ?= "enea"
+DISTRO ?= "eneanfvaccess"
 # As an example of a subclass there is a "bleeding" edge policy configuration
 # where many versions are set to the absolute latest code from the upstream
 # source control systems. This is just mentioned here as an example, its not
diff --git a/conf/template.inteld1521-dev/local.conf.sample b/conf/template.inteld1521-dev/local.conf.sample
index 1324040..9add6f0 100644
--- a/conf/template.inteld1521-dev/local.conf.sample
+++ b/conf/template.inteld1521-dev/local.conf.sample
@@ -37,10 +37,6 @@
 # This sets the default machine to be qemux86 if no other machine is selected:
 MACHINE ?= "inteld1521"
 
-PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native"
-PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
-PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
-
 #
 # Where to place downloads
 #
@@ -90,7 +86,7 @@ PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
 # Ultimately when creating custom policy, people will likely end up subclassing
 # these defaults.
 #
-DISTRO ?= "enea"
+DISTRO ?= "eneanfvaccess"
 # As an example of a subclass there is a "bleeding" edge policy configuration
 # where many versions are set to the absolute latest code from the upstream
 # source control systems. This is just mentioned here as an example, its not
diff --git a/conf/template.inteld1521/local.conf.sample b/conf/template.inteld1521/local.conf.sample
index 9b7e5b5..7ed152c 100644
--- a/conf/template.inteld1521/local.conf.sample
+++ b/conf/template.inteld1521/local.conf.sample
@@ -37,9 +37,6 @@
 # This sets the default machine to be qemux86 if no other machine is selected:
 MACHINE ?= "inteld1521"
 
-PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native"
-PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
-PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
 
 #
 # Where to place downloads
@@ -90,7 +87,7 @@ PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
 # Ultimately when creating custom policy, people will likely end up subclassing
 # these defaults.
 #
-DISTRO ?= "enea"
+DISTRO ?= "eneanfvaccess"
 # As an example of a subclass there is a "bleeding" edge policy configuration
 # where many versions are set to the absolute latest code from the upstream
 # source control systems. This is just mentioned here as an example, its not
diff --git a/conf/template.qemuarm64/local.conf.sample b/conf/template.qemuarm64/local.conf.sample
index 335922a..8b80ee4 100644
--- a/conf/template.qemuarm64/local.conf.sample
+++ b/conf/template.qemuarm64/local.conf.sample
@@ -86,7 +86,7 @@ MACHINE ?= "qemuarm64"
 # Ultimately when creating custom policy, people will likely end up subclassing
 # these defaults.
 #
-DISTRO ?= "enea"
+DISTRO ?= "eneanfvaccess"
 # As an example of a subclass there is a "bleeding" edge policy configuration
 # where many versions are set to the absolute latest code from the upstream
 # source control systems. This is just mentioned here as an example, its not
diff --git a/conf/template.qemux86-64/local.conf.sample b/conf/template.qemux86-64/local.conf.sample
index 1d9beaf..732cecd 100644
--- a/conf/template.qemux86-64/local.conf.sample
+++ b/conf/template.qemux86-64/local.conf.sample
@@ -86,7 +86,7 @@ MACHINE ?= "qemux86-64"
 # Ultimately when creating custom policy, people will likely end up subclassing
 # these defaults.
 #
-DISTRO ?= "enea"
+DISTRO ?= "eneanfvaccess"
 # As an example of a subclass there is a "bleeding" edge policy configuration
 # where many versions are set to the absolute latest code from the upstream
 # source control systems. This is just mentioned here as an example, its not