[oe] [PATCH] cacaoh-native: used oe-stylize.py

Frans Meulenbroeks fransmeulenbroeks at gmail.com
Tue Aug 17 11:55:30 UTC 2010


2010/8/17 Fahad Usman <fahad_usman at mentor.com>:
> * just incorporated the output of oe-stylize.py, no functionality is changed
>
> Signed-off-by: Fahad Usman <fahad_usman at mentor.com>
> ---
>  recipes/cacao/cacaoh-native.inc       |    7 +++----
>  recipes/cacao/cacaoh-native_0.99.3.bb |    5 ++---
>  recipes/cacao/cacaoh-native_0.99.4.bb |    5 ++---
>  3 files changed, 7 insertions(+), 10 deletions(-)
>
> diff --git a/recipes/cacao/cacaoh-native.inc b/recipes/cacao/cacaoh-native.inc
> index d255df4..fcbe93b 100644
> --- a/recipes/cacao/cacaoh-native.inc
> +++ b/recipes/cacao/cacaoh-native.inc
> @@ -1,7 +1,6 @@
>  DESCRIPTION = "Header generator for Cacao JVM - Needed for cross-compilation builds"
>  HOMEPAGE = "http://www.cacaojvm.org/"
> -LICENSE  = "GPL"
> -
> +LICENSE = "GPL"
>  DEPENDS = "libtool-native zlib-native virtual/javac-native classpath-native"
>
>  S = "${WORKDIR}/cacao-${PV}"
> @@ -21,6 +20,6 @@ do_compile() {
>   oe_runmake -C src/cacaoh cacaoh
>  }
>  do_install() {
> -       install -d ${D}${bindir}/cacaoh-${PV}
> -       install -m 0755 src/cacaoh/.libs/cacaoh ${D}${bindir}/cacaoh-${PV}
> +  install -d ${D}${bindir}/cacaoh-${PV}
> +  install -m 0755 src/cacaoh/.libs/cacaoh ${D}${bindir}/cacaoh-${PV}
>  }
> diff --git a/recipes/cacao/cacaoh-native_0.99.3.bb b/recipes/cacao/cacaoh-native_0.99.3.bb
> index b321329..1bc3b84 100644
> --- a/recipes/cacao/cacaoh-native_0.99.3.bb
> +++ b/recipes/cacao/cacaoh-native_0.99.3.bb
> @@ -1,8 +1,7 @@
> -require cacaoh-native.inc
> -
>  PR = "r2"
>
>  SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2"
> -
>  SRC_URI[md5sum] = "db93ab31c6d1b7f1e213771bb81bde58"
>  SRC_URI[sha256sum] = "1ea5bd257f755ffcae2c7a1935c37147c7392478922410e0870361eea08b6c27"
> +
> +require cacaoh-native.inc
> diff --git a/recipes/cacao/cacaoh-native_0.99.4.bb b/recipes/cacao/cacaoh-native_0.99.4.bb
> index e269e43..d0fc1c0 100644
> --- a/recipes/cacao/cacaoh-native_0.99.4.bb
> +++ b/recipes/cacao/cacaoh-native_0.99.4.bb
> @@ -1,8 +1,7 @@
> -require cacaoh-native.inc
> -
>  PR = "r1"
>
>  SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2"
> -
>  SRC_URI[md5sum] = "63220327925ace13756ae334c55a3baa"
>  SRC_URI[sha256sum] = "1dfc4903dc0172286df4f1740fd0f12749ac81d51c602290b47cbe83d51e1d56"
> +
> +require cacaoh-native.inc
> --

Have you tested this?
Moving a require file might lead to errors or unexpected results
a require (or include) is an inclusion of the file. Moving it might
cause a problem if the recipe itself redefines a var that is also
defined in the inc file.
(e.g. if the recipe overrules the DEPENDS that are in an .inc file)

Frans.




More information about the Openembedded-devel mailing list