diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2015-10-30 10:36:28 +0100 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-10-30 08:59:12 -0200 |
commit | d111fae12343f0a79148ea370a45b308ee8b36cf (patch) | |
tree | df2555af4e74ec69e893ea434b9f43f23711988b /recipes-core/openjdk/openjdk-7-common.inc | |
parent | a88718b6a6ec2a9429cbfd364d590ae69eb661e4 (diff) | |
download | meta-java-d111fae12343f0a79148ea370a45b308ee8b36cf.tar.gz |
openjdk-7: remove openjdk-7-release-*.inc
Due to the fact we will always support only one OpenJDK 7 version the
openjdk-7-release-*.inc is not needed. Therefore remove this file and
split it content to openjdk-7_*.bb and openjdk-7-common.inc.
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/openjdk/openjdk-7-common.inc')
-rw-r--r-- | recipes-core/openjdk/openjdk-7-common.inc | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc index db47af4..059e1c8 100644 --- a/recipes-core/openjdk/openjdk-7-common.inc +++ b/recipes-core/openjdk/openjdk-7-common.inc | |||
@@ -308,6 +308,40 @@ RDEPENDS_${JDKPN}-jdk = "${JDKPN}-jre" | |||
308 | 308 | ||
309 | FILES_${JDKPN}-doc = "${JDK_HOME}/man" | 309 | FILES_${JDKPN}-doc = "${JDK_HOME}/man" |
310 | 310 | ||
311 | # Name of the directory containing the compiled output | ||
312 | BUILD_DIR = "openjdk.build" | ||
313 | BUILD_DIR_ECJ = "openjdk.build-ecj" | ||
314 | |||
315 | # Force arm mode for now | ||
316 | ARM_INSTRUCTION_SET_armv4t = "ARM" | ||
317 | |||
318 | ICEDTEA_URI = "http://icedtea.wildebeest.org/download/source/${ICEDTEA}.tar.gz;name=iced" | ||
319 | |||
320 | ICEDTEA_PREFIX = "icedtea7-forest-2.6" | ||
321 | ICEDTEA_HG_URL = "http://icedtea.classpath.org/hg/release/${ICEDTEA_PREFIX}" | ||
322 | |||
323 | OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2" | ||
324 | OPENJDK_URI = "${ICEDTEA_HG_URL}/archive/${OPENJDK_FILE};name=openjdk;unpack=false" | ||
325 | |||
326 | HOTSPOT_FILE = "${HOTSPOT_CHANGESET}.tar.bz2" | ||
327 | #HOTSPOT_URI = "${ICEDTEA_HG_URL}/hotspot/archive/${HOTSPOT_FILE};name=hotspot;unpack=false" | ||
328 | HOTSPOT_URI = "http://icedtea.classpath.org/hg/icedtea7-forest/hotspot/archive/${HOTSPOT_FILE};name=hotspot;unpack=false" | ||
329 | |||
330 | CORBA_FILE = "${CORBA_CHANGESET}.tar.bz2" | ||
331 | CORBA_URI = "${ICEDTEA_HG_URL}/corba/archive/${CORBA_FILE};name=corba;unpack=false" | ||
332 | |||
333 | JAXP_FILE = "${JAXP_CHANGESET}.tar.bz2" | ||
334 | JAXP_URI = "${ICEDTEA_HG_URL}/jaxp/archive/${JAXP_FILE};name=jaxp;unpack=false" | ||
335 | |||
336 | JAXWS_FILE = "${JAXWS_CHANGESET}.tar.bz2" | ||
337 | JAXWS_URI = "${ICEDTEA_HG_URL}/jaxws/archive/${JAXWS_FILE};name=jaxws;unpack=false" | ||
338 | |||
339 | JDK_FILE = "${JDK_CHANGESET}.tar.bz2" | ||
340 | JDK_URI = "${ICEDTEA_HG_URL}/jdk/archive/${JDK_FILE};name=jdk;unpack=false" | ||
341 | |||
342 | LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.bz2" | ||
343 | LANGTOOLS_URI = "${ICEDTEA_HG_URL}/langtools/archive/${LANGTOOLS_FILE};name=langtools;unpack=false" | ||
344 | |||
311 | require openjdk-postinst.inc | 345 | require openjdk-postinst.inc |
312 | 346 | ||
313 | ALTERNATIVE_PRIORITY = "50" | 347 | ALTERNATIVE_PRIORITY = "50" |