[meta-java][PATCH 2/2] openjdk-8: combine the -dbg package

[Wenlin Kang <wenlin.kang@windriver.com>]

One recipe should only have one -dbg package, because OE only picks
up all .debug file into the last one -dbg package listed in variable
PACKAGES.

Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com>
---
 recipes-core/openjdk/openjdk-8_16xbyy.bb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/recipes-core/openjdk/openjdk-8_16xbyy.bb b/recipes-core/openjdk/openjdk-8_16xbyy.bb
index dd0ed1d..1d7d794 100644
--- a/recipes-core/openjdk/openjdk-8_16xbyy.bb
+++ b/recipes-core/openjdk/openjdk-8_16xbyy.bb
@@ -14,7 +14,6 @@ do_install() {
 }
 
 PACKAGES_append = " \
-    ${PN}-demo-dbg \
     ${PN}-demo \
     ${PN}-source \
 "
@@ -47,12 +46,6 @@ FILES_${PN}-dbg_append = "\
     ${JDK_HOME}/jre/lib/${JDK_ARCH}/headless/.debug/ \
     ${JDK_HOME}/jre/lib/${JDK_ARCH}/xawt/.debug/ \
     ${JDK_HOME}/jre/lib/${JDK_ARCH}/client/.debug/ \
-"
-
-FILES_${PN}-demo = " ${JDK_HOME}/demo ${JDK_HOME}/sample "
-RDEPENDS_${PN}-demo = " ${PN} "
-
-FILES_${PN}-demo-dbg = "\
     ${JDK_HOME}/demo/jvmti/gctest/lib/.debug/ \
     ${JDK_HOME}/demo/jvmti/heapTracker/lib/.debug/ \
     ${JDK_HOME}/demo/jvmti/heapViewer/lib/.debug/ \
@@ -64,6 +57,9 @@ FILES_${PN}-demo-dbg = "\
     ${JDK_HOME}/demo/jvmti/compiledMethodLoad/lib/.debug/ \
 "
 
+FILES_${PN}-demo = " ${JDK_HOME}/demo ${JDK_HOME}/sample "
+RDEPENDS_${PN}-demo = " ${PN} "
+
 FILES_${PN}-doc_append = "\
     ${JDK_HOME}/man \
     ${JDK_HOME}/ASSEMBLY_EXCEPTION \
-- 
2.11.0