1 files changed, 4 insertions, 2 deletions

diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
index 3246814..7947157 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -4,8 +4,8 @@ LICENSE  = "GPL-2.0-with-classpath-exception"
 PRIORITY = "optional"
 SECTION  = "libs"
 
-# Name of the icedtea tarball and top-level directory.
-ICEDTEA = "NEEDS TO BE SET"
+ICEDTEA_VERSION = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[1].split("-")[1] or '1.0'}"
+ICEDTEA = "icedtea-${ICEDTEA_VERSION}"
 
 S = "${WORKDIR}/${ICEDTEA}"
 B = "${S}/build"
@@ -307,6 +307,8 @@ FILES_${JDKPN}-dbg = "\
         ${JDK_HOME}/jre/lib/${JDK_ARCH}/native_threads/.debug \
         ${JDK_HOME}/jre/lib/${JDK_ARCH}/server/.debug \
         ${JDK_HOME}/jre/lib/${JDK_ARCH}/shark/.debug \
+        ${JDK_HOME}/jre/lib/${JDK_ARCH}/cacao/.debug \
+        ${JDK_HOME}/jre/lib/${JDK_ARCH}/jamvm/.debug \
         ${JDK_HOME}/jre/lib/${JDK_ARCH}/headless/.debug \
         ${JDK_HOME}/jre/lib/${JDK_ARCH}/xawt/.debug \
        "