summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--recipes-core/openjdk/openjdk-7-common.inc325
-rw-r--r--recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb34
-rw-r--r--recipes-core/openjdk/openjdk-postinst.inc89
3 files changed, 223 insertions, 225 deletions
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
index 059e1c8..d0351e4 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -4,18 +4,18 @@ ICEDTEA = "icedtea-${ICEDTEA_VERSION}"
4INC_PR = "r6" 4INC_PR = "r6"
5 5
6SRC_URI = " \ 6SRC_URI = " \
7 ${ICEDTEA_URI} \ 7 ${ICEDTEA_URI} \
8 ${OPENJDK_URI} \ 8 ${OPENJDK_URI} \
9 ${HOTSPOT_URI} \ 9 ${HOTSPOT_URI} \
10 ${CORBA_URI} \ 10 ${CORBA_URI} \
11 ${JAXP_URI} \ 11 ${JAXP_URI} \
12 ${JAXWS_URI} \ 12 ${JAXWS_URI} \
13 ${JDK_URI} \ 13 ${JDK_URI} \
14 ${LANGTOOLS_URI} \ 14 ${LANGTOOLS_URI} \
15 ${OEPATCHES} \ 15 ${OEPATCHES} \
16 ${ICEDTEAPATCHES} \ 16 ${ICEDTEAPATCHES} \
17 file://jvm.cfg \ 17 file://jvm.cfg \
18 " 18"
19 19
20JDKPN = "openjdk-7" 20JDKPN = "openjdk-7"
21JDK_DIR = "java-7-openjdk" 21JDK_DIR = "java-7-openjdk"
@@ -24,37 +24,37 @@ PN = "${JDKPN}-jre"
24PROVIDES += "${JDKPN}" 24PROVIDES += "${JDKPN}"
25 25
26DEPENDS = " \ 26DEPENDS = " \
27 icedtea7-native zip-native ant-native \ 27 icedtea7-native zip-native ant-native \
28 zlib libxslt-native \ 28 zlib libxslt-native \
29 jpeg libpng giflib \ 29 jpeg libpng giflib \
30 gtk+ glib-2.0 \ 30 gtk+ glib-2.0 \
31 cups fontconfig \ 31 cups fontconfig \
32 rhino krb5 \ 32 rhino krb5 \
33 libxt libxinerama libxrender libxtst libxi \ 33 libxt libxinerama libxrender libxtst libxi \
34 freetype alsa-lib libffi \ 34 freetype alsa-lib libffi \
35 " 35"
36 36
37# No package should directly depend on this (it should require 37# No package should directly depend on this (it should require
38# java2-runtime instead). 38# java2-runtime instead).
39PRIVATE_LIBS = "\ 39PRIVATE_LIBS = "\
40 lib.so libunpack.so libverify.so libjava.so libzip.so libnpt.so \ 40 lib.so libunpack.so libverify.so libjava.so libzip.so libnpt.so \
41 libjava_crw_demo.so libhprof.so libjavanet.so libnio.so \ 41 libjava_crw_demo.so libhprof.so libjavanet.so libnio.so \
42 libmanagement.so libinstrument.so libjsound.so libjsoundalsa.so \ 42 libmanagement.so libinstrument.so libjsound.so libjsoundalsa.so \
43 libj2pcsc.so libj2pkcs11.so libj2gss.so libmlib_image.so \ 43 libj2pcsc.so libj2pkcs11.so libj2gss.so libmlib_image.so \
44 libawt.so libsplashscreen.so libfreetype.so.6 libfontmanager.so \ 44 libawt.so libsplashscreen.so libfreetype.so.6 libfontmanager.so \
45 libjpeg.so liblcms.so librmi.so libjawt.so libjaas_unix.so \ 45 libjpeg.so liblcms.so librmi.so libjawt.so libjaas_unix.so \
46 libattach.so libjdwp.so libdt_socket.so libhpi.so libjli.so \ 46 libattach.so libjdwp.so libdt_socket.so libhpi.so libjli.so \
47 libmawt.so libjvm.so \ 47 libmawt.so libjvm.so \
48 libversionCheck.so libcompiledMethodLoad.so libgctest.so \ 48 libversionCheck.so libcompiledMethodLoad.so libgctest.so \
49 libheapViewer.so libheapTracker.so libminst.so libmtrace.so \ 49 libheapViewer.so libheapTracker.so libminst.so libmtrace.so \
50 libwaiters.so libhprof.so \ 50 libwaiters.so libhprof.so \
51 " 51"
52 52
53export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}" 53export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}"
54export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" 54export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2"
55export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" 55export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}"
56export CACAO_CONFIGURE_ARGS = " \ 56export CACAO_CONFIGURE_ARGS = " \
57 ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']}" 57 ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']}"
58 58
59JAVA_HOME[unexport] = "1" 59JAVA_HOME[unexport] = "1"
60 60
@@ -82,52 +82,52 @@ def get_jdk7_jobs(d):
82JDK_JOBS = "${@get_jdk7_jobs(d)}" 82JDK_JOBS = "${@get_jdk7_jobs(d)}"
83 83
84EXTRA_OECONF = " \ 84EXTRA_OECONF = " \
85 --disable-tests \ 85 --disable-tests \
86 --disable-hotspot-tests \ 86 --disable-hotspot-tests \
87 --disable-langtools-tests \ 87 --disable-langtools-tests \
88 --disable-jdk-tests \ 88 --disable-jdk-tests \
89 --disable-docs \ 89 --disable-docs \
90 --disable-nss \ 90 --disable-nss \
91 --disable-system-lcms \ 91 --disable-system-lcms \
92 --disable-bootstrap \ 92 --disable-bootstrap \
93 \ 93 \
94 --enable-zero \ 94 --enable-zero \
95 \ 95 \
96 --with-jdk-home=${STAGING_LIBDIR_JVM_NATIVE}/icedtea7-native \ 96 --with-jdk-home=${STAGING_LIBDIR_JVM_NATIVE}/icedtea7-native \
97 --with-rhino=${STAGING_DATADIR_JAVA}/rhino.jar \ 97 --with-rhino=${STAGING_DATADIR_JAVA}/rhino.jar \
98 \ 98 \
99 --with-openjdk-src-zip=${WORKDIR}/${OPENJDK_FILE} \ 99 --with-openjdk-src-zip=${WORKDIR}/${OPENJDK_FILE} \
100 --with-hotspot-src-zip=${WORKDIR}/${HOTSPOT_FILE} \ 100 --with-hotspot-src-zip=${WORKDIR}/${HOTSPOT_FILE} \
101 --with-corba-src-zip=${WORKDIR}/${CORBA_FILE} \ 101 --with-corba-src-zip=${WORKDIR}/${CORBA_FILE} \
102 --with-jaxp-src-zip=${WORKDIR}/${JAXP_FILE} \ 102 --with-jaxp-src-zip=${WORKDIR}/${JAXP_FILE} \
103 --with-jaxws-src-zip=${WORKDIR}/${JAXWS_FILE} \ 103 --with-jaxws-src-zip=${WORKDIR}/${JAXWS_FILE} \
104 --with-jdk-src-zip=${WORKDIR}/${JDK_FILE} \ 104 --with-jdk-src-zip=${WORKDIR}/${JDK_FILE} \
105 --with-langtools-src-zip=${WORKDIR}/${LANGTOOLS_FILE} \ 105 --with-langtools-src-zip=${WORKDIR}/${LANGTOOLS_FILE} \
106 \ 106 \
107 --with-parallel-jobs=${JDK_JOBS} \ 107 --with-parallel-jobs=${JDK_JOBS} \
108 \ 108 \
109 --with-pkgversion=${PV} \ 109 --with-pkgversion=${PV} \
110 --with-cc-for-build=${BUILD_CC} \ 110 --with-cc-for-build=${BUILD_CC} \
111 " 111"
112 112
113# PCSC default value was changed to true and SCTP was added during the 2.6.0 113# PCSC default value was changed to true and SCTP was added during the 2.6.0
114# release so we disable them both explicitely here 114# release so we disable them both explicitely here
115EXTRA_OECONF += " \ 115EXTRA_OECONF += " \
116 --disable-system-pcsc \ 116 --disable-system-pcsc \
117 --disable-system-sctp \ 117 --disable-system-sctp \
118 " 118"
119 119
120do_configure_prepend() { 120do_configure_prepend() {
121 echo "Configure with parallel-jobs: ${JDK_JOBS}" 121 echo "Configure with parallel-jobs: ${JDK_JOBS}"
122 122
123 # Automatically copy everything that starts with "icedtea" (or "cacao") and ends with 123 # Automatically copy everything that starts with "icedtea" (or "cacao") and ends with
124 # ".patch" into the patches directory. 124 # ".patch" into the patches directory.
125 find ${WORKDIR} -maxdepth 1 -name "icedtea*.patch" -exec cp {} ${S}/patches \; 125 find ${WORKDIR} -maxdepth 1 -name "icedtea*.patch" -exec cp {} ${S}/patches \;
126 find ${WORKDIR} -maxdepth 1 -name "cacao*.patch" -exec cp {} ${S}/patches \; 126 find ${WORKDIR} -maxdepth 1 -name "cacao*.patch" -exec cp {} ${S}/patches \;
127} 127}
128 128
129do_configure_append() { 129do_configure_append() {
130 oe_runmake patch 130 oe_runmake patch
131} 131}
132 132
133# Work around broken variable quoting in oe-stable 2009 and provide the variable 133# Work around broken variable quoting in oe-stable 2009 and provide the variable
@@ -140,15 +140,15 @@ do_configure_append() {
140EXTRA_OEMAKE += 'CC="${CC}" CCC="${CXX}" CPP="${CPP}" CXX="${CXX}" CC_FOR_BUILD="${BUILD_CC}"' 140EXTRA_OEMAKE += 'CC="${CC}" CCC="${CXX}" CPP="${CPP}" CXX="${CXX}" CC_FOR_BUILD="${BUILD_CC}"'
141 141
142EXTRA_OEMAKE += ' \ 142EXTRA_OEMAKE += ' \
143 OE_CFLAGS="${TARGET_CFLAGS}" \ 143 OE_CFLAGS="${TARGET_CFLAGS}" \
144 OE_CPPFLAGS="${TARGET_CPPFLAGS}" \ 144 OE_CPPFLAGS="${TARGET_CPPFLAGS}" \
145 OE_CXXFLAGS="${TARGET_CXXFLAGS}" \ 145 OE_CXXFLAGS="${TARGET_CXXFLAGS}" \
146 OE_LDFLAGS="${TARGET_LDFLAGS}" \ 146 OE_LDFLAGS="${TARGET_LDFLAGS}" \
147 ZIPEXE="${STAGING_BINDIR_NATIVE}/zip" \ 147 ZIPEXE="${STAGING_BINDIR_NATIVE}/zip" \
148 CROSS_COMPILE_ARCH="${JDK_ARCH}" \ 148 CROSS_COMPILE_ARCH="${JDK_ARCH}" \
149 REQUIRED_ALSA_VERSION="" \ 149 REQUIRED_ALSA_VERSION="" \
150 DISABLE_HOTSPOT_OS_VERSION_CHECK=ok \ 150 DISABLE_HOTSPOT_OS_VERSION_CHECK=ok \
151 ' 151'
152 152
153# Provides the target architecture to the configure script. 153# Provides the target architecture to the configure script.
154export LLVM_CONFIGURE_ARCH="${@get_llvm_configure_arch(d)}" 154export LLVM_CONFIGURE_ARCH="${@get_llvm_configure_arch(d)}"
@@ -160,36 +160,35 @@ OE_LAUNCHER_LDFLAGS_arm = ""
160EXTRA_OEMAKE += 'OE_LAUNCHER_LDFLAGS="${OE_LAUNCHER_LDFLAGS}"' 160EXTRA_OEMAKE += 'OE_LAUNCHER_LDFLAGS="${OE_LAUNCHER_LDFLAGS}"'
161 161
162do_compile() { 162do_compile() {
163 bbnote "3/3 Building final JDK"
163 164
164 bbnote "3/3 Building final JDK" 165 # Build the final Hotspot + OpenJDK
165 166 oe_runmake icedtea-stage2
166 # Build the final Hotspot + OpenJDK
167 oe_runmake icedtea-stage2
168} 167}
169 168
170do_install() { 169do_install() {
171 install -d ${D}${libdir_jvm} 170 install -d ${D}${libdir_jvm}
172 cp -R ${B}/${BUILD_DIR}/j2sdk-image ${D}${JDK_HOME} 171 cp -R ${B}/${BUILD_DIR}/j2sdk-image ${D}${JDK_HOME}
173 172
174 chmod u+rw -R ${D}${JDK_HOME} 173 chmod u+rw -R ${D}${JDK_HOME}
175 174
176 # Fix symlink which would point into staging in the binary package. 175 # Fix symlink which would point into staging in the binary package.
177 ln -sf ${datadir_java}/rhino.jar ${D}${JDK_HOME}/jre/lib/rhino.jar 176 ln -sf ${datadir_java}/rhino.jar ${D}${JDK_HOME}/jre/lib/rhino.jar
178 177
179 # JRE is a subset of JDK. So to save space and resemble what the BIG distros 178 # JRE is a subset of JDK. So to save space and resemble what the BIG distros
180 # do we create symlinks from the JDK binaries to their counterparts in the 179 # do we create symlinks from the JDK binaries to their counterparts in the
181 # JRE folder (which have to exist by that time b/c of dependencies). 180 # JRE folder (which have to exist by that time b/c of dependencies).
182 for F in `find ${D}${JDK_HOME}/jre/bin -type f` 181 for F in `find ${D}${JDK_HOME}/jre/bin -type f`
183 do 182 do
184 bf=`basename $F` 183 bf=`basename $F`
185 bbnote "replace:" $bf 184 bbnote "replace:" $bf
186 rm ${D}${JDK_HOME}/bin/$bf 185 rm ${D}${JDK_HOME}/bin/$bf
187 ln -s ${JDK_HOME}/jre/bin/$bf ${D}${JDK_HOME}/bin/$bf 186 ln -s ${JDK_HOME}/jre/bin/$bf ${D}${JDK_HOME}/bin/$bf
188 done 187 done
189 188
190 install -m644 ${WORKDIR}/jvm.cfg ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/ 189 install -m644 ${WORKDIR}/jvm.cfg ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/
191 # workaround for shared libarary searching 190 # workaround for shared libarary searching
192 ln -sf ${JDK_HOME}/jre/lib/${JDK_ARCH}/server/libjvm.so ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/ 191 ln -sf ${JDK_HOME}/jre/lib/${JDK_ARCH}/server/libjvm.so ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/
193} 192}
194 193
195# Notes about the ideas behind packaging: 194# Notes about the ideas behind packaging:
@@ -204,47 +203,47 @@ do_install() {
204# runtime) 203# runtime)
205# 3) All other packages, including -jdk, are optional and not needed for normal Java apps. 204# 3) All other packages, including -jdk, are optional and not needed for normal Java apps.
206PACKAGES = " \ 205PACKAGES = " \
207 ${JDKPN}-jre \ 206 ${JDKPN}-jre \
208 ${JDKPN}-jre-dbg \ 207 ${JDKPN}-jre-dbg \
209 ${JDKPN}-dbg \ 208 ${JDKPN}-dbg \
210 ${JDKPN}-demo-dbg \ 209 ${JDKPN}-demo-dbg \
211 ${JDKPN}-demo \ 210 ${JDKPN}-demo \
212 ${JDKPN}-source \ 211 ${JDKPN}-source \
213 ${JDKPN}-doc \ 212 ${JDKPN}-doc \
214 ${JDKPN}-jdk \ 213 ${JDKPN}-jdk \
215 ${JDKPN}-java \ 214 ${JDKPN}-java \
216 ${JDKPN}-vm-zero \ 215 ${JDKPN}-vm-zero \
217 ${JDKPN}-common \ 216 ${JDKPN}-common \
218 " 217"
219 218
220FILES_${JDKPN}-dbg = "\ 219FILES_${JDKPN}-dbg = "\
221 ${JDK_HOME}/bin/.debug \ 220 ${JDK_HOME}/bin/.debug \
222 ${JDK_HOME}/lib/.debug \ 221 ${JDK_HOME}/lib/.debug \
223 ${JDK_HOME}/lib/${JDK_ARCH}/jli/.debug \ 222 ${JDK_HOME}/lib/${JDK_ARCH}/jli/.debug \
224 ${JDK_HOME}/jre/bin/.debug \ 223 ${JDK_HOME}/jre/bin/.debug \
225 ${JDK_HOME}/jre/lib/.debug \ 224 ${JDK_HOME}/jre/lib/.debug \
226 ${JDK_HOME}/jre/lib/${JDK_ARCH}/.debug \ 225 ${JDK_HOME}/jre/lib/${JDK_ARCH}/.debug \
227 ${JDK_HOME}/jre/lib/${JDK_ARCH}/jli/.debug \ 226 ${JDK_HOME}/jre/lib/${JDK_ARCH}/jli/.debug \
228 ${JDK_HOME}/jre/lib/${JDK_ARCH}/native_threads/.debug \ 227 ${JDK_HOME}/jre/lib/${JDK_ARCH}/native_threads/.debug \
229 ${JDK_HOME}/jre/lib/${JDK_ARCH}/server/.debug \ 228 ${JDK_HOME}/jre/lib/${JDK_ARCH}/server/.debug \
230 ${JDK_HOME}/jre/lib/${JDK_ARCH}/headless/.debug \ 229 ${JDK_HOME}/jre/lib/${JDK_ARCH}/headless/.debug \
231 ${JDK_HOME}/jre/lib/${JDK_ARCH}/xawt/.debug \ 230 ${JDK_HOME}/jre/lib/${JDK_ARCH}/xawt/.debug \
232 ${JDK_HOME}/jre/lib/${JDK_ARCH}/client/.debug \ 231 ${JDK_HOME}/jre/lib/${JDK_ARCH}/client/.debug \
233 " 232"
234 233
235FILES_${JDKPN}-demo = "${JDK_HOME}/demo ${JDK_HOME}/sample" 234FILES_${JDKPN}-demo = "${JDK_HOME}/demo ${JDK_HOME}/sample"
236RDEPENDS_${JDKPN}-demo = "${JDKPN}-jre" 235RDEPENDS_${JDKPN}-demo = "${JDKPN}-jre"
237FILES_${JDKPN}-demo-dbg = "\ 236FILES_${JDKPN}-demo-dbg = "\
238 ${JDK_HOME}/demo/jvmti/gctest/lib/.debug \ 237 ${JDK_HOME}/demo/jvmti/gctest/lib/.debug \
239 ${JDK_HOME}/demo/jvmti/heapTracker/lib/.debug \ 238 ${JDK_HOME}/demo/jvmti/heapTracker/lib/.debug \
240 ${JDK_HOME}/demo/jvmti/heapViewer/lib/.debug \ 239 ${JDK_HOME}/demo/jvmti/heapViewer/lib/.debug \
241 ${JDK_HOME}/demo/jvmti/hprof/lib/.debug \ 240 ${JDK_HOME}/demo/jvmti/hprof/lib/.debug \
242 ${JDK_HOME}/demo/jvmti/minst/lib/.debug \ 241 ${JDK_HOME}/demo/jvmti/minst/lib/.debug \
243 ${JDK_HOME}/demo/jvmti/mtrace/lib/.debug \ 242 ${JDK_HOME}/demo/jvmti/mtrace/lib/.debug \
244 ${JDK_HOME}/demo/jvmti/versionCheck/lib/.debug \ 243 ${JDK_HOME}/demo/jvmti/versionCheck/lib/.debug \
245 ${JDK_HOME}/demo/jvmti/waiters/lib/.debug \ 244 ${JDK_HOME}/demo/jvmti/waiters/lib/.debug \
246 ${JDK_HOME}/demo/jvmti/compiledMethodLoad/lib/.debug \ 245 ${JDK_HOME}/demo/jvmti/compiledMethodLoad/lib/.debug \
247 " 246"
248 247
249FILES_${JDKPN}-source = "${JDK_HOME}/src.zip" 248FILES_${JDKPN}-source = "${JDK_HOME}/src.zip"
250 249
@@ -253,27 +252,27 @@ FILES_${JDKPN}-java = "${JDK_HOME}/jre/bin/java"
253FILES_${JDKPN}-vm-zero = "${JDK_HOME}/jre/lib/${JDK_ARCH}/server/" 252FILES_${JDKPN}-vm-zero = "${JDK_HOME}/jre/lib/${JDK_ARCH}/server/"
254 253
255FILES_${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \ 254FILES_${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \
256 ${JDK_HOME}/jre/THIRD_PARTY_README \ 255 ${JDK_HOME}/jre/THIRD_PARTY_README \
257 ${JDK_HOME}/jre/LICENSE \ 256 ${JDK_HOME}/jre/LICENSE \
258 ${JDK_HOME}/ASSEMBLY_EXCEPTION \ 257 ${JDK_HOME}/ASSEMBLY_EXCEPTION \
259 ${JDK_HOME}/THIRD_PARTY_README \ 258 ${JDK_HOME}/THIRD_PARTY_README \
260 ${JDK_HOME}/LICENSE \ 259 ${JDK_HOME}/LICENSE \
261 ${JDK_HOME}/release \ 260 ${JDK_HOME}/release \
262 ${JDK_HOME}/jre/lib \ 261 ${JDK_HOME}/jre/lib \
263 " 262"
264 263
265FILES_${PN}_append = " \ 264FILES_${PN}_append = " \
266 ${JDK_HOME}/jre/bin/keytool \ 265 ${JDK_HOME}/jre/bin/keytool \
267 ${JDK_HOME}/jre/bin/orbd \ 266 ${JDK_HOME}/jre/bin/orbd \
268 ${JDK_HOME}/jre/bin/pack200 \ 267 ${JDK_HOME}/jre/bin/pack200 \
269 ${JDK_HOME}/jre/bin/rmid \ 268 ${JDK_HOME}/jre/bin/rmid \
270 ${JDK_HOME}/jre/bin/rmiregistry \ 269 ${JDK_HOME}/jre/bin/rmiregistry \
271 ${JDK_HOME}/jre/bin/servertool \ 270 ${JDK_HOME}/jre/bin/servertool \
272 ${JDK_HOME}/jre/bin/tnameserv \ 271 ${JDK_HOME}/jre/bin/tnameserv \
273 ${JDK_HOME}/jre/bin/unpack200 \ 272 ${JDK_HOME}/jre/bin/unpack200 \
274 ${JDK_HOME}/jre/bin/policytool \ 273 ${JDK_HOME}/jre/bin/policytool \
275 ${JDK_HOME}/jre/bin/javaws \ 274 ${JDK_HOME}/jre/bin/javaws \
276 " 275"
277 276
278RDEPENDS_${JDKPN}-common = "librhino-java" 277RDEPENDS_${JDKPN}-common = "librhino-java"
279 278
@@ -296,10 +295,10 @@ INSANE_SKIP_${JDKPN}-vm-zero = "dev-so"
296INSANE_SKIP_${JDKPN}-common = "dev-so" 295INSANE_SKIP_${JDKPN}-common = "dev-so"
297 296
298FILES_${JDKPN}-jdk = " \ 297FILES_${JDKPN}-jdk = " \
299 ${JDK_HOME}/bin \ 298 ${JDK_HOME}/bin \
300 ${JDK_HOME}/lib \ 299 ${JDK_HOME}/lib \
301 ${JDK_HOME}/include \ 300 ${JDK_HOME}/include \
302 " 301"
303RDEPENDS_${JDKPN}-jre = "${JDKPN}-java ${JDKPN}-common" 302RDEPENDS_${JDKPN}-jre = "${JDKPN}-java ${JDKPN}-common"
304RDEPENDS_${JDKPN}-java = "${JDKPN}-common" 303RDEPENDS_${JDKPN}-java = "${JDKPN}-common"
305RPROVIDES_${JDKPN}-jre = "java2-runtime" 304RPROVIDES_${JDKPN}-jre = "java2-runtime"
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 92613a2..4bff40a 100644
--- a/recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb
+++ b/recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb
@@ -45,26 +45,26 @@ SRC_URI[hotspot.sha256sum] = "39bc54bf343e1dce404b8c95285c0457a8d0a7c7aedfb55055
45############################################################################### 45###############################################################################
46# PATCHES - split up to allow overriding them separately 46# PATCHES - split up to allow overriding them separately
47OEPATCHES = "\ 47OEPATCHES = "\
48 file://build-hacks.patch \ 48 file://build-hacks.patch \
49 file://fix_hotspot_crosscompile.patch \ 49 file://fix_hotspot_crosscompile.patch \
50 " 50"
51 51
52ICEDTEAPATCHES = "\ 52ICEDTEAPATCHES = "\
53 file://icedtea-zero-hotspotfix.patch;apply=no \ 53 file://icedtea-zero-hotspotfix.patch;apply=no \
54 file://icedtea-jdk-nio-use-host-cc.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 \ 55 file://icedtea-jdk-build-nio-gensor-genuc-gensc-static.patch;apply=no \
56 file://icedtea-jdk-rmi-crosscompile.patch;apply=no \ 56 file://icedtea-jdk-rmi-crosscompile.patch;apply=no \
57 file://icedtea-crosscompile-fix.patch;apply=no \ 57 file://icedtea-crosscompile-fix.patch;apply=no \
58 file://icedtea-xawt-crosscompile-fix.patch;apply=no \ 58 file://icedtea-xawt-crosscompile-fix.patch;apply=no \
59 " 59"
60 60
61DISTRIBUTION_PATCHES = "\ 61DISTRIBUTION_PATCHES = "\
62 patches/icedtea-zero-hotspotfix.patch \ 62 patches/icedtea-zero-hotspotfix.patch \
63 patches/icedtea-jdk-nio-use-host-cc.patch \ 63 patches/icedtea-jdk-nio-use-host-cc.patch \
64 patches/icedtea-jdk-build-nio-gensor-genuc-gensc-static.patch \ 64 patches/icedtea-jdk-build-nio-gensor-genuc-gensc-static.patch \
65 patches/icedtea-jdk-rmi-crosscompile.patch \ 65 patches/icedtea-jdk-rmi-crosscompile.patch \
66 patches/icedtea-crosscompile-fix.patch \ 66 patches/icedtea-crosscompile-fix.patch \
67 patches/icedtea-xawt-crosscompile-fix.patch \ 67 patches/icedtea-xawt-crosscompile-fix.patch \
68 " 68"
69 69
70export DISTRIBUTION_PATCHES 70export DISTRIBUTION_PATCHES
diff --git a/recipes-core/openjdk/openjdk-postinst.inc b/recipes-core/openjdk/openjdk-postinst.inc
index ad275d7..e309a27 100644
--- a/recipes-core/openjdk/openjdk-postinst.inc
+++ b/recipes-core/openjdk/openjdk-postinst.inc
@@ -1,75 +1,75 @@
1# handles all postinst action for openjdk 1# handles all postinst action for openjdk
2 2
3pkg_postinst_${JDKPN}-vm-shark () { 3pkg_postinst_${JDKPN}-vm-shark () {
4 if grep -q "\-server ERROR" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then 4 if grep -q "\-server ERROR" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
5 sed -i -e "/\-shark.*/d" -e "s|\(^\-server*\)|\-shark KNOWN\n\1|" -e "/^$/d" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 5 sed -i -e "/\-shark.*/d" -e "s|\(^\-server*\)|\-shark KNOWN\n\1|" -e "/^$/d" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
6 else 6 else
7 sed -i -e "s/\-shark.*/\-shark KNOWN/" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 7 sed -i -e "s/\-shark.*/\-shark KNOWN/" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
8 fi 8 fi
9} 9}
10 10
11pkg_prerm_${JDKPN}-vm-shark () { 11pkg_prerm_${JDKPN}-vm-shark () {
12 sed -i -e "/^\-shark.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 12 sed -i -e "/^\-shark.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
13 if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then 13 if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
14 FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1` 14 FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1`
15 sed -i -e "/${FIRST_KNOWN}/d" -e "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 15 sed -i -e "/${FIRST_KNOWN}/d" -e "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
16 fi 16 fi
17 17
18 echo "-shark ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 18 echo "-shark ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
19} 19}
20 20
21pkg_postinst_${JDKPN}-vm-cacao () { 21pkg_postinst_${JDKPN}-vm-cacao () {
22 if grep -q "\-server ERROR" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then 22 if grep -q "\-server ERROR" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
23 sed -i -e "/\-cacao.*/d" -e "s|\(^\-server*\)|\-cacao KNOWN\n\1|" -e "/^$/d" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 23 sed -i -e "/\-cacao.*/d" -e "s|\(^\-server*\)|\-cacao KNOWN\n\1|" -e "/^$/d" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
24 else 24 else
25 sed -i -e "s/\-cacao.*/\-cacao KNOWN/" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 25 sed -i -e "s/\-cacao.*/\-cacao KNOWN/" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
26 fi 26 fi
27} 27}
28 28
29pkg_prerm_${JDKPN}-vm-cacao () { 29pkg_prerm_${JDKPN}-vm-cacao () {
30 sed -i -e "/^\-cacao.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 30 sed -i -e "/^\-cacao.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
31 if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then 31 if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
32 FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1` 32 FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1`
33 sed -i -e "/${FIRST_KNOWN}/d" -e "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 33 sed -i -e "/${FIRST_KNOWN}/d" -e "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
34 fi 34 fi
35 35
36 echo "-cacao ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 36 echo "-cacao ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
37} 37}
38 38
39pkg_postinst_${JDKPN}-vm-jamvm () { 39pkg_postinst_${JDKPN}-vm-jamvm () {
40 if grep -q "\-server ERROR" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then 40 if grep -q "\-server ERROR" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
41 sed -i -e "/\-jamvm.*/d" -e "s|\(^\-server*\)|\-jamvm KNOWN\n\1|" -e "/^$/d" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 41 sed -i -e "/\-jamvm.*/d" -e "s|\(^\-server*\)|\-jamvm KNOWN\n\1|" -e "/^$/d" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
42 else 42 else
43 sed -i -e "s/\-jamvm.*/\-jamvm KNOWN/" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 43 sed -i -e "s/\-jamvm.*/\-jamvm KNOWN/" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
44 fi 44 fi
45} 45}
46 46
47pkg_prerm_${JDKPN}-vm-jamvm () { 47pkg_prerm_${JDKPN}-vm-jamvm () {
48 sed -i -e "/^\-jamvm.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 48 sed -i -e "/^\-jamvm.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
49 if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then 49 if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
50 FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1` 50 FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1`
51 sed -i -e "/${FIRST_KNOWN}/d" -e "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 51 sed -i -e "/${FIRST_KNOWN}/d" -e "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
52 fi 52 fi
53 53
54 echo "-jamvm ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 54 echo "-jamvm ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
55} 55}
56 56
57pkg_postinst_${JDKPN}-vm-zero () { 57pkg_postinst_${JDKPN}-vm-zero () {
58 if grep -q "KNOWN" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then 58 if grep -q "KNOWN" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
59 FIRST_KNOWN=`grep "KNOWN" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1` 59 FIRST_KNOWN=`grep "KNOWN" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1`
60 sed -i -e "/${FIRST_KNOWN}/d" -e "/^$/d" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 60 sed -i -e "/${FIRST_KNOWN}/d" -e "/^$/d" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
61 echo ${FIRST_KNOWN} >> $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 61 echo ${FIRST_KNOWN} >> $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
62 fi 62 fi
63 63
64 sed -i -e "s|^\-server.*|\-server KNOWN|" -e "/^$/d" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 64 sed -i -e "s|^\-server.*|\-server KNOWN|" -e "/^$/d" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
65} 65}
66 66
67pkg_prerm_${JDKPN}-vm-zero () { 67pkg_prerm_${JDKPN}-vm-zero () {
68 sed -i -e "/^\-server.*/\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 68 sed -i -e "/^\-server.*/\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
69 if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then 69 if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
70 FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1` 70 FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1`
71 sed -i -e "/${FIRST_KNOWN}/d" -e "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 71 sed -i -e "/${FIRST_KNOWN}/d" -e "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
72 fi 72 fi
73} 73}
74 74
75inherit update-alternatives 75inherit update-alternatives
@@ -82,4 +82,3 @@ ALTERNATIVE_TARGET_${JDKPN}-jdk = "${JDK_HOME}/bin/javac"
82 82
83ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" 83ALTERNATIVE_LINK_NAME[java] = "${bindir}/java"
84ALTERNATIVE_LINK_NAME[javac] = "${bindir}/javac" 84ALTERNATIVE_LINK_NAME[javac] = "${bindir}/javac"
85
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-10-24 07:04:17 +0000