templates: Rename debug targets from -sdk to -dev.

And add missing meta-java to bblayers.conf

Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Signed-off-by: Martin Borg <martin.borg@enea.com>

6 files changed, 4 insertions, 2 deletions

diff --git a/conf/template.cn8304-sdk/bblayers.conf.sample b/conf/template.cn8304-dev/bblayers.conf.sample
index 136dee1..7de8c17 100644
--- a/conf/template.cn8304-sdk/bblayers.conf.sample
+++ b/conf/template.cn8304-dev/bblayers.conf.sample
@@ -22,4 +22,5 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-cloud-services \
   ##OEROOT##/meta-cloud-services/meta-openstack \
+  ##OEROOT##/meta-java \
   "
diff --git a/conf/template.cn8304-sdk/conf-notes.txt b/conf/template.cn8304-dev/conf-notes.txt
index 4baed2d..4baed2d 100644
--- a/conf/template.cn8304-sdk/conf-notes.txt
+++ b/conf/template.cn8304-dev/conf-notes.txt
diff --git a/conf/template.cn8304-sdk/local.conf.sample b/conf/template.cn8304-dev/local.conf.sample
index 1e400a2..92847ac 100644
--- a/conf/template.cn8304-sdk/local.conf.sample
+++ b/conf/template.cn8304-dev/local.conf.sample
@@ -236,4 +236,4 @@ PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
 # this doesn't mean anything to you.
 CONF_VERSION = "1"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-cavium-sdk"
+PREFERRED_PROVIDER_virtual/kernel = "linux-cavium-dev"
diff --git a/conf/template.inteld1521-sdk/bblayers.conf.sample b/conf/template.inteld1521-dev/bblayers.conf.sample
index 0902965..2ae2be9 100644
--- a/conf/template.inteld1521-sdk/bblayers.conf.sample
+++ b/conf/template.inteld1521-dev/bblayers.conf.sample
@@ -22,4 +22,5 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-cloud-services \
   ##OEROOT##/meta-cloud-services/meta-openstack \
+  ##OEROOT##/meta-java \
   "
diff --git a/conf/template.inteld1521-sdk/conf-notes.txt b/conf/template.inteld1521-dev/conf-notes.txt
index 4baed2d..4baed2d 100644
--- a/conf/template.inteld1521-sdk/conf-notes.txt
+++ b/conf/template.inteld1521-dev/conf-notes.txt
diff --git a/conf/template.inteld1521-sdk/local.conf.sample b/conf/template.inteld1521-dev/local.conf.sample
index a156f32..e14b476 100644
--- a/conf/template.inteld1521-sdk/local.conf.sample
+++ b/conf/template.inteld1521-dev/local.conf.sample
@@ -236,4 +236,4 @@ PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
 # this doesn't mean anything to you.
 CONF_VERSION = "1"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-intel-sdk"
+PREFERRED_PROVIDER_virtual/kernel = "linux-intel-dev"