diff options
| -rw-r--r-- | recipes-core/openjdk/openjdk-6-common.inc | 24 | 
1 files changed, 12 insertions, 12 deletions
| diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc index 2b4b9f7..a53f8c9 100644 --- a/recipes-core/openjdk/openjdk-6-common.inc +++ b/recipes-core/openjdk/openjdk-6-common.inc | |||
| @@ -54,7 +54,7 @@ DEPENDS_append = " qemu-native " | |||
| 54 | # No package should directly depend on this (it should require | 54 | # No package should directly depend on this (it should require | 
| 55 | # java2-runtime instead). | 55 | # java2-runtime instead). | 
| 56 | PRIVATE_LIBS = "\ | 56 | PRIVATE_LIBS = "\ | 
| 57 | libunpack.so libverify.so libjava.so libzip.so libnpt.so \ | 57 | libunpack.so libverify.so libjava.so libzip.so libnpt.so \ | 
| 58 | libjava_crw_demo.so libhprof.so libnet.so libnio.so \ | 58 | libjava_crw_demo.so libhprof.so libnet.so libnio.so \ | 
| 59 | libmanagement.so libinstrument.so libjsound.so libjsoundalsa.so \ | 59 | libmanagement.so libinstrument.so libjsound.so libjsoundalsa.so \ | 
| 60 | libj2pcsc.so libj2pkcs11.so libj2gss.so libmlib_image.so \ | 60 | libj2pcsc.so libj2pkcs11.so libj2gss.so libmlib_image.so \ | 
| @@ -127,14 +127,14 @@ JDK_HOME = "${libdir_jvm}/${JDK_DIR}" | |||
| 127 | 127 | ||
| 128 | # OpenJDK supports parallel compilation but uses a plain number for this. | 128 | # OpenJDK supports parallel compilation but uses a plain number for this. | 
| 129 | # In OE we have PARALLEL_MAKE which is the actual option passed to make, | 129 | # In OE we have PARALLEL_MAKE which is the actual option passed to make, | 
| 130 | # e.g. "-j 4". | 130 | # e.g. "-j 4". | 
| 131 | def get_jdk_jobs(d): | 131 | def get_jdk_jobs(d): | 
| 132 | import bb | 132 | import bb | 
| 133 | 133 | ||
| 134 | pm = bb.data.getVar('PARALLEL_MAKE', d, 1); | 134 | pm = bb.data.getVar('PARALLEL_MAKE', d, 1); | 
| 135 | if not pm: | 135 | if not pm: | 
| 136 | return "1" | 136 | return "1" | 
| 137 | 137 | ||
| 138 | pm = pm.split(" "); | 138 | pm = pm.split(" "); | 
| 139 | if (len(pm) == 2): | 139 | if (len(pm) == 2): | 
| 140 | return pm[1] | 140 | return pm[1] | 
| @@ -323,7 +323,7 @@ do_install() { | |||
| 323 | 323 | ||
| 324 | # JRE is a subset of JDK. So to save space and resemble what the BIG distros | 324 | # JRE is a subset of JDK. So to save space and resemble what the BIG distros | 
| 325 | # do we create symlinks from the JDK binaries to their counterparts in the | 325 | # do we create symlinks from the JDK binaries to their counterparts in the | 
| 326 | # JRE folder (which have to exist by that time b/c of dependencies). | 326 | # JRE folder (which have to exist by that time b/c of dependencies). | 
| 327 | for F in `find ${D}${JDK_HOME}/jre/bin -type f` | 327 | for F in `find ${D}${JDK_HOME}/jre/bin -type f` | 
| 328 | do | 328 | do | 
| 329 | bf=`basename $F` | 329 | bf=`basename $F` | 
| @@ -429,7 +429,7 @@ RPROVIDES_${JDKPN}-vm-cacao = "java2-vm" | |||
| 429 | RPROVIDES_${JDKPN}-vm-jamvm = "java2-vm" | 429 | RPROVIDES_${JDKPN}-vm-jamvm = "java2-vm" | 
| 430 | 430 | ||
| 431 | # Even though a vm is a hard dependency it is set as RRECOMMENDS so a single vm can get uninstalled: | 431 | # Even though a vm is a hard dependency it is set as RRECOMMENDS so a single vm can get uninstalled: | 
| 432 | # root@beaglebone:~/java# opkg remove openjdk-6-vm-shark | 432 | # root@beaglebone:~/java# opkg remove openjdk-6-vm-shark | 
| 433 | # No packages removed. | 433 | # No packages removed. | 
| 434 | # Collected errors: | 434 | # Collected errors: | 
| 435 | # * print_dependents_warning: Package openjdk-6-vm-shark is depended upon by packages: | 435 | # * print_dependents_warning: Package openjdk-6-vm-shark is depended upon by packages: | 
| @@ -467,11 +467,11 @@ pkg_postinst_${JDKPN}-vm-shark () { | |||
| 467 | sed -i -e "/\-shark.*/d" -e "s|\(^\-server*\)|\-shark KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 467 | sed -i -e "/\-shark.*/d" -e "s|\(^\-server*\)|\-shark KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 
| 468 | else | 468 | else | 
| 469 | sed -i -e "s/\-shark.*/\-shark KNOWN/" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 469 | sed -i -e "s/\-shark.*/\-shark KNOWN/" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 
| 470 | fi | 470 | fi | 
| 471 | } | 471 | } | 
| 472 | 472 | ||
| 473 | pkg_prerm_${JDKPN}-vm-shark () { | 473 | pkg_prerm_${JDKPN}-vm-shark () { | 
| 474 | sed -i -e "/^\-shark.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 474 | sed -i -e "/^\-shark.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 
| 475 | 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 | 475 | 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 | 
| 476 | FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -1` | 476 | FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -1` | 
| 477 | sed -i -e "/${FIRST_KNOWN}/d" -e "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 477 | sed -i -e "/${FIRST_KNOWN}/d" -e "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 
| @@ -485,11 +485,11 @@ pkg_postinst_${JDKPN}-vm-cacao () { | |||
| 485 | sed -i -e "/\-cacao.*/d" -e "s|\(^\-server*\)|\-cacao KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 485 | sed -i -e "/\-cacao.*/d" -e "s|\(^\-server*\)|\-cacao KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 
| 486 | else | 486 | else | 
| 487 | sed -i -e "s/\-cacao.*/\-cacao KNOWN/" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 487 | sed -i -e "s/\-cacao.*/\-cacao KNOWN/" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 
| 488 | fi | 488 | fi | 
| 489 | } | 489 | } | 
| 490 | 490 | ||
| 491 | pkg_prerm_${JDKPN}-vm-cacao () { | 491 | pkg_prerm_${JDKPN}-vm-cacao () { | 
| 492 | sed -i -e "/^\-cacao.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 492 | sed -i -e "/^\-cacao.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 
| 493 | 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 | 493 | 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 | 
| 494 | FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -1` | 494 | FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -1` | 
| 495 | sed -i -e "/${FIRST_KNOWN}/d" -e "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 495 | sed -i -e "/${FIRST_KNOWN}/d" -e "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 
| @@ -503,11 +503,11 @@ pkg_postinst_${JDKPN}-vm-jamvm () { | |||
| 503 | sed -i -e "/\-jamvm.*/d" -e "s|\(^\-server*\)|\-jamvm KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 503 | sed -i -e "/\-jamvm.*/d" -e "s|\(^\-server*\)|\-jamvm KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 
| 504 | else | 504 | else | 
| 505 | sed -i -e "s/\-jamvm.*/\-jamvm KNOWN/" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 505 | sed -i -e "s/\-jamvm.*/\-jamvm KNOWN/" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 
| 506 | fi | 506 | fi | 
| 507 | } | 507 | } | 
| 508 | 508 | ||
| 509 | pkg_prerm_${JDKPN}-vm-jamvm () { | 509 | pkg_prerm_${JDKPN}-vm-jamvm () { | 
| 510 | sed -i -e "/^\-jamvm.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 510 | sed -i -e "/^\-jamvm.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 
| 511 | 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 | 511 | 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 | 
| 512 | FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -1` | 512 | FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -1` | 
| 513 | sed -i -e "/${FIRST_KNOWN}/d" -e "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 513 | sed -i -e "/${FIRST_KNOWN}/d" -e "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 
| @@ -527,7 +527,7 @@ pkg_postinst_${JDKPN}-vm-zero () { | |||
| 527 | } | 527 | } | 
| 528 | 528 | ||
| 529 | pkg_prerm_${JDKPN}-vm-zero () { | 529 | pkg_prerm_${JDKPN}-vm-zero () { | 
| 530 | sed -i -e "/^\-server.*/\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 530 | sed -i -e "/^\-server.*/\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 
| 531 | if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then | 531 | if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then | 
| 532 | FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -1` | 532 | FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -1` | 
| 533 | sed -i -e "/${FIRST_KNOWN}/d" -e "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 533 | sed -i -e "/${FIRST_KNOWN}/d" -e "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 
