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

[Khem Raj]

> On Dec 17, 2015, at 7:39 PM, jackie.huang at windriver.com wrote:
> 
> 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..a75f9e0 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}

slash between D and libdir_jvm is not needed. Also on line above this one is same problem.

> 
> -# 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

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 204 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20151217/1987f8cf/attachment-0002.sig>