[oe] [meta-java][PATCH v2] openjdk-8-native: fix incorrect do_install

[Huang, Jie (Jackie)]

Please ignore this, it will conflict with ecj-bootstrap-native and fastjar-native:

ERROR: The recipe openjdk-8-native is trying to install files into a shared area when those files already exist. Those files and their manifest location are:
   /p_arm-jre7_151218/bitbake_build/tmp/sysroots/x86_64-linux/usr/bin/jar
 Matched in manifest-x86_64-fastjar-native.populate_sysroot
 /p_arm-jre7_151218/bitbake_build/tmp/sysroots/x86_64-linux/usr/bin/java
 Matched in manifest-x86_64-ecj-bootstrap-native.populate_sysroot

Thanks,
Jackie

> -----Original Message-----
> From: openembedded-devel-bounces at lists.openembedded.org [mailto:openembedded-devel-
> bounces at lists.openembedded.org] On Behalf Of jackie.huang at windriver.com
> Sent: Friday, December 18, 2015 1:16 PM
> To: openembedded-devel at lists.openembedded.org
> Subject: [oe] [meta-java][PATCH v2] openjdk-8-native: fix incorrect do_install
> 
> From: Jackie Huang <jackie.huang at windriver.com>
> 
> do_install should not install files directly into
> staging dirs, or the ${D} and sstate is empty and
> builds from sstate cache will fail.
> 
> Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
> ---
>  recipes-core/openjdk/openjdk-8-native.inc | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/recipes-core/openjdk/openjdk-8-native.inc b/recipes-core/openjdk/openjdk-8-native.inc
> index 7813ec2..450228a 100644
> --- a/recipes-core/openjdk/openjdk-8-native.inc
> +++ b/recipes-core/openjdk/openjdk-8-native.inc
> @@ -68,15 +68,13 @@ do_compile_append() {
>  }
> 
>  do_install() {
> -    rm -rf ${STAGING_LIBDIR_NATIVE}/jvm/${JDK_DIR}
> -    mkdir -p ${STAGING_LIBDIR_NATIVE}/jvm/${JDK_DIR}
> -    cp -rp ${B}/images/j2sdk-image/* ${STAGING_LIBDIR_NATIVE}/jvm/${JDK_DIR}
> +    mkdir -p ${D}${libdir_jvm}/${JDK_DIR}
> +    cp -rp ${B}/images/j2sdk-image/* ${D}${libdir_jvm}/${JDK_DIR}
> 
> -# clean up the mess from bootstrap
> +    # clean up the mess from bootstrap
> +    mkdir -p ${D}${bindir}
>      for tool in jar java javac keytool pack200 unpack200
>      do
> -        rm -f ${STAGING_BINDIR_NATIVE}/$tool
> -
> -        ln -sf "../lib/jvm/${JDK_DIR}/bin/$tool" ${STAGING_BINDIR_NATIVE}/$tool
> +        ln -sf "../lib/jvm/${JDK_DIR}/bin/$tool" ${D}${bindir}/$tool
>      done
>  }
> --
> 2.3.5
> 
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel