diff options
| author | Henning Heinold <heinold@inf.fu-berlin.de> | 2013-03-10 12:00:50 +0100 |
|---|---|---|
| committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2013-03-10 12:00:50 +0100 |
| commit | e7a11e43a25762899d80051106917dcc3e37dd54 (patch) | |
| tree | dac4d2458730cc5d5a086057692fb17433dcb9ec /recipes-core | |
| parent | efc0a0e3655500a73ad9f72f24ed3e11dd328900 (diff) | |
| download | meta-java-e7a11e43a25762899d80051106917dcc3e37dd54.tar.gz | |
openjdk7: get icedtea version from recipe name like openjdk6
Diffstat (limited to 'recipes-core')
| -rw-r--r-- | recipes-core/openjdk/openjdk-7-common.inc | 4 | ||||
| -rw-r--r-- | 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" | |||
| 4 | PRIORITY = "optional" | 4 | PRIORITY = "optional" |
| 5 | SECTION = "libs" | 5 | SECTION = "libs" |
| 6 | 6 | ||
| 7 | # Name of the icedtea tarball and top-level directory. | 7 | ICEDTEA_VERSION = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[1].split("-")[1] or '1.0'}" |
| 8 | ICEDTEA = "NEEDS TO BE SET" | 8 | ICEDTEA = "icedtea-${ICEDTEA_VERSION}" |
| 9 | 9 | ||
| 10 | S = "${WORKDIR}/${ICEDTEA}" | 10 | S = "${WORKDIR}/${ICEDTEA}" |
| 11 | B = "${S}/build" | 11 | 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 | |||
| 2 | 2 | ||
| 3 | PR = "${INC_PR}.0" | 3 | PR = "${INC_PR}.0" |
| 4 | 4 | ||
| 5 | ICEDTEA = "icedtea-2.1.6" | ||
| 6 | |||
| 7 | SRC_URI[iced.md5sum] = "f1118898beda7f94ce1731b78e9d2890" | 5 | SRC_URI[iced.md5sum] = "f1118898beda7f94ce1731b78e9d2890" |
| 8 | SRC_URI[iced.sha256sum] = "e6a65923acb29b87b9f8492adc6f00152b489441e788b64e2869301cc7fa29ba" | 6 | SRC_URI[iced.sha256sum] = "e6a65923acb29b87b9f8492adc6f00152b489441e788b64e2869301cc7fa29ba" |
| 9 | 7 | ||