[oe] [meta-java][PATCH 09/15] openjdk: postinst cleanup
jackie.huang at windriver.com
jackie.huang at windriver.com
Fri Dec 25 07:56:29 UTC 2015
From: Amy Fong <amy.fong at windriver.com>
Some of the postinst rules results in a build error because "ERR" is in
the first line.
Signed-off-by: Amy Fong <amy.fong at windriver.com>
Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
---
recipes-core/openjdk/openjdk-postinst.inc | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/recipes-core/openjdk/openjdk-postinst.inc b/recipes-core/openjdk/openjdk-postinst.inc
index 4985d56..be88714 100644
--- a/recipes-core/openjdk/openjdk-postinst.inc
+++ b/recipes-core/openjdk/openjdk-postinst.inc
@@ -1,6 +1,9 @@
# handles all postinst action for openjdk
+# some of the former results in a build error because "ERR" is in the first line.
+
pkg_postinst_${JDKPN}-vm-shark () {
+ true
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
sed -i -e "/\-shark.*/d" -e "s|\(^\-server*\)|\-shark KNOWN\n\1|" -e "/^$/d" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
else
@@ -9,6 +12,7 @@ pkg_postinst_${JDKPN}-vm-shark () {
}
pkg_prerm_${JDKPN}-vm-shark () {
+ true
sed -i -e "/^\-shark.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
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/${JDK_ARCH}/jvm.cfg | head -n 1`
@@ -19,6 +23,7 @@ pkg_prerm_${JDKPN}-vm-shark () {
}
pkg_postinst_${JDKPN}-vm-cacao () {
+ true
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
sed -i -e "/\-cacao.*/d" -e "s|\(^\-server*\)|\-cacao KNOWN\n\1|" -e "/^$/d" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
else
@@ -27,6 +32,7 @@ pkg_postinst_${JDKPN}-vm-cacao () {
}
pkg_prerm_${JDKPN}-vm-cacao () {
+ true
sed -i -e "/^\-cacao.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
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/${JDK_ARCH}/jvm.cfg | head -n 1`
@@ -37,6 +43,7 @@ pkg_prerm_${JDKPN}-vm-cacao () {
}
pkg_postinst_${JDKPN}-vm-jamvm () {
+ true
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
sed -i -e "/\-jamvm.*/d" -e "s|\(^\-server*\)|\-jamvm KNOWN\n\1|" -e "/^$/d" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
else
@@ -45,6 +52,7 @@ pkg_postinst_${JDKPN}-vm-jamvm () {
}
pkg_prerm_${JDKPN}-vm-jamvm () {
+ true
sed -i -e "/^\-jamvm.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
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/${JDK_ARCH}/jvm.cfg | head -n 1`
@@ -55,6 +63,7 @@ pkg_prerm_${JDKPN}-vm-jamvm () {
}
pkg_postinst_${JDKPN}-vm-zero () {
+ true
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
FIRST_KNOWN=`grep "KNOWN" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1`
sed -i -e "/${FIRST_KNOWN}/d" -e "/^$/d" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
@@ -65,6 +74,7 @@ pkg_postinst_${JDKPN}-vm-zero () {
}
pkg_prerm_${JDKPN}-vm-zero () {
+ true
sed -i -e "/^\-server.*/\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1`
@@ -72,6 +82,10 @@ pkg_prerm_${JDKPN}-vm-zero () {
fi
}
+pkg_postinst_${JDKPN}-jre () {
+ ln -s ${JDK_HOME}/jre $D/${libdir}/jvm/jre
+}
+
inherit update-alternatives
ALTERNATIVE_${JDKPN}-jre = "java keytool"
--
1.9.1
More information about the Openembedded-devel
mailing list