[yocto] [PATCH 2/7][meta-java] Fix rebuild with uncleaned workdir breaks accidently

Jens Rehsack rehsack at gmail.com
Thu Oct 1 11:22:34 PDT 2015


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
-- 
1.9.1

-- 
Jens Rehsack - rehsack at gmail.com




More information about the yocto mailing list