[meta-oracle-java][PATCH v2] oracle-jse-jdk: Don't use ${D} installing symlink target

[meta-oracle-java][PATCH v2] oracle-jse-jdk: Don't use ${D} installing symlink target

[Kyle Russell]

When installed to the sysroot, this makes the symlink point to the
workdir, which is invalid in the sstate package.  Since we cd to
${D} before creating the symlink, this ensures the link is created
in the correct install location, so just point the link to the final
target so that the patch is correctly fixed up during populate_sysroot.

Signed-off-by: Kyle Russell <bkylerussell@gmail.com>
---
 recipes-devtools/oracle-java/oracle-jse-jdk.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk.inc b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
index 54e83b8..6f13125 100644
--- a/recipes-devtools/oracle-java/oracle-jse-jdk.inc
+++ b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
@@ -16,7 +16,7 @@ do_install_class-native() {
     install -d -m 0755 ${D}${bindir}
     cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE} ${D}${libdir}/
     for prog in java javac; do
-	( cd ${D}${bindir} && ln -sf ${D}${libdir}/${JDK_JRE}${PV}_${PV_UPDATE}/bin/$prog )
+	( cd ${D}${bindir} && ln -sf ${libdir}/${JDK_JRE}${PV}_${PV_UPDATE}/bin/$prog )
     done
 
     ( cd ${D}${libdir}/${JDK_JRE}${PV}_${PV_UPDATE}/bin ; \
-- 
1.7.9.5

Re: [meta-oracle-java][PATCH v2] oracle-jse-jdk: Don't use ${D} installing symlink target

[Maxin B. John]

Hi,

On Wed, Dec 02, 2015 at 06:39:14PM -0500, Kyle Russell wrote:
> When installed to the sysroot, this makes the symlink point to the
> workdir, which is invalid in the sstate package.  Since we cd to
> ${D} before creating the symlink, this ensures the link is created
> in the correct install location, so just point the link to the final
> target so that the patch is correctly fixed up during populate_sysroot.
> 
> Signed-off-by: Kyle Russell <bkylerussell@gmail.com>
> ---
>  recipes-devtools/oracle-java/oracle-jse-jdk.inc |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk.inc b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
> index 54e83b8..6f13125 100644
> --- a/recipes-devtools/oracle-java/oracle-jse-jdk.inc
> +++ b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
> @@ -16,7 +16,7 @@ do_install_class-native() {
>      install -d -m 0755 ${D}${bindir}
>      cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE} ${D}${libdir}/
>      for prog in java javac; do
> -	( cd ${D}${bindir} && ln -sf ${D}${libdir}/${JDK_JRE}${PV}_${PV_UPDATE}/bin/$prog )
> +	( cd ${D}${bindir} && ln -sf ${libdir}/${JDK_JRE}${PV}_${PV_UPDATE}/bin/$prog )
>      done
>  
>      ( cd ${D}${libdir}/${JDK_JRE}${PV}_${PV_UPDATE}/bin ; \
> -- 
> 1.7.9.5

Pushed to master. Thanks, Kyle Russell and Bruce.

Best Regards,
Maxin

Re: [meta-oracle-java][PATCH v2] oracle-jse-jdk: Don't use ${D} installing symlink target

[Bruce Ashfield]

On 15-12-02 06:39 PM, Kyle Russell wrote:
> When installed to the sysroot, this makes the symlink point to the
> workdir, which is invalid in the sstate package.  Since we cd to
> ${D} before creating the symlink, this ensures the link is created
> in the correct install location, so just point the link to the final
> target so that the patch is correctly fixed up during populate_sysroot.

Looks good to me: Acked-by: Bruce Ashfield <bruce.ashfield@windriver.com>

>
> Signed-off-by: Kyle Russell <bkylerussell@gmail.com>
> ---
>   recipes-devtools/oracle-java/oracle-jse-jdk.inc |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk.inc b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
> index 54e83b8..6f13125 100644
> --- a/recipes-devtools/oracle-java/oracle-jse-jdk.inc
> +++ b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
> @@ -16,7 +16,7 @@ do_install_class-native() {
>       install -d -m 0755 ${D}${bindir}
>       cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE} ${D}${libdir}/
>       for prog in java javac; do
> -	( cd ${D}${bindir} && ln -sf ${D}${libdir}/${JDK_JRE}${PV}_${PV_UPDATE}/bin/$prog )
> +	( cd ${D}${bindir} && ln -sf ${libdir}/${JDK_JRE}${PV}_${PV_UPDATE}/bin/$prog )
>       done
>
>       ( cd ${D}${libdir}/${JDK_JRE}${PV}_${PV_UPDATE}/bin ; \
>