openjdk: Avoid extra-noise because of self-satisfying dependency

I realized one small issue last days: the dependency of openjdk-*-demos on java2-vm, which is
provided by the current recipe (eg. openjdk-7) causes bitbake scan for alternatives (eg. java2-vm
provided by openjdk-6) without any need.

I would recommend to remove such a generic dependency:
* openjdk-6-demos require openjdk-6-jre, period.
* openjdk-7-demos require openjdk-7-jre, period.
* openjdk-8-demos require openjdk-8-jre, period.

There is no sense in satisfying openjdk-8-demos with openjdk-6-jre (even if it might be possible).

Signed-off-by: Jens Rehsack <sno@netbsd.org>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

2 files changed, 2 insertions, 2 deletions

diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc
index 7ad7097..cf192d0 100644
--- a/recipes-core/openjdk/openjdk-6-common.inc
+++ b/recipes-core/openjdk/openjdk-6-common.inc
@@ -303,7 +303,7 @@ FILES_${JDKPN}-dbg = "\
        "
 
 FILES_${JDKPN}-demo = "${JDK_HOME}/demo ${JDK_HOME}/sample"
-RDEPENDS_${JDKPN}-demo = "java2-runtime"
+RDEPENDS_${JDKPN}-demo = "${JDKPN}-jre"
 FILES_${JDKPN}-demo-dbg = "\
         ${JDK_HOME}/demo/jvmti/gctest/lib/.debug \
         ${JDK_HOME}/demo/jvmti/heapTracker/lib/.debug \
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
index 13f3460..74b93d9 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -248,7 +248,7 @@ FILES_${JDKPN}-dbg = "\
        "
 
 FILES_${JDKPN}-demo = "${JDK_HOME}/demo ${JDK_HOME}/sample"
-RDEPENDS_${JDKPN}-demo = "java2-runtime"
+RDEPENDS_${JDKPN}-demo = "${JDKPN}-jre"
 FILES_${JDKPN}-demo-dbg = "\
         ${JDK_HOME}/demo/jvmti/gctest/lib/.debug \
         ${JDK_HOME}/demo/jvmti/heapTracker/lib/.debug \