From 827c3bd46f3b5bb20f693f1e507afa3769161b2c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 30 Oct 2014 15:52:58 +0100 Subject: [PATCH] Use wrapper script to inject ABRT agent JVM argument - Resolves: rhbz#1153652 --- ...end-dependencies-to-metadata-if-we-h.patch | 6 +- ...script-to-inject-extra-JVM-arguments.patch | 73 +++++++++++++++++++ javapackages-tools.spec | 8 +- 3 files changed, 83 insertions(+), 4 deletions(-) create mode 100644 0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch diff --git a/0001-mvn_artifact-Append-dependencies-to-metadata-if-we-h.patch b/0001-mvn_artifact-Append-dependencies-to-metadata-if-we-h.patch index c065e3b..a980643 100644 --- a/0001-mvn_artifact-Append-dependencies-to-metadata-if-we-h.patch +++ b/0001-mvn_artifact-Append-dependencies-to-metadata-if-we-h.patch @@ -1,8 +1,8 @@ -From 928ebac767c95dc39f3b31a6260983cecc3e473b Mon Sep 17 00:00:00 2001 +From eafaa146aace0885d17ff472db0a63aef75f2ce5 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Thu, 18 Sep 2014 10:48:07 +0200 -Subject: [PATCH] [mvn_artifact] Append dependencies to metadata, if we have - them +Subject: [PATCH 1/2] [mvn_artifact] Append dependencies to metadata, if we + have them --- java-utils/mvn_artifact.py | 2 ++ diff --git a/0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch b/0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch new file mode 100644 index 0000000..aefdebc --- /dev/null +++ b/0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch @@ -0,0 +1,73 @@ +From dee96bf521cdbae4c80ee328968e1ff5200f2aab Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Thu, 30 Oct 2014 15:20:20 +0100 +Subject: [PATCH 2/2] Use wrapper script to inject extra JVM arguments + +--- + install | 1 + + java-utils/java-functions | 14 ++++++++++++-- + java-utils/java-wrapper | 8 ++++++++ + 3 files changed, 21 insertions(+), 2 deletions(-) + create mode 100644 java-utils/java-wrapper + +diff --git a/install b/install +index a672a0c..97019ca 100755 +--- a/install ++++ b/install +@@ -122,6 +122,7 @@ inst_config etc/font.properties "${javaconfdir}" + inst_config target/java.conf "${javaconfdir}" + + inst_data target/java-functions "${javadir}-utils" ++inst_exec java-utils/java-wrapper "${javadir}-utils" + inst_data java-utils/maven_depmap.py "${javadir}-utils" + inst_data java-utils/pom_editor.py "${javadir}-utils" + +diff --git a/java-utils/java-functions b/java-utils/java-functions +index fcadb1c..c57640f 100644 +--- a/java-utils/java-functions ++++ b/java-utils/java-functions +@@ -228,7 +228,12 @@ set_javacmd() + JAVACMD="${JAVA_HOME}/${cmd}" + if [ -x "${JAVACMD}" ]; then + _log "Using configured JAVACMD: $JAVACMD" +- JAVACMD="${JAVACMD}${JAVACMD_OPTS:+ }${JAVACMD_OPTS}" ++ if [ -n "${JAVACMD_OPTS}" ]; then ++ _log "Using java-wrapper with extra options: ${JAVACMD_OPTS}" ++ export _JP_JAVACMD="${JAVACMD}" ++ export _JP_JAVACMD_OPTS="${JAVACMD_OPTS}" ++ JAVACMD="%{javadir}-utils/java-wrapper" ++ fi + return 0 + fi + done +@@ -236,7 +241,12 @@ set_javacmd() + JAVACMD=$(which java 2>/dev/null || :) + if [ -x "${JAVACMD}" ]; then + _log "Using JAVACMD from PATH: $JAVACMD" +- JAVACMD="${JAVACMD}${JAVACMD_OPTS:+ }${JAVACMD_OPTS}" ++ if [ -n "${JAVACMD_OPTS}" ]; then ++ _log "Using java-wrapper with extra options: ${JAVACMD_OPTS}" ++ export _JP_JAVACMD="${JAVACMD}" ++ export _JP_JAVACMD_OPTS="${JAVACMD_OPTS}" ++ JAVACMD="%{javadir}-utils/java-wrapper" ++ fi + return 0 + fi + +diff --git a/java-utils/java-wrapper b/java-utils/java-wrapper +new file mode 100644 +index 0000000..29b3143 +--- /dev/null ++++ b/java-utils/java-wrapper +@@ -0,0 +1,8 @@ ++#!/bin/sh ++ ++JAVACMD="${_JP_JAVACMD}" ++JAVACMD_OPTS="${_JP_JAVACMD_OPTS}" ++unset _JP_JAVACMD ++unset _JP_JAVACMD_OPTS ++ ++exec "${JAVACMD}" ${JAVACMD_OPTS} "${@}" +-- +1.9.3 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 5a5e59d..00c6ef0 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -7,7 +7,7 @@ Name: javapackages-tools Version: 4.2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Macros and scripts for Java packaging support @@ -17,6 +17,7 @@ Source0: https://fedorahosted.org/released/javapackages/javapackages-%{ve Patch0: 0001-mvn_artifact-Append-dependencies-to-metadata-if-we-h.patch Patch1: 0001-metadata-Read-OSGi-Requires-from-manifest-only-if-os.patch Patch2: 0001-pom_editor-Fix-missing-space-between-xmlns-declarati.patch +Patch3: 0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch BuildArch: noarch @@ -171,6 +172,7 @@ This package provides non-essential macros and scripts to support Java packaging %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %if 0%{?with_python3} find . -name '*.py' | xargs sed -i '1s|^#!.*python|#!%{__python3}|' @@ -236,6 +238,10 @@ popd %doc LICENSE %changelog +* Thu Oct 30 2014 Mikolaj Izdebski - 4.2.0-5 +- Use wrapper script to inject ABRT agent JVM argument +- Resolves: rhbz#1153652 + * Tue Oct 21 2014 Michael Simacek - 4.2.0-4 - Fix pom_editor missing space between xmlns declarations