diff options
author | Erkka Kääriä <erkka.kaaria@intel.com> | 2015-10-15 13:46:07 +0300 |
---|---|---|
committer | Maxin B. John <maxin.john@intel.com> | 2015-10-15 09:47:55 +0300 |
commit | 1bbcc6313150358e5e527bd70e91632a0d420f3c (patch) | |
tree | 8a259a86dbe9bca1044b36013d13743e80b9a298 | |
parent | ecd8de1d8a26f3c46a282aafdc48504a31e61e5c (diff) | |
download | meta-java-1bbcc6313150358e5e527bd70e91632a0d420f3c.tar.gz |
cacao-initial-native: Fix sed matching
The recipe uses sed to patch src/scripts/java.in so that it execs cacao-initial
instead of cacao. However, if configure step is run again, -initial is appended
again to the string, leading to 'exec cacao-initial-initial'. This causes the
build to fail.
This is fixed by changing the sed command to consider larger portion of the
source string. This ensures that the -initial is only appended once.
Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
-rw-r--r-- | recipes-core/cacao/cacao-initial-native_0.98.bb | 2 |
1 files changed, 1 insertions, 1 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..ec7fbdb 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" | |||
35 | 35 | ||
36 | do_configure_append() { | 36 | do_configure_append() { |
37 | # Fix the executable name in the wrapper script. | 37 | # Fix the executable name in the wrapper script. |
38 | sed -i -e "s|exec cacao|exec cacao-initial|" src/scripts/java.in | 38 | sed -i -e "s|exec cacao \\$|exec cacao-initial \\$|" src/scripts/java.in |
39 | } | 39 | } |
40 | 40 | ||
41 | SRC_URI[md5sum] = "8b8907c8b925761c9410bcadb9705346" | 41 | SRC_URI[md5sum] = "8b8907c8b925761c9410bcadb9705346" |