[yocto] [meta-oracle-java][PATCH 1/6] oracle-jse-jdk: split recipe into per-architecture recipes

[Maxin John]

Hi Mario,

On Tue, May 12, 2015 at 10:56 PM, Mario Domenech Goulart
<mario at ossystems.com.br> wrote:
> Due the way BitBake parses recipes, including architecture-specific
> include files was happening too late, causing native variants to pick
> wrong include files, thus ending up generating broken content.
>
> Setting COMPATIBLE_HOST guarantees that native installations will be
> consistent.
>
> Signed-off-by: Mario Domenech Goulart <mario at ossystems.com.br>
> ---
>  ...acle-jse-jdk-i586.inc => oracle-jse-jdk-i586_1.7.0.bb} |  2 ++
>  ...-jse-jdk-x86-64.inc => oracle-jse-jdk-x86-64_1.7.0.bb} |  2 ++
>  recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb      | 15 ---------------
>  3 files changed, 4 insertions(+), 15 deletions(-)
>  rename recipes-devtools/oracle-java/{oracle-jse-jdk-i586.inc => oracle-jse-jdk-i586_1.7.0.bb} (90%)
>  rename recipes-devtools/oracle-java/{oracle-jse-jdk-x86-64.inc => oracle-jse-jdk-x86-64_1.7.0.bb} (90%)
>  delete mode 100644 recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb
>
> diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk-i586.inc b/recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb
> similarity index 90%
> rename from recipes-devtools/oracle-java/oracle-jse-jdk-i586.inc
> rename to recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb
> index 0667161..9fb2188 100644
> --- a/recipes-devtools/oracle-java/oracle-jse-jdk-i586.inc
> +++ b/recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb
> @@ -7,3 +7,5 @@ SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u${PV_UPDATE}-b${BUILD_N
>
>  SRC_URI[md5sum] = "715b0e8ba2a06bded75f6a92427e2701"
>  SRC_URI[sha256sum] = "b6231064ad2c9fbbcb099dba17b1dcf12033e922b9c24e4348b9a01e9ebaa85c"
> +
> +COMPATIBLE_HOST = "(i586-linux)"
> diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64.inc b/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb
> similarity index 90%
> rename from recipes-devtools/oracle-java/oracle-jse-jdk-x86-64.inc
> rename to recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb
> index f18ce55..a6d0bc7 100644
> --- a/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64.inc
> +++ b/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb
> @@ -7,3 +7,5 @@ SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u${PV_UPDATE}-b${BUILD_N
>
>  SRC_URI[md5sum] = "81e3e2df33e13781e5fac5756ed90e67"
>  SRC_URI[sha256sum] = "54dd1e13edf18c64941a55da9c91210b53dc5cf48f1a8f4538c863049e346335"
> +
> +COMPATIBLE_HOST = "(x86_64-linux)"
> diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb b/recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb
> deleted file mode 100644
> index 56d84b6..0000000
> --- a/recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -# Automatically choose java package based on target architecture
> -def get_java_pkg(d):
> -       TA = d.getVar('TARGET_ARCH', True)
> -       if TA == "i586":
> -               javaPkg = "oracle-jse-jdk-i586"
> -       elif TA == "x86_64":
> -               javaPkg = "oracle-jse-jdk-x86-64"
> -       else:
> -               raise bb.parse.SkipPackage("The target architecture '%s' is not supported by the meta-oracle-java layer" %TA)
> -
> -       return javaPkg
> -
> -JAVA_PKG = "${@get_java_pkg(d)}"
> -
> -require ${JAVA_PKG}.inc


This change results in the below listed error:

# bitbake oracle-jse-jdk-x86-64

ERROR: Nothing PROVIDES 'oracle-jse-jdk-x86-64'
ERROR: oracle-jse-jdk-x86-64 was skipped: incompatible with host
x86_64-poky-linux (not in COMPATIBLE_HOST)

Summary: There was 1 ERROR message shown, returning a non-zero exit code.

The COMPATIBLE_HOST should be "x86_64.*-linux". Please fix it.

Best Regards,
Maxin