diff options
Diffstat (limited to 'recipes-core')
-rw-r--r-- | recipes-core/openjdk/openjdk-8-common.inc | 14 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-8-release-16xbyy.inc | 24 |
2 files changed, 23 insertions, 15 deletions
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc index b2020c3..0a04b6c 100644 --- a/recipes-core/openjdk/openjdk-8-common.inc +++ b/recipes-core/openjdk/openjdk-8-common.inc | |||
@@ -30,13 +30,13 @@ SRC_URI = " \ | |||
30 | do_unpack_extract_submodules () { | 30 | do_unpack_extract_submodules () { |
31 | cd "${S}" | 31 | cd "${S}" |
32 | # tar --transform | 32 | # tar --transform |
33 | tar xjf ${WORKDIR}/${CORBA_FILE} --transform "s,-${CORBA_CHANGESET},,g" | 33 | tar xjf ${WORKDIR}/${CORBA_FILE_LOCAL} --transform "s,-${CORBA_CHANGESET},,g" |
34 | tar xjf ${WORKDIR}/${HOTSPOT_FILE} --transform "s,-${HOTSPOT_CHANGESET},,g" | 34 | tar xjf ${WORKDIR}/${HOTSPOT_FILE_LOCAL} --transform "s,-${HOTSPOT_CHANGESET},,g" |
35 | tar xjf ${WORKDIR}/${JAXP_FILE} --transform "s,-${JAXP_CHANGESET},,g" | 35 | tar xjf ${WORKDIR}/${JAXP_FILE_LOCAL} --transform "s,-${JAXP_CHANGESET},,g" |
36 | tar xjf ${WORKDIR}/${JAXWS_FILE} --transform "s,-${JAXWS_CHANGESET},,g" | 36 | tar xjf ${WORKDIR}/${JAXWS_FILE_LOCAL} --transform "s,-${JAXWS_CHANGESET},,g" |
37 | tar xjf ${WORKDIR}/${JDK_FILE} --transform "s,-${JDK_CHANGESET},,g" | 37 | tar xjf ${WORKDIR}/${JDK_FILE_LOCAL} --transform "s,-${JDK_CHANGESET},,g" |
38 | tar xjf ${WORKDIR}/${LANGTOOLS_FILE} --transform "s,-${LANGTOOLS_CHANGESET},,g" | 38 | tar xjf ${WORKDIR}/${LANGTOOLS_FILE_LOCAL} --transform "s,-${LANGTOOLS_CHANGESET},,g" |
39 | tar xjf ${WORKDIR}/${NASHORN_FILE} --transform "s,-${NASHORN_CHANGESET},,g" | 39 | tar xjf ${WORKDIR}/${NASHORN_FILE_LOCAL} --transform "s,-${NASHORN_CHANGESET},,g" |
40 | } | 40 | } |
41 | 41 | ||
42 | do_unpack_remove_X11_wrappers() { | 42 | do_unpack_remove_X11_wrappers() { |
diff --git a/recipes-core/openjdk/openjdk-8-release-16xbyy.inc b/recipes-core/openjdk/openjdk-8-release-16xbyy.inc index 7ca0997..fd95e95 100644 --- a/recipes-core/openjdk/openjdk-8-release-16xbyy.inc +++ b/recipes-core/openjdk/openjdk-8-release-16xbyy.inc | |||
@@ -65,25 +65,33 @@ OPENJDK_HG_U = "jdk8u" | |||
65 | OPENJDK_HG_URL = "http://hg.openjdk.java.net/${OPENJDK_ARCH_PORT}/${OPENJDK_HG_U}" | 65 | OPENJDK_HG_URL = "http://hg.openjdk.java.net/${OPENJDK_ARCH_PORT}/${OPENJDK_HG_U}" |
66 | 66 | ||
67 | OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2" | 67 | OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2" |
68 | OPENJDK_URI = "${OPENJDK_HG_URL}/archive/${OPENJDK_FILE};name=openjdk" | 68 | OPENJDK_FILE_LOCAL = "openjdk8-${PV}-jdk8u-${OPENJDK_FILE}" |
69 | OPENJDK_URI = "${OPENJDK_HG_URL}/archive/${OPENJDK_FILE};downloadfilename=${OPENJDK_FILE_LOCAL};name=openjdk" | ||
69 | 70 | ||
70 | HOTSPOT_FILE = "${HOTSPOT_CHANGESET}.tar.bz2" | 71 | HOTSPOT_FILE = "${HOTSPOT_CHANGESET}.tar.bz2" |
71 | HOTSPOT_URI = "${OPENJDK_HG_URL}/hotspot/archive/${HOTSPOT_FILE};name=hotspot;unpack=false" | 72 | HOTSPOT_FILE_LOCAL = "openjdk8-${PV}-hotspot-${HOTSPOT_FILE}" |
73 | HOTSPOT_URI = "${OPENJDK_HG_URL}/hotspot/archive/${HOTSPOT_FILE};downloadfilename=${HOTSPOT_FILE_LOCAL};name=hotspot;unpack=false" | ||
72 | 74 | ||
73 | CORBA_FILE = "${CORBA_CHANGESET}.tar.bz2" | 75 | CORBA_FILE = "${CORBA_CHANGESET}.tar.bz2" |
74 | CORBA_URI = "${OPENJDK_HG_URL}/corba/archive/${CORBA_FILE};name=corba;unpack=false" | 76 | CORBA_FILE_LOCAL = "openjdk8-${PV}-corba-${CORBA_FILE}" |
77 | CORBA_URI = "${OPENJDK_HG_URL}/corba/archive/${CORBA_FILE};downloadfilename=${CORBA_FILE_LOCAL};name=corba;unpack=false" | ||
75 | 78 | ||
76 | JAXP_FILE = "${JAXP_CHANGESET}.tar.bz2" | 79 | JAXP_FILE = "${JAXP_CHANGESET}.tar.bz2" |
77 | JAXP_URI = "${OPENJDK_HG_URL}/jaxp/archive/${JAXP_FILE};name=jaxp;unpack=false" | 80 | JAXP_FILE_LOCAL = "openjdk8-${PV}-jaxp-${JAXP_FILE}" |
81 | JAXP_URI = "${OPENJDK_HG_URL}/jaxp/archive/${JAXP_FILE};downloadfilename=${JAXP_FILE_LOCAL};name=jaxp;unpack=false" | ||
78 | 82 | ||
79 | JAXWS_FILE = "${JAXWS_CHANGESET}.tar.bz2" | 83 | JAXWS_FILE = "${JAXWS_CHANGESET}.tar.bz2" |
80 | JAXWS_URI = "${OPENJDK_HG_URL}/jaxws/archive/${JAXWS_FILE};name=jaxws;unpack=false" | 84 | JAXWS_FILE_LOCAL = "openjdk8-${PV}-jaxws-${JAXWS_FILE}" |
85 | JAXWS_URI = "${OPENJDK_HG_URL}/jaxws/archive/${JAXWS_FILE};downloadfilename=${JAXWS_FILE_LOCAL};name=jaxws;unpack=false" | ||
81 | 86 | ||
82 | JDK_FILE = "${JDK_CHANGESET}.tar.bz2" | 87 | JDK_FILE = "${JDK_CHANGESET}.tar.bz2" |
83 | JDK_URI = "${OPENJDK_HG_URL}/jdk/archive/${JDK_FILE};name=jdk;unpack=false" | 88 | JDK_FILE_LOCAL = "openjdk8-${PV}-jdk-${JDK_FILE}" |
89 | JDK_URI = "${OPENJDK_HG_URL}/jdk/archive/${JDK_FILE};downloadfilename=${JDK_FILE_LOCAL};name=jdk;unpack=false" | ||
84 | 90 | ||
85 | LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.bz2" | 91 | LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.bz2" |
86 | LANGTOOLS_URI = "${OPENJDK_HG_URL}/langtools/archive/${LANGTOOLS_FILE};name=langtools;unpack=false" | 92 | LANGTOOLS_FILE_LOCAL = "openjdk8-${PV}-langtools-${LANGTOOLS_FILE}" |
93 | LANGTOOLS_URI = "${OPENJDK_HG_URL}/langtools/archive/${LANGTOOLS_FILE};downloadfilename=${LANGTOOLS_FILE_LOCAL};name=langtools;unpack=false" | ||
87 | 94 | ||
88 | NASHORN_FILE = "${NASHORN_CHANGESET}.tar.bz2" | 95 | NASHORN_FILE = "${NASHORN_CHANGESET}.tar.bz2" |
89 | NASHORN_URI = "${OPENJDK_HG_URL}/nashorn/archive/${NASHORN_FILE};name=nashorn;unpack=false" | 96 | NASHORN_FILE_LOCAL = "openjdk8-${PV}-nashorn-${NASHORN_FILE}" |
97 | NASHORN_URI = "${OPENJDK_HG_URL}/nashorn/archive/${NASHORN_FILE};downloadfilename=${NASHORN_FILE_LOCAL};name=nashorn;unpack=false" | ||