From e7a11e43a25762899d80051106917dcc3e37dd54 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sun, 10 Mar 2013 12:00:50 +0100 Subject: openjdk7: get icedtea version from recipe name like openjdk6 --- recipes-core/openjdk/openjdk-7-common.inc | 4 ++-- recipes-core/openjdk/openjdk-7_03b21-2.1.6.bb | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc index 3246814..a792907 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" diff --git a/recipes-core/openjdk/openjdk-7_03b21-2.1.6.bb b/recipes-core/openjdk/openjdk-7_03b21-2.1.6.bb index 5331ce0..c93b390 100644 --- a/recipes-core/openjdk/openjdk-7_03b21-2.1.6.bb +++ b/recipes-core/openjdk/openjdk-7_03b21-2.1.6.bb @@ -2,8 +2,6 @@ require openjdk-7-release-03b21.inc PR = "${INC_PR}.0" -ICEDTEA = "icedtea-2.1.6" - SRC_URI[iced.md5sum] = "f1118898beda7f94ce1731b78e9d2890" SRC_URI[iced.sha256sum] = "e6a65923acb29b87b9f8492adc6f00152b489441e788b64e2869301cc7fa29ba" -- cgit v1.2.3-54-g00ecf