summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/openjdk-6-common.inc
diff options
context:
space:
mode:
authorJesse Gilles <jgilles@multitech.com>2012-01-30 09:34:05 -0600
committerJesse Gilles <jgilles@multitech.com>2012-01-30 09:34:05 -0600
commite37c3fc8b8fa6091983dd8cdb33153e62021bb9d (patch)
treef38b865fd6ed1de90c0bb12d0b4172e756373580 /recipes-core/openjdk/openjdk-6-common.inc
parentef2def27a34f906f8c5725ab91213ad70f7d5909 (diff)
downloadmeta-java-e37c3fc8b8fa6091983dd8cdb33153e62021bb9d.tar.gz
openjdk-6: fix postinst for shark, cacao, jamvm
Signed-off-by: Jesse Gilles <jgilles@multitech.com>
Diffstat (limited to 'recipes-core/openjdk/openjdk-6-common.inc')
-rw-r--r--recipes-core/openjdk/openjdk-6-common.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc
index f9cef5a..b4ea9ab 100644
--- a/recipes-core/openjdk/openjdk-6-common.inc
+++ b/recipes-core/openjdk/openjdk-6-common.inc
@@ -466,7 +466,7 @@ pkg_postinst_${JDKPN}-vm-shark () {
466 if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/arm/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg; then 466 if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/arm/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg; then
467 sed -i -e "/\-shark.*/d" -e "s|\(^\-server*\)|\-shark KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg 467 sed -i -e "/\-shark.*/d" -e "s|\(^\-server*\)|\-shark KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg
468 else 468 else
469 sed -i -e "/\-shark.*/\-shark KNOWN/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg 469 sed -i -e "s/\-shark.*/\-shark KNOWN/" ${JDK_HOME}/jre/lib/arm/jvm.cfg
470 fi 470 fi
471} 471}
472 472
@@ -484,7 +484,7 @@ pkg_postinst_${JDKPN}-vm-cacao () {
484 if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/arm/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg; then 484 if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/arm/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg; then
485 sed -i -e "/\-cacao.*/d" -e "s|\(^\-server*\)|\-cacao KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg 485 sed -i -e "/\-cacao.*/d" -e "s|\(^\-server*\)|\-cacao KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg
486 else 486 else
487 sed -i -e "/\-cacao.*/\-cacao KNOWN/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg 487 sed -i -e "s/\-cacao.*/\-cacao KNOWN/" ${JDK_HOME}/jre/lib/arm/jvm.cfg
488 fi 488 fi
489} 489}
490 490
@@ -499,10 +499,10 @@ pkg_prerm_${JDKPN}-vm-cacao () {
499} 499}
500 500
501pkg_postinst_${JDKPN}-vm-jamvm () { 501pkg_postinst_${JDKPN}-vm-jamvm () {
502 if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/arm/jvm.cfg && ! grep -q "KOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg; then 502 if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/arm/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg; then
503 sed -i -e "/\-jamvm.*/d" -e "s|\(^\-server*\)|\-jamvm KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg 503 sed -i -e "/\-jamvm.*/d" -e "s|\(^\-server*\)|\-jamvm KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg
504 else 504 else
505 sed -i -e "/\-jamvm.*/\-jamvm KNOWN/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg 505 sed -i -e "s/\-jamvm.*/\-jamvm KNOWN/" ${JDK_HOME}/jre/lib/arm/jvm.cfg
506 fi 506 fi
507} 507}
508 508