Merge pull request #17 from OSSystems/master

Fix packaging in i586
author: woglinde <henning@familie-heinold.de> 2012-02-15 02:40:57 -0800
committer: woglinde <henning@familie-heinold.de> 2012-02-15 02:40:57 -0800
commit: e2cb8c6fe2942061283c766a9ed2cfac22be3c43 (patch)
tree: 9366f310e9bc49d1124a29e6957c72c2e69de2bd
parent: 1dd1f5ece8749cd391ce2d0d31e9a7c23d078d38 (diff)
parent: 2b2dd6e338c723d34a6994c528643ba36d1f57ba (diff)
download: meta-java-e2cb8c6fe2942061283c766a9ed2cfac22be3c43.tar.gz
1 files changed, 38 insertions, 38 deletions
diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc
index f38e3b6..2b4b9f7 100644
--- a/recipes-core/openjdk/openjdk-6-common.inc
+++ b/recipes-core/openjdk/openjdk-6-common.inc
@@ -10,7 +10,7 @@ ICEDTEA = "NEEDS TO BE SET"
 S = "${WORKDIR}/${ICEDTEA}"
 B = "${S}/build"
-INC_PR = "r15"
+INC_PR = "r16"
 SRC_URI = "\
  ${ICEDTEA_URI} \
@@ -394,13 +394,13 @@ FILES_${JDKPN}-source = "${JDK_HOME}/src.zip"
 FILES_${JDKPN}-java = "${JDK_HOME}/jre/bin/java"
-FILES_${JDKPN}-vm-zero = "${JDK_HOME}/jre/lib/arm/server/"
+FILES_${JDKPN}-vm-zero = "${JDK_HOME}/jre/lib/${JDK_ARCH}/server/"
-FILES_${JDKPN}-vm-shark = "${JDK_HOME}/jre/lib/arm/shark/"
+FILES_${JDKPN}-vm-shark = "${JDK_HOME}/jre/lib/${JDK_ARCH}/shark/"
-FILES_${JDKPN}-vm-cacao = "${JDK_HOME}/jre/lib/arm/cacao/"
+FILES_${JDKPN}-vm-cacao = "${JDK_HOME}/jre/lib/${JDK_ARCH}/cacao/"
-FILES_${JDKPN}-vm-jamvm = "${JDK_HOME}/jre/lib/arm/jamvm/"
+FILES_${JDKPN}-vm-jamvm = "${JDK_HOME}/jre/lib/${JDK_ARCH}/jamvm/"
 FILES_${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \
                          ${JDK_HOME}/jre/THIRD_PARTY_README \
@@ -463,74 +463,74 @@ RDEPENDS_${JDKPN}-jdk = "${JDKPN}-jre"
 FILES_${JDKPN}-doc = "${JDK_HOME}/man"
 pkg_postinst_${JDKPN}-vm-shark () {
-        if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/arm/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg; then
+        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
-          sed -i -e "/\-shark.*/d" -e "s|\(^\-server*\)|\-shark KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg
+          sed -i -e "/\-shark.*/d" -e "s|\(^\-server*\)|\-shark KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
        else
-          sed -i -e "s/\-shark.*/\-shark KNOWN/" ${JDK_HOME}/jre/lib/arm/jvm.cfg
+          sed -i -e "s/\-shark.*/\-shark KNOWN/" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
        fi 
 }
 pkg_prerm_${JDKPN}-vm-shark () {
-        sed -i -e "/^\-shark.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg 
+        sed -i -e "/^\-shark.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 
-        if grep -q "KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/arm/jvm.cfg; then
+        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
-          FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg | head -1`
+          FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -1`
-          sed -i -e "/${FIRST_KNOWN}/d" -e  "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/arm/jvm.cfg
+          sed -i -e "/${FIRST_KNOWN}/d" -e  "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
        fi
-        echo "-shark ERROR" >> ${JDK_HOME}/jre/lib/arm/jvm.cfg
+        echo "-shark ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
 }
 pkg_postinst_${JDKPN}-vm-cacao () {
-        if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/arm/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg; then
+        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
-          sed -i -e "/\-cacao.*/d" -e "s|\(^\-server*\)|\-cacao KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg
+          sed -i -e "/\-cacao.*/d" -e "s|\(^\-server*\)|\-cacao KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
        else
-          sed -i -e "s/\-cacao.*/\-cacao KNOWN/" ${JDK_HOME}/jre/lib/arm/jvm.cfg
+          sed -i -e "s/\-cacao.*/\-cacao KNOWN/" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
        fi 
 }
 pkg_prerm_${JDKPN}-vm-cacao () {
-        sed -i -e "/^\-cacao.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg 
+        sed -i -e "/^\-cacao.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 
-        if grep -q "KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/arm/jvm.cfg; then
+        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
-          FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg | head -1`
+          FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -1`
-          sed -i -e "/${FIRST_KNOWN}/d" -e  "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/arm/jvm.cfg
+          sed -i -e "/${FIRST_KNOWN}/d" -e  "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
        fi
-        echo "-cacao ERROR" >> ${JDK_HOME}/jre/lib/arm/jvm.cfg
+        echo "-cacao ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
 }
 pkg_postinst_${JDKPN}-vm-jamvm () {
-        if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/arm/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg; then
+        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
-          sed -i -e "/\-jamvm.*/d" -e "s|\(^\-server*\)|\-jamvm KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg
+          sed -i -e "/\-jamvm.*/d" -e "s|\(^\-server*\)|\-jamvm KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
        else
-          sed -i -e "s/\-jamvm.*/\-jamvm KNOWN/" ${JDK_HOME}/jre/lib/arm/jvm.cfg
+          sed -i -e "s/\-jamvm.*/\-jamvm KNOWN/" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
        fi 
 }
 pkg_prerm_${JDKPN}-vm-jamvm () {
-        sed -i -e "/^\-jamvm.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg 
+        sed -i -e "/^\-jamvm.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 
-        if grep -q "KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/arm/jvm.cfg; then
+        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
-          FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg | head -1`
+          FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -1`
-          sed -i -e "/${FIRST_KNOWN}/d" -e  "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/arm/jvm.cfg
+          sed -i -e "/${FIRST_KNOWN}/d" -e  "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
        fi
-        echo "-jamvm ERROR" >> ${JDK_HOME}/jre/lib/arm/jvm.cfg
+        echo "-jamvm ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
 }
 pkg_postinst_${JDKPN}-vm-zero () {
-        if grep -q "KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/arm/jvm.cfg; then
+        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
-           FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg | head -1`
+           FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -1`
-           sed -i -e "/${FIRST_KNOWN}/d" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg
+           sed -i -e "/${FIRST_KNOWN}/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
-           echo ${FIRST_KNOWN} >> ${JDK_HOME}/jre/lib/arm/jvm.cfg
+           echo ${FIRST_KNOWN} >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
        fi
-        sed -i -e "s|^\-server.*|\-server KNOWN|" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg
+        sed -i -e "s|^\-server.*|\-server KNOWN|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
 }
 pkg_prerm_${JDKPN}-vm-zero () {
-        sed -i -e "/^\-server.*/\-server ERROR" ${JDK_HOME}/jre/lib/arm/jvm.cfg 
+        sed -i -e "/^\-server.*/\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 
-        if grep -q "KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg; then
+        if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
-          FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg | head -1`
+          FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -1`
-          sed -i -e "/${FIRST_KNOWN}/d" -e  "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/arm/jvm.cfg
+          sed -i -e "/${FIRST_KNOWN}/d" -e  "s|\(^\-server*\)|${FIRST_KNOWN}\n\1|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
        fi
 }
author	woglinde <henning@familie-heinold.de>	2012-02-15 02:40:57 -0800
committer	woglinde <henning@familie-heinold.de>	2012-02-15 02:40:57 -0800
commit	e2cb8c6fe2942061283c766a9ed2cfac22be3c43 (patch)
tree	9366f310e9bc49d1124a29e6957c72c2e69de2bd
parent	1dd1f5ece8749cd391ce2d0d31e9a7c23d078d38 (diff)
parent	2b2dd6e338c723d34a6994c528643ba36d1f57ba (diff)
download	meta-java-e2cb8c6fe2942061283c766a9ed2cfac22be3c43.tar.gz

diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc index f38e3b6..2b4b9f7 100644 --- a/recipes-core/openjdk/openjdk-6-common.inc +++ b/recipes-core/openjdk/openjdk-6-common.inc
@@ -10,7 +10,7 @@ ICEDTEA = "NEEDS TO BE SET"
10	S = "${WORKDIR}/${ICEDTEA}"	10	S = "${WORKDIR}/${ICEDTEA}"
11	B = "${S}/build"	11	B = "${S}/build"
12		12
13	INC_PR = "r15"	13	INC_PR = "r16"
14		14
15	SRC_URI = "\	15	SRC_URI = "\
16	${ICEDTEA_URI} \	16	${ICEDTEA_URI} \
@@ -394,13 +394,13 @@ FILES_${JDKPN}-source = "${JDK_HOME}/src.zip"
394		394
395	FILES_${JDKPN}-java = "${JDK_HOME}/jre/bin/java"	395	FILES_${JDKPN}-java = "${JDK_HOME}/jre/bin/java"
396		396
397	FILES_${JDKPN}-vm-zero = "${JDK_HOME}/jre/lib/arm/server/"	397	FILES_${JDKPN}-vm-zero = "${JDK_HOME}/jre/lib/${JDK_ARCH}/server/"
398		398
399	FILES_${JDKPN}-vm-shark = "${JDK_HOME}/jre/lib/arm/shark/"	399	FILES_${JDKPN}-vm-shark = "${JDK_HOME}/jre/lib/${JDK_ARCH}/shark/"
400		400
401	FILES_${JDKPN}-vm-cacao = "${JDK_HOME}/jre/lib/arm/cacao/"	401	FILES_${JDKPN}-vm-cacao = "${JDK_HOME}/jre/lib/${JDK_ARCH}/cacao/"
402		402
403	FILES_${JDKPN}-vm-jamvm = "${JDK_HOME}/jre/lib/arm/jamvm/"	403	FILES_${JDKPN}-vm-jamvm = "${JDK_HOME}/jre/lib/${JDK_ARCH}/jamvm/"
404		404
405	FILES_${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \	405	FILES_${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \
406	${JDK_HOME}/jre/THIRD_PARTY_README \	406	${JDK_HOME}/jre/THIRD_PARTY_README \
@@ -463,74 +463,74 @@ RDEPENDS_${JDKPN}-jdk = "${JDKPN}-jre"
463	FILES_${JDKPN}-doc = "${JDK_HOME}/man"	463	FILES_${JDKPN}-doc = "${JDK_HOME}/man"
464		464
465	pkg_postinst_${JDKPN}-vm-shark () {	465	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/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/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/${JDK_ARCH}/jvm.cfg
468	else	468	else
469	sed -i -e "s/\-shark.*/\-shark KNOWN/" ${JDK_HOME}/jre/lib/arm/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/arm/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/arm/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/arm/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/arm/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/arm/jvm.cfg	477	sed -i -e "/${FIRST_KNOWN}/d" -e "s\|\(^\-server*\)\|${FIRST_KNOWN}\n\1\|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
478	fi	478	fi
479		479
480	echo "-shark ERROR" >> ${JDK_HOME}/jre/lib/arm/jvm.cfg	480	echo "-shark ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
481	}	481	}
482		482
483	pkg_postinst_${JDKPN}-vm-cacao () {	483	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/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/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/${JDK_ARCH}/jvm.cfg
486	else	486	else
487	sed -i -e "s/\-cacao.*/\-cacao KNOWN/" ${JDK_HOME}/jre/lib/arm/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/arm/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/arm/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/arm/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/arm/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/arm/jvm.cfg	495	sed -i -e "/${FIRST_KNOWN}/d" -e "s\|\(^\-server*\)\|${FIRST_KNOWN}\n\1\|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
496	fi	496	fi
497		497
498	echo "-cacao ERROR" >> ${JDK_HOME}/jre/lib/arm/jvm.cfg	498	echo "-cacao ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
499	}	499	}
500		500
501	pkg_postinst_${JDKPN}-vm-jamvm () {	501	pkg_postinst_${JDKPN}-vm-jamvm () {
502	if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/arm/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg; then	502	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
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/${JDK_ARCH}/jvm.cfg
504	else	504	else
505	sed -i -e "s/\-jamvm.*/\-jamvm KNOWN/" ${JDK_HOME}/jre/lib/arm/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/arm/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/arm/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/arm/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/arm/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/arm/jvm.cfg	513	sed -i -e "/${FIRST_KNOWN}/d" -e "s\|\(^\-server*\)\|${FIRST_KNOWN}\n\1\|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
514	fi	514	fi
515		515
516	echo "-jamvm ERROR" >> ${JDK_HOME}/jre/lib/arm/jvm.cfg	516	echo "-jamvm ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
517	}	517	}
518		518
519	pkg_postinst_${JDKPN}-vm-zero () {	519	pkg_postinst_${JDKPN}-vm-zero () {
520	if grep -q "KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/arm/jvm.cfg; then	520	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
521	FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg \| head -1`	521	FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg \| head -1`
522	sed -i -e "/${FIRST_KNOWN}/d" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg	522	sed -i -e "/${FIRST_KNOWN}/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
523	echo ${FIRST_KNOWN} >> ${JDK_HOME}/jre/lib/arm/jvm.cfg	523	echo ${FIRST_KNOWN} >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
524	fi	524	fi
525		525
526	sed -i -e "s\|^\-server.*\|\-server KNOWN\|" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg	526	sed -i -e "s\|^\-server.*\|\-server KNOWN\|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
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/arm/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/arm/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/arm/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/arm/jvm.cfg	533	sed -i -e "/${FIRST_KNOWN}/d" -e "s\|\(^\-server*\)\|${FIRST_KNOWN}\n\1\|" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
534	fi	534	fi
535	}	535	}
536		536