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 | |
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>
-rw-r--r-- | recipes-core/openjdk/openjdk-7-common.inc | 34 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-7-release-91b01.inc | 65 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb | 33 |
3 files changed, 66 insertions, 66 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" |
diff --git a/recipes-core/openjdk/openjdk-7-release-91b01.inc b/recipes-core/openjdk/openjdk-7-release-91b01.inc deleted file mode 100644 index 19e640f..0000000 --- a/recipes-core/openjdk/openjdk-7-release-91b01.inc +++ /dev/null | |||
@@ -1,65 +0,0 @@ | |||
1 | require openjdk-7-common.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
4 | |||
5 | FILESPATH =. "${FILE_DIRNAME}/patches-openjdk-7:" | ||
6 | |||
7 | # Name of the directory containing the compiled output | ||
8 | BUILD_DIR = "openjdk.build" | ||
9 | BUILD_DIR_ECJ = "openjdk.build-ecj" | ||
10 | |||
11 | # Force arm mode for now | ||
12 | ARM_INSTRUCTION_SET_armv4t = "ARM" | ||
13 | |||
14 | ICEDTEA_URI = "http://icedtea.wildebeest.org/download/source/${ICEDTEA}.tar.gz;name=iced" | ||
15 | |||
16 | ICEDTEA_PREFIX = "icedtea7-forest-2.6" | ||
17 | ICEDTEA_HG_URL = "http://icedtea.classpath.org/hg/release/${ICEDTEA_PREFIX}" | ||
18 | |||
19 | OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2" | ||
20 | OPENJDK_URI = "${ICEDTEA_HG_URL}/archive/${OPENJDK_FILE};name=openjdk;unpack=false" | ||
21 | |||
22 | HOTSPOT_FILE = "${HOTSPOT_CHANGESET}.tar.bz2" | ||
23 | #HOTSPOT_URI = "${ICEDTEA_HG_URL}/hotspot/archive/${HOTSPOT_FILE};name=hotspot;unpack=false" | ||
24 | HOTSPOT_URI = "http://icedtea.classpath.org/hg/icedtea7-forest/hotspot/archive/${HOTSPOT_FILE};name=hotspot;unpack=false" | ||
25 | |||
26 | CORBA_FILE = "${CORBA_CHANGESET}.tar.bz2" | ||
27 | CORBA_URI = "${ICEDTEA_HG_URL}/corba/archive/${CORBA_FILE};name=corba;unpack=false" | ||
28 | |||
29 | JAXP_FILE = "${JAXP_CHANGESET}.tar.bz2" | ||
30 | JAXP_URI = "${ICEDTEA_HG_URL}/jaxp/archive/${JAXP_FILE};name=jaxp;unpack=false" | ||
31 | |||
32 | JAXWS_FILE = "${JAXWS_CHANGESET}.tar.bz2" | ||
33 | JAXWS_URI = "${ICEDTEA_HG_URL}/jaxws/archive/${JAXWS_FILE};name=jaxws;unpack=false" | ||
34 | |||
35 | JDK_FILE = "${JDK_CHANGESET}.tar.bz2" | ||
36 | JDK_URI = "${ICEDTEA_HG_URL}/jdk/archive/${JDK_FILE};name=jdk;unpack=false" | ||
37 | |||
38 | LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.bz2" | ||
39 | LANGTOOLS_URI = "${ICEDTEA_HG_URL}/langtools/archive/${LANGTOOLS_FILE};name=langtools;unpack=false" | ||
40 | |||
41 | # Split up patches to allow overriding them separately | ||
42 | OEPATCHES = "\ | ||
43 | file://build-hacks.patch \ | ||
44 | file://fix_hotspot_crosscompile.patch \ | ||
45 | " | ||
46 | |||
47 | ICEDTEAPATCHES = "\ | ||
48 | file://icedtea-zero-hotspotfix.patch;apply=no \ | ||
49 | file://icedtea-jdk-nio-use-host-cc.patch;apply=no \ | ||
50 | file://icedtea-jdk-build-nio-gensor-genuc-gensc-static.patch;apply=no \ | ||
51 | file://icedtea-jdk-rmi-crosscompile.patch;apply=no \ | ||
52 | file://icedtea-crosscompile-fix.patch;apply=no \ | ||
53 | file://icedtea-xawt-crosscompile-fix.patch;apply=no \ | ||
54 | " | ||
55 | |||
56 | DISTRIBUTION_PATCHES = "\ | ||
57 | patches/icedtea-zero-hotspotfix.patch \ | ||
58 | patches/icedtea-jdk-nio-use-host-cc.patch \ | ||
59 | patches/icedtea-jdk-build-nio-gensor-genuc-gensc-static.patch \ | ||
60 | patches/icedtea-jdk-rmi-crosscompile.patch \ | ||
61 | patches/icedtea-crosscompile-fix.patch \ | ||
62 | patches/icedtea-xawt-crosscompile-fix.patch \ | ||
63 | " | ||
64 | |||
65 | export DISTRIBUTION_PATCHES | ||
diff --git a/recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb b/recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb index df91e4d..92613a2 100644 --- a/recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb +++ b/recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb | |||
@@ -1,4 +1,8 @@ | |||
1 | require openjdk-7-release-91b01.inc | 1 | require openjdk-7-common.inc |
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
4 | |||
5 | FILESPATH =. "${FILE_DIRNAME}/patches-openjdk-7:" | ||
2 | 6 | ||
3 | inherit distro_features_check | 7 | inherit distro_features_check |
4 | 8 | ||
@@ -37,3 +41,30 @@ SRC_URI[openjdk.sha256sum] = "c1e6924bddff0ddec318364c60f4e0843c1186a0aa9911ce6c | |||
37 | HOTSPOT_CHANGESET = "3f1b4a1fe4a2" | 41 | HOTSPOT_CHANGESET = "3f1b4a1fe4a2" |
38 | SRC_URI[hotspot.md5sum] = "106b2ec0a8798fbe07f3d838568bd0d8" | 42 | SRC_URI[hotspot.md5sum] = "106b2ec0a8798fbe07f3d838568bd0d8" |
39 | SRC_URI[hotspot.sha256sum] = "39bc54bf343e1dce404b8c95285c0457a8d0a7c7aedfb55055aff9795dd36a85" | 43 | SRC_URI[hotspot.sha256sum] = "39bc54bf343e1dce404b8c95285c0457a8d0a7c7aedfb55055aff9795dd36a85" |
44 | |||
45 | ############################################################################### | ||
46 | # PATCHES - split up to allow overriding them separately | ||
47 | OEPATCHES = "\ | ||
48 | file://build-hacks.patch \ | ||
49 | file://fix_hotspot_crosscompile.patch \ | ||
50 | " | ||
51 | |||
52 | ICEDTEAPATCHES = "\ | ||
53 | file://icedtea-zero-hotspotfix.patch;apply=no \ | ||
54 | file://icedtea-jdk-nio-use-host-cc.patch;apply=no \ | ||
55 | file://icedtea-jdk-build-nio-gensor-genuc-gensc-static.patch;apply=no \ | ||
56 | file://icedtea-jdk-rmi-crosscompile.patch;apply=no \ | ||
57 | file://icedtea-crosscompile-fix.patch;apply=no \ | ||
58 | file://icedtea-xawt-crosscompile-fix.patch;apply=no \ | ||
59 | " | ||
60 | |||
61 | DISTRIBUTION_PATCHES = "\ | ||
62 | patches/icedtea-zero-hotspotfix.patch \ | ||
63 | patches/icedtea-jdk-nio-use-host-cc.patch \ | ||
64 | patches/icedtea-jdk-build-nio-gensor-genuc-gensc-static.patch \ | ||
65 | patches/icedtea-jdk-rmi-crosscompile.patch \ | ||
66 | patches/icedtea-crosscompile-fix.patch \ | ||
67 | patches/icedtea-xawt-crosscompile-fix.patch \ | ||
68 | " | ||
69 | |||
70 | export DISTRIBUTION_PATCHES | ||