[oe] [meta-java][PATCH 1/6] cacao-initial-native: fix rebuild with uncleaned workdir breaks accidently
Jens Rehsack
rehsack at gmail.com
Thu Oct 15 11:51:31 UTC 2015
When cacao-initial-native is rebuilt because of changed dependency, executable
name in wrapper script is accidently changed twice into "cacao-initial-inital".
This is prevented now.
Signed-off-by: Jens Rehsack <sno at netbsd.org>
---
recipes-core/cacao/cacao-initial-native_0.98.bb | 2 +-
recipes-core/classpath/classpath.inc | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/recipes-core/cacao/cacao-initial-native_0.98.bb b/recipes-core/cacao/cacao-initial-native_0.98.bb
index 72c6246..fed9c49 100644
--- a/recipes-core/cacao/cacao-initial-native_0.98.bb
+++ b/recipes-core/cacao/cacao-initial-native_0.98.bb
@@ -35,7 +35,7 @@ export JAR="fastjar"
do_configure_append() {
# Fix the executable name in the wrapper script.
- sed -i -e "s|exec cacao|exec cacao-initial|" src/scripts/java.in
+ sed -i -e 's|exec cacao \$|exec cacao-initial \$|' src/scripts/java.in
}
SRC_URI[md5sum] = "8b8907c8b925761c9410bcadb9705346"
diff --git a/recipes-core/classpath/classpath.inc b/recipes-core/classpath/classpath.inc
index 1bdfd78..6b3f158 100644
--- a/recipes-core/classpath/classpath.inc
+++ b/recipes-core/classpath/classpath.inc
@@ -55,7 +55,6 @@ EXTRA_OECONF += "\
do_configure_prepend () {
cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S}
}
-
do_install() {
autotools_do_install
--
2.3.8 (Apple Git-58)
--
Jens Rehsack - rehsack at gmail.com
More information about the Openembedded-devel
mailing list