Hi, On Thu, Oct 15, 2015 at 01:46:07PM +0300, Erkka Kääriä wrote: > 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ä <[email protected]> > --- > recipes-core/cacao/cacao-initial-native_0.98.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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" > > 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" > -- > 2.1.4
Good catch. Pushed, Thanks! Best Regards, Maxin -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
