diff options
author | AJ Bagwell <anthony.bagwell@hivehome.com> | 2021-08-09 14:09:37 +0100 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2021-08-11 07:19:27 +0200 |
commit | b71a9866abfd5292650ef0afc5ecb9ab5e29b887 (patch) | |
tree | 8e7cfd6025f06b4138e2f5fbca61dce7d3a13bac /recipes-core/openjdk/openjdk-7-common.inc | |
parent | 984f25b6deb5fe4acf82d51c04b2c1392a542723 (diff) | |
download | meta-java-b71a9866abfd5292650ef0afc5ecb9ab5e29b887.tar.gz |
all: run convert-overrides (0.9.3) script to convert to new override format
Signed-off-by: AJ Bagwell <anthony.bagwell@hivehome.com>
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk/openjdk-7-common.inc')
-rw-r--r-- | recipes-core/openjdk/openjdk-7-common.inc | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc index c87266d..61b62b9 100644 --- a/recipes-core/openjdk/openjdk-7-common.inc +++ b/recipes-core/openjdk/openjdk-7-common.inc | |||
@@ -8,13 +8,13 @@ ICEDTEA_VERSION = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False), | |||
8 | 8 | ||
9 | S = "${WORKDIR}/${ICEDTEA}" | 9 | S = "${WORKDIR}/${ICEDTEA}" |
10 | 10 | ||
11 | DEPENDS_append_libc-uclibc = " virtual/libiconv " | 11 | DEPENDS:append_libc-uclibc = " virtual/libiconv " |
12 | 12 | ||
13 | # The OpenJDK build with interpreter optimizations for ARM depends on a binary | 13 | # The OpenJDK build with interpreter optimizations for ARM depends on a binary |
14 | # that generates constants for an assembler source file. There is no other | 14 | # that generates constants for an assembler source file. There is no other |
15 | # way than to generate this on a pseudo machine. Cross-compiling would not help | 15 | # way than to generate this on a pseudo machine. Cross-compiling would not help |
16 | # because structure sizes and/or alignment may differ. | 16 | # because structure sizes and/or alignment may differ. |
17 | DEPENDS_append = " qemu-native " | 17 | DEPENDS:append = " qemu-native " |
18 | 18 | ||
19 | B = "${S}/build" | 19 | B = "${S}/build" |
20 | 20 | ||
@@ -138,14 +138,14 @@ EXTRA_OECONF += " \ | |||
138 | --disable-system-sctp \ | 138 | --disable-system-sctp \ |
139 | " | 139 | " |
140 | 140 | ||
141 | do_configure_prepend() { | 141 | do_configure:prepend() { |
142 | # Automatically copy everything that starts with "icedtea" (or "cacao") and ends with | 142 | # Automatically copy everything that starts with "icedtea" (or "cacao") and ends with |
143 | # ".patch" into the patches directory. | 143 | # ".patch" into the patches directory. |
144 | find ${WORKDIR} -maxdepth 1 -name "icedtea*.patch" -exec cp {} ${S}/patches \; | 144 | find ${WORKDIR} -maxdepth 1 -name "icedtea*.patch" -exec cp {} ${S}/patches \; |
145 | find ${WORKDIR} -maxdepth 1 -name "cacao*.patch" -exec cp {} ${S}/patches \; | 145 | find ${WORKDIR} -maxdepth 1 -name "cacao*.patch" -exec cp {} ${S}/patches \; |
146 | } | 146 | } |
147 | 147 | ||
148 | do_configure_append() { | 148 | do_configure:append() { |
149 | oe_runmake patch | 149 | oe_runmake patch |
150 | } | 150 | } |
151 | 151 | ||
@@ -168,7 +168,7 @@ EXTRA_OEMAKE += ' \ | |||
168 | 168 | ||
169 | OE_LAUNCHER_LDFLAGS = "-Wl,-rpath-link,${STAGING_LIBDIR}/llvm${WANT_LLVM_RELEASE} -Wl,-rpath,${libdir}/llvm${WANT_LLVM_RELEASE}" | 169 | OE_LAUNCHER_LDFLAGS = "-Wl,-rpath-link,${STAGING_LIBDIR}/llvm${WANT_LLVM_RELEASE} -Wl,-rpath,${libdir}/llvm${WANT_LLVM_RELEASE}" |
170 | 170 | ||
171 | OE_LAUNCHER_LDFLAGS_arm = "" | 171 | OE_LAUNCHER_LDFLAGS:arm = "" |
172 | 172 | ||
173 | EXTRA_OEMAKE += 'OE_LAUNCHER_LDFLAGS="${OE_LAUNCHER_LDFLAGS}"' | 173 | EXTRA_OEMAKE += 'OE_LAUNCHER_LDFLAGS="${OE_LAUNCHER_LDFLAGS}"' |
174 | 174 | ||
@@ -229,7 +229,7 @@ PACKAGES = " \ | |||
229 | ${JDKPN}-common \ | 229 | ${JDKPN}-common \ |
230 | " | 230 | " |
231 | 231 | ||
232 | FILES_${JDKPN}-dbg = "\ | 232 | FILES:${JDKPN}-dbg = "\ |
233 | ${JDK_HOME}/bin/.debug \ | 233 | ${JDK_HOME}/bin/.debug \ |
234 | ${JDK_HOME}/lib/.debug \ | 234 | ${JDK_HOME}/lib/.debug \ |
235 | ${JDK_HOME}/lib/${JDK_ARCH}/jli/.debug \ | 235 | ${JDK_HOME}/lib/${JDK_ARCH}/jli/.debug \ |
@@ -244,9 +244,9 @@ FILES_${JDKPN}-dbg = "\ | |||
244 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/client/.debug \ | 244 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/client/.debug \ |
245 | " | 245 | " |
246 | 246 | ||
247 | FILES_${JDKPN}-demo = "${JDK_HOME}/demo ${JDK_HOME}/sample" | 247 | FILES:${JDKPN}-demo = "${JDK_HOME}/demo ${JDK_HOME}/sample" |
248 | RDEPENDS_${JDKPN}-demo = "${JDKPN}-jre" | 248 | RDEPENDS:${JDKPN}-demo = "${JDKPN}-jre" |
249 | FILES_${JDKPN}-demo-dbg = "\ | 249 | FILES:${JDKPN}-demo-dbg = "\ |
250 | ${JDK_HOME}/demo/jvmti/gctest/lib/.debug \ | 250 | ${JDK_HOME}/demo/jvmti/gctest/lib/.debug \ |
251 | ${JDK_HOME}/demo/jvmti/heapTracker/lib/.debug \ | 251 | ${JDK_HOME}/demo/jvmti/heapTracker/lib/.debug \ |
252 | ${JDK_HOME}/demo/jvmti/heapViewer/lib/.debug \ | 252 | ${JDK_HOME}/demo/jvmti/heapViewer/lib/.debug \ |
@@ -258,13 +258,13 @@ FILES_${JDKPN}-demo-dbg = "\ | |||
258 | ${JDK_HOME}/demo/jvmti/compiledMethodLoad/lib/.debug \ | 258 | ${JDK_HOME}/demo/jvmti/compiledMethodLoad/lib/.debug \ |
259 | " | 259 | " |
260 | 260 | ||
261 | FILES_${JDKPN}-source = "${JDK_HOME}/src.zip" | 261 | FILES:${JDKPN}-source = "${JDK_HOME}/src.zip" |
262 | 262 | ||
263 | FILES_${JDKPN}-java = "${JDK_HOME}/jre/bin/java" | 263 | FILES:${JDKPN}-java = "${JDK_HOME}/jre/bin/java" |
264 | 264 | ||
265 | FILES_${JDKPN}-vm-zero = "${JDK_HOME}/jre/lib/${JDK_ARCH}/server/" | 265 | FILES:${JDKPN}-vm-zero = "${JDK_HOME}/jre/lib/${JDK_ARCH}/server/" |
266 | 266 | ||
267 | FILES_${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \ | 267 | FILES:${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \ |
268 | ${JDK_HOME}/jre/THIRD_PARTY_README \ | 268 | ${JDK_HOME}/jre/THIRD_PARTY_README \ |
269 | ${JDK_HOME}/jre/LICENSE \ | 269 | ${JDK_HOME}/jre/LICENSE \ |
270 | ${JDK_HOME}/ASSEMBLY_EXCEPTION \ | 270 | ${JDK_HOME}/ASSEMBLY_EXCEPTION \ |
@@ -274,7 +274,7 @@ FILES_${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \ | |||
274 | ${JDK_HOME}/jre/lib \ | 274 | ${JDK_HOME}/jre/lib \ |
275 | " | 275 | " |
276 | 276 | ||
277 | FILES_${PN}_append = " \ | 277 | FILES:${PN}:append = " \ |
278 | ${JDK_HOME}/jre/bin/keytool \ | 278 | ${JDK_HOME}/jre/bin/keytool \ |
279 | ${JDK_HOME}/jre/bin/orbd \ | 279 | ${JDK_HOME}/jre/bin/orbd \ |
280 | ${JDK_HOME}/jre/bin/pack200 \ | 280 | ${JDK_HOME}/jre/bin/pack200 \ |
@@ -287,9 +287,9 @@ FILES_${PN}_append = " \ | |||
287 | ${JDK_HOME}/jre/bin/javaws \ | 287 | ${JDK_HOME}/jre/bin/javaws \ |
288 | " | 288 | " |
289 | 289 | ||
290 | RDEPENDS_${JDKPN}-common = "librhino-java" | 290 | RDEPENDS:${JDKPN}-common = "librhino-java" |
291 | 291 | ||
292 | RPROVIDES_${JDKPN}-vm-zero = "java2-vm" | 292 | RPROVIDES:${JDKPN}-vm-zero = "java2-vm" |
293 | 293 | ||
294 | # Even though a vm is a hard dependency it is set as RRECOMMENDS so a single vm can get uninstalled: | 294 | # Even though a vm is a hard dependency it is set as RRECOMMENDS so a single vm can get uninstalled: |
295 | # root@beaglebone:~/java# opkg remove openjdk-7-vm-shark | 295 | # root@beaglebone:~/java# opkg remove openjdk-7-vm-shark |
@@ -298,39 +298,39 @@ RPROVIDES_${JDKPN}-vm-zero = "java2-vm" | |||
298 | # * print_dependents_warning: Package openjdk-7-vm-shark is depended upon by packages: | 298 | # * print_dependents_warning: Package openjdk-7-vm-shark is depended upon by packages: |
299 | # * print_dependents_warning: openjdk-7-java | 299 | # * print_dependents_warning: openjdk-7-java |
300 | # * print_dependents_warning: These might cease to work if package openjdk-7-vm-shark is removed. | 300 | # * print_dependents_warning: These might cease to work if package openjdk-7-vm-shark is removed. |
301 | RRECOMMENDS_${JDKPN}-java = "java2-vm" | 301 | RRECOMMENDS:${JDKPN}-java = "java2-vm" |
302 | 302 | ||
303 | # For some reason shark and cacao do not automatically depends on -common. | 303 | # For some reason shark and cacao do not automatically depends on -common. |
304 | # So we add that manually. | 304 | # So we add that manually. |
305 | 305 | ||
306 | # There is a symlink to a .so but this one is valid. | 306 | # There is a symlink to a .so but this one is valid. |
307 | INSANE_SKIP_${JDKPN}-vm-zero = "dev-so" | 307 | INSANE_SKIP:${JDKPN}-vm-zero = "dev-so" |
308 | INSANE_SKIP_${JDKPN}-common = "dev-so" | 308 | INSANE_SKIP:${JDKPN}-common = "dev-so" |
309 | 309 | ||
310 | # libfreetype.so.6 is copied from STAGING_LIBDIR | 310 | # libfreetype.so.6 is copied from STAGING_LIBDIR |
311 | # which is already stripped. | 311 | # which is already stripped. |
312 | INSANE_SKIP_${JDKPN}-jre = "already-stripped" | 312 | INSANE_SKIP:${JDKPN}-jre = "already-stripped" |
313 | 313 | ||
314 | FILES_${JDKPN}-jdk = " \ | 314 | FILES:${JDKPN}-jdk = " \ |
315 | ${JDK_HOME}/bin \ | 315 | ${JDK_HOME}/bin \ |
316 | ${JDK_HOME}/lib \ | 316 | ${JDK_HOME}/lib \ |
317 | ${JDK_HOME}/include \ | 317 | ${JDK_HOME}/include \ |
318 | ${JDK_HOME}${libdir}/jvm \ | 318 | ${JDK_HOME}${libdir}/jvm \ |
319 | " | 319 | " |
320 | RDEPENDS_${JDKPN}-jre = "${JDKPN}-java ${JDKPN}-common" | 320 | RDEPENDS:${JDKPN}-jre = "${JDKPN}-java ${JDKPN}-common" |
321 | RDEPENDS_${JDKPN}-java = "${JDKPN}-common" | 321 | RDEPENDS:${JDKPN}-java = "${JDKPN}-common" |
322 | RPROVIDES_${JDKPN}-jre = "java2-runtime" | 322 | RPROVIDES:${JDKPN}-jre = "java2-runtime" |
323 | 323 | ||
324 | RDEPENDS_${JDKPN}-jdk = "${JDKPN}-jre" | 324 | RDEPENDS:${JDKPN}-jdk = "${JDKPN}-jre" |
325 | 325 | ||
326 | FILES_${JDKPN}-doc = "${JDK_HOME}/man" | 326 | FILES:${JDKPN}-doc = "${JDK_HOME}/man" |
327 | 327 | ||
328 | # Name of the directory containing the compiled output | 328 | # Name of the directory containing the compiled output |
329 | BUILD_DIR = "openjdk.build" | 329 | BUILD_DIR = "openjdk.build" |
330 | BUILD_DIR_ECJ = "openjdk.build-ecj" | 330 | BUILD_DIR_ECJ = "openjdk.build-ecj" |
331 | 331 | ||
332 | # Force arm mode for now | 332 | # Force arm mode for now |
333 | ARM_INSTRUCTION_SET_armv4t = "ARM" | 333 | ARM_INSTRUCTION_SET:armv4t = "ARM" |
334 | 334 | ||
335 | ICEDTEA_URI = "http://icedtea.wildebeest.org/download/source/${ICEDTEA}.tar.gz;name=iced" | 335 | ICEDTEA_URI = "http://icedtea.wildebeest.org/download/source/${ICEDTEA}.tar.gz;name=iced" |
336 | 336 | ||
@@ -361,7 +361,7 @@ LANGTOOLS_URI = "${ICEDTEA_DROP_URL}/${LANGTOOLS_FILE};name=langtools;unpack=fal | |||
361 | # handles all postinst action for openjdk | 361 | # handles all postinst action for openjdk |
362 | # some of the former results in a build error because "ERR" is in the first line. | 362 | # some of the former results in a build error because "ERR" is in the first line. |
363 | 363 | ||
364 | pkg_postinst_ontarget_${JDKPN}-vm-shark () { | 364 | pkg_postinst_ontarget:${JDKPN}-vm-shark () { |
365 | true | 365 | true |
366 | if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then | 366 | if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then |
367 | sed -i -e "/\-shark.*/d" -e "s|\(^\-server*\)|\-shark KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 367 | sed -i -e "/\-shark.*/d" -e "s|\(^\-server*\)|\-shark KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg |
@@ -370,7 +370,7 @@ pkg_postinst_ontarget_${JDKPN}-vm-shark () { | |||
370 | fi | 370 | fi |
371 | } | 371 | } |
372 | 372 | ||
373 | pkg_prerm_${JDKPN}-vm-shark () { | 373 | pkg_prerm:${JDKPN}-vm-shark () { |
374 | true | 374 | true |
375 | sed -i -e "/^\-shark.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 375 | sed -i -e "/^\-shark.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg |
376 | 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 | 376 | 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 |
@@ -381,7 +381,7 @@ pkg_prerm_${JDKPN}-vm-shark () { | |||
381 | echo "-shark ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 381 | echo "-shark ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg |
382 | } | 382 | } |
383 | 383 | ||
384 | pkg_postinst_ontarget_${JDKPN}-vm-cacao () { | 384 | pkg_postinst_ontarget:${JDKPN}-vm-cacao () { |
385 | true | 385 | true |
386 | if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then | 386 | if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then |
387 | sed -i -e "/\-cacao.*/d" -e "s|\(^\-server*\)|\-cacao KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 387 | sed -i -e "/\-cacao.*/d" -e "s|\(^\-server*\)|\-cacao KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg |
@@ -390,7 +390,7 @@ pkg_postinst_ontarget_${JDKPN}-vm-cacao () { | |||
390 | fi | 390 | fi |
391 | } | 391 | } |
392 | 392 | ||
393 | pkg_prerm_${JDKPN}-vm-cacao () { | 393 | pkg_prerm:${JDKPN}-vm-cacao () { |
394 | true | 394 | true |
395 | sed -i -e "/^\-cacao.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 395 | sed -i -e "/^\-cacao.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg |
396 | 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 | 396 | 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 |
@@ -401,7 +401,7 @@ pkg_prerm_${JDKPN}-vm-cacao () { | |||
401 | echo "-cacao ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 401 | echo "-cacao ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg |
402 | } | 402 | } |
403 | 403 | ||
404 | pkg_postinst_ontarget_${JDKPN}-vm-jamvm () { | 404 | pkg_postinst_ontarget:${JDKPN}-vm-jamvm () { |
405 | true | 405 | true |
406 | if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then | 406 | if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then |
407 | sed -i -e "/\-jamvm.*/d" -e "s|\(^\-server*\)|\-jamvm KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 407 | sed -i -e "/\-jamvm.*/d" -e "s|\(^\-server*\)|\-jamvm KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg |
@@ -410,7 +410,7 @@ pkg_postinst_ontarget_${JDKPN}-vm-jamvm () { | |||
410 | fi | 410 | fi |
411 | } | 411 | } |
412 | 412 | ||
413 | pkg_prerm_${JDKPN}-vm-jamvm () { | 413 | pkg_prerm:${JDKPN}-vm-jamvm () { |
414 | true | 414 | true |
415 | sed -i -e "/^\-jamvm.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 415 | sed -i -e "/^\-jamvm.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg |
416 | 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 | 416 | 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 |
@@ -421,7 +421,7 @@ pkg_prerm_${JDKPN}-vm-jamvm () { | |||
421 | echo "-jamvm ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 421 | echo "-jamvm ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg |
422 | } | 422 | } |
423 | 423 | ||
424 | pkg_postinst_ontarget_${JDKPN}-vm-zero () { | 424 | pkg_postinst_ontarget:${JDKPN}-vm-zero () { |
425 | true | 425 | true |
426 | 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 | 426 | 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 |
427 | FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1` | 427 | FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1` |
@@ -432,7 +432,7 @@ pkg_postinst_ontarget_${JDKPN}-vm-zero () { | |||
432 | sed -i -e "s|^\-server.*|\-server KNOWN|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 432 | sed -i -e "s|^\-server.*|\-server KNOWN|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg |
433 | } | 433 | } |
434 | 434 | ||
435 | pkg_prerm_${JDKPN}-vm-zero () { | 435 | pkg_prerm:${JDKPN}-vm-zero () { |
436 | true | 436 | true |
437 | sed -i -e "/^\-server.*/\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 437 | sed -i -e "/^\-server.*/\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg |
438 | if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then | 438 | if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then |
@@ -441,14 +441,14 @@ pkg_prerm_${JDKPN}-vm-zero () { | |||
441 | fi | 441 | fi |
442 | } | 442 | } |
443 | 443 | ||
444 | pkg_postinst_${JDKPN}-jre () { | 444 | pkg_postinst:${JDKPN}-jre () { |
445 | ln -s ${JDK_HOME}/jre $D/${libdir}/jvm/jre | 445 | ln -s ${JDK_HOME}/jre $D/${libdir}/jvm/jre |
446 | } | 446 | } |
447 | 447 | ||
448 | inherit update-alternatives | 448 | inherit update-alternatives |
449 | 449 | ||
450 | ALTERNATIVE_${JDKPN}-jre = "java keytool" | 450 | ALTERNATIVE:${JDKPN}-jre = "java keytool" |
451 | ALTERNATIVE_${JDKPN}-jdk = "javac" | 451 | ALTERNATIVE:${JDKPN}-jdk = "javac" |
452 | 452 | ||
453 | ALTERNATIVE_TARGET[java] = "${JDK_HOME}/jre/bin/java" | 453 | ALTERNATIVE_TARGET[java] = "${JDK_HOME}/jre/bin/java" |
454 | ALTERNATIVE_TARGET[javac] = "${JDK_HOME}/bin/javac" | 454 | ALTERNATIVE_TARGET[javac] = "${JDK_HOME}/bin/javac" |