All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-oracle-java][PATCH 1/2] Fix do_populate_sysroot: sstate found an absolute path symlink
@ 2017-10-27 12:18 Vincent Prince
  2017-10-27 12:18 ` [meta-oracle-java][PATCH 2/2] On headless arm, do_package() complains about missing libX11.so.6 provider Vincent Prince
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Vincent Prince @ 2017-10-27 12:18 UTC (permalink / raw)
  To: yocto, maxin.john

Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
---
 recipes-devtools/oracle-java/oracle-jse-jdk.inc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk.inc b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
index a7210d9..11fe17b 100644
--- a/recipes-devtools/oracle-java/oracle-jse-jdk.inc
+++ b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
@@ -12,16 +12,16 @@ JDK_JRE = "jdk"
 require oracle-jse.inc
 
 do_install_class-native() {
-	install -d				${D}${libdir_jvm}
-	cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE}	${D}${JDK_HOME}
+	install -d ${D}${libdir_jvm}
+	cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE} ${D}${JDK_HOME}
 
-	install -d				${D}${bindir}
-	ln -sf ${JDK_HOME}/bin/java		${D}${bindir}
-	ln -sf ${JDK_HOME}/bin/javac		${D}${bindir}
+	install -d ${D}${bindir}
+	ln -sf ${D}${JDK_HOME}/bin/java ${D}${bindir}
+	ln -sf ${D}${JDK_HOME}/bin/javac ${D}${bindir}
 
-	install -d				${D}${JDK_HOME}/bin
-	ln -sf javah				${D}${JDK_HOME}/bin/gjavah
-	ln -sf jar				${D}${JDK_HOME}/bin/fastjar
+	install -d ${D}${JDK_HOME}/bin
+	ln -sf javah ${D}${JDK_HOME}/bin/gjavah
+	ln -sf jar ${D}${JDK_HOME}/bin/fastjar
 }
 
 BBCLASSEXTEND = "native"
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [meta-oracle-java][PATCH 2/2] On headless arm, do_package() complains about missing libX11.so.6 provider.
  2017-10-27 12:18 [meta-oracle-java][PATCH 1/2] Fix do_populate_sysroot: sstate found an absolute path symlink Vincent Prince
@ 2017-10-27 12:18 ` Vincent Prince
  2017-10-27 16:47 ` [meta-oracle-java][PATCH 1/2] Fix do_populate_sysroot: sstate found an absolute path symlink Vincent Prince
  2017-10-30  9:32 ` [meta-oracle-java][PATCH V2 1/2] On headless arm, do_package() complains about missing libX11.so.6 provider Vincent Prince
  2 siblings, 0 replies; 7+ messages in thread
From: Vincent Prince @ 2017-10-27 12:18 UTC (permalink / raw)
  To: yocto, maxin.john

Full JRE created by jrecreate contains awt/swing dynamic libraries linked to libx11.

This patch creates a compact JRE without those libraries.

Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
---
 recipes-devtools/oracle-java/oracle-jse-ejre.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-devtools/oracle-java/oracle-jse-ejre.inc b/recipes-devtools/oracle-java/oracle-jse-ejre.inc
index d7a4b33..0b0d978 100644
--- a/recipes-devtools/oracle-java/oracle-jse-ejre.inc
+++ b/recipes-devtools/oracle-java/oracle-jse-ejre.inc
@@ -21,5 +21,5 @@ LIC_FILES_CHKSUM = "\
 do_compile() {
 	DEST=${S}/${JDK_JRE}${PV}_${PV_UPDATE}
 	rm -rf ${DEST}
-	JAVA_HOME=${STAGING_DIR_NATIVE}/${JDK_HOME} ejdk${PV}_${PV_UPDATE}/bin/jrecreate.sh --dest ${DEST}
+	JAVA_HOME=${STAGING_DIR_NATIVE}/${JDK_HOME} ejdk${PV}_${PV_UPDATE}/bin/jrecreate.sh --profile compact3 --vm all --extension locales --dest ${DEST}
 }
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [meta-oracle-java][PATCH 1/2] Fix do_populate_sysroot: sstate found an absolute path symlink
  2017-10-27 12:18 [meta-oracle-java][PATCH 1/2] Fix do_populate_sysroot: sstate found an absolute path symlink Vincent Prince
  2017-10-27 12:18 ` [meta-oracle-java][PATCH 2/2] On headless arm, do_package() complains about missing libX11.so.6 provider Vincent Prince
@ 2017-10-27 16:47 ` Vincent Prince
  2017-10-27 18:11   ` Khem Raj
  2017-10-30  9:32 ` [meta-oracle-java][PATCH V2 1/2] On headless arm, do_package() complains about missing libX11.so.6 provider Vincent Prince
  2 siblings, 1 reply; 7+ messages in thread
From: Vincent Prince @ 2017-10-27 16:47 UTC (permalink / raw)
  To: yocto, maxin.john

I was mistaken, following patch fixes it for real

Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
---
 recipes-devtools/oracle-java/oracle-jse-jdk.inc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk.inc
b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
index a7210d9..1092a34 100644
--- a/recipes-devtools/oracle-java/oracle-jse-jdk.inc
+++ b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
@@ -12,16 +12,16 @@ JDK_JRE = "jdk"
 require oracle-jse.inc

 do_install_class-native() {
-       install -d                              ${D}${libdir_jvm}
+       install -d                              ${D}${libdir_jvm}
        cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE} ${D}${JDK_HOME}

-       install -d                              ${D}${bindir}
-       ln -sf ${JDK_HOME}/bin/java             ${D}${bindir}
-       ln -sf ${JDK_HOME}/bin/javac            ${D}${bindir}
+       install -d                              ${D}${bindir}
+       ln -sf ../lib/jvm/${JDK_DIR}/bin/java   ${D}${bindir}
+       ln -sf ../lib/jvm/${JDK_DIR}/bin/javac  ${D}${bindir}

-       install -d                              ${D}${JDK_HOME}/bin
-       ln -sf javah                            ${D}${JDK_HOME}/bin/gjavah
-       ln -sf jar                              ${D}${JDK_HOME}/bin/fastjar
+       install -d                              ${D}${JDK_HOME}/bin
+       ln -sf javah                            ${D}${JDK_HOME}/bin/gjavah
+       ln -sf jar                              ${D}${JDK_HOME}/bin/fastjar
 }

 BBCLASSEXTEND = "native"
-- 
2.7.4

2017-10-27 14:18 GMT+02:00 Vincent Prince <vincent.prince.fr@gmail.com>:
> Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
> ---
>  recipes-devtools/oracle-java/oracle-jse-jdk.inc | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk.inc b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
> index a7210d9..11fe17b 100644
> --- a/recipes-devtools/oracle-java/oracle-jse-jdk.inc
> +++ b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
> @@ -12,16 +12,16 @@ JDK_JRE = "jdk"
>  require oracle-jse.inc
>
>  do_install_class-native() {
> -       install -d                              ${D}${libdir_jvm}
> -       cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE} ${D}${JDK_HOME}
> +       install -d ${D}${libdir_jvm}
> +       cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE} ${D}${JDK_HOME}
>
> -       install -d                              ${D}${bindir}
> -       ln -sf ${JDK_HOME}/bin/java             ${D}${bindir}
> -       ln -sf ${JDK_HOME}/bin/javac            ${D}${bindir}
> +       install -d ${D}${bindir}
> +       ln -sf ${D}${JDK_HOME}/bin/java ${D}${bindir}
> +       ln -sf ${D}${JDK_HOME}/bin/javac ${D}${bindir}
>
> -       install -d                              ${D}${JDK_HOME}/bin
> -       ln -sf javah                            ${D}${JDK_HOME}/bin/gjavah
> -       ln -sf jar                              ${D}${JDK_HOME}/bin/fastjar
> +       install -d ${D}${JDK_HOME}/bin
> +       ln -sf javah ${D}${JDK_HOME}/bin/gjavah
> +       ln -sf jar ${D}${JDK_HOME}/bin/fastjar
>  }
>
>  BBCLASSEXTEND = "native"
> --
> 2.7.4
>


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [meta-oracle-java][PATCH 1/2] Fix do_populate_sysroot: sstate found an absolute path symlink
  2017-10-27 16:47 ` [meta-oracle-java][PATCH 1/2] Fix do_populate_sysroot: sstate found an absolute path symlink Vincent Prince
@ 2017-10-27 18:11   ` Khem Raj
  2017-10-27 19:26     ` Vincent Prince
  0 siblings, 1 reply; 7+ messages in thread
From: Khem Raj @ 2017-10-27 18:11 UTC (permalink / raw)
  To: Vincent Prince; +Cc: yocto

On Fri, Oct 27, 2017 at 9:47 AM, Vincent Prince
<vincent.prince.fr@gmail.com> wrote:
> I was mistaken, following patch fixes it for real
>
> Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
> ---
>  recipes-devtools/oracle-java/oracle-jse-jdk.inc | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk.inc
> b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
> index a7210d9..1092a34 100644
> --- a/recipes-devtools/oracle-java/oracle-jse-jdk.inc
> +++ b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
> @@ -12,16 +12,16 @@ JDK_JRE = "jdk"
>  require oracle-jse.inc
>
>  do_install_class-native() {
> -       install -d                              ${D}${libdir_jvm}
> +       install -d                              ${D}${libdir_jvm}

This change is not relevant here I think.

>         cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE} ${D}${JDK_HOME}
>
> -       install -d                              ${D}${bindir}
> -       ln -sf ${JDK_HOME}/bin/java             ${D}${bindir}
> -       ln -sf ${JDK_HOME}/bin/javac            ${D}${bindir}
> +       install -d                              ${D}${bindir}
> +       ln -sf ../lib/jvm/${JDK_DIR}/bin/java   ${D}${bindir}
> +       ln -sf ../lib/jvm/${JDK_DIR}/bin/javac  ${D}${bindir}
>
> -       install -d                              ${D}${JDK_HOME}/bin
> -       ln -sf javah                            ${D}${JDK_HOME}/bin/gjavah
> -       ln -sf jar                              ${D}${JDK_HOME}/bin/fastjar
> +       install -d                              ${D}${JDK_HOME}/bin
> +       ln -sf javah                            ${D}${JDK_HOME}/bin/gjavah
> +       ln -sf jar                              ${D}${JDK_HOME}/bin/fastjar
>  }
>
>  BBCLASSEXTEND = "native"
> --
> 2.7.4
>
> 2017-10-27 14:18 GMT+02:00 Vincent Prince <vincent.prince.fr@gmail.com>:
>> Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
>> ---
>>  recipes-devtools/oracle-java/oracle-jse-jdk.inc | 16 ++++++++--------
>>  1 file changed, 8 insertions(+), 8 deletions(-)
>>
>> diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk.inc b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
>> index a7210d9..11fe17b 100644
>> --- a/recipes-devtools/oracle-java/oracle-jse-jdk.inc
>> +++ b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
>> @@ -12,16 +12,16 @@ JDK_JRE = "jdk"
>>  require oracle-jse.inc
>>
>>  do_install_class-native() {
>> -       install -d                              ${D}${libdir_jvm}
>> -       cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE} ${D}${JDK_HOME}
>> +       install -d ${D}${libdir_jvm}
>> +       cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE} ${D}${JDK_HOME}
>>
>> -       install -d                              ${D}${bindir}
>> -       ln -sf ${JDK_HOME}/bin/java             ${D}${bindir}
>> -       ln -sf ${JDK_HOME}/bin/javac            ${D}${bindir}
>> +       install -d ${D}${bindir}
>> +       ln -sf ${D}${JDK_HOME}/bin/java ${D}${bindir}
>> +       ln -sf ${D}${JDK_HOME}/bin/javac ${D}${bindir}
>>
>> -       install -d                              ${D}${JDK_HOME}/bin
>> -       ln -sf javah                            ${D}${JDK_HOME}/bin/gjavah
>> -       ln -sf jar                              ${D}${JDK_HOME}/bin/fastjar
>> +       install -d ${D}${JDK_HOME}/bin
>> +       ln -sf javah ${D}${JDK_HOME}/bin/gjavah
>> +       ln -sf jar ${D}${JDK_HOME}/bin/fastjar
>>  }
>>
>>  BBCLASSEXTEND = "native"
>> --
>> 2.7.4
>>
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [meta-oracle-java][PATCH 1/2] Fix do_populate_sysroot: sstate found an absolute path symlink
  2017-10-27 18:11   ` Khem Raj
@ 2017-10-27 19:26     ` Vincent Prince
  0 siblings, 0 replies; 7+ messages in thread
From: Vincent Prince @ 2017-10-27 19:26 UTC (permalink / raw)
  To: Khem Raj; +Cc: yocto

Hi Khem,

it's true, the only revelant part is

> +       ln -sf ../lib/jvm/${JDK_DIR}/bin/java   ${D}${bindir}
> +       ln -sf ../lib/jvm/${JDK_DIR}/bin/javac  ${D}${bindir}

I shouldn't git send-mail on friday sorry,

Best Regards,
Vincent

2017-10-27 20:11 GMT+02:00 Khem Raj <raj.khem@gmail.com>:
> On Fri, Oct 27, 2017 at 9:47 AM, Vincent Prince
> <vincent.prince.fr@gmail.com> wrote:
>> I was mistaken, following patch fixes it for real
>>
>> Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
>> ---
>>  recipes-devtools/oracle-java/oracle-jse-jdk.inc | 14 +++++++-------
>>  1 file changed, 7 insertions(+), 7 deletions(-)
>>
>> diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk.inc
>> b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
>> index a7210d9..1092a34 100644
>> --- a/recipes-devtools/oracle-java/oracle-jse-jdk.inc
>> +++ b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
>> @@ -12,16 +12,16 @@ JDK_JRE = "jdk"
>>  require oracle-jse.inc
>>
>>  do_install_class-native() {
>> -       install -d                              ${D}${libdir_jvm}
>> +       install -d                              ${D}${libdir_jvm}
>
> This change is not relevant here I think.
>
>>         cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE} ${D}${JDK_HOME}
>>
>> -       install -d                              ${D}${bindir}
>> -       ln -sf ${JDK_HOME}/bin/java             ${D}${bindir}
>> -       ln -sf ${JDK_HOME}/bin/javac            ${D}${bindir}
>> +       install -d                              ${D}${bindir}
>> +       ln -sf ../lib/jvm/${JDK_DIR}/bin/java   ${D}${bindir}
>> +       ln -sf ../lib/jvm/${JDK_DIR}/bin/javac  ${D}${bindir}
>>
>> -       install -d                              ${D}${JDK_HOME}/bin
>> -       ln -sf javah                            ${D}${JDK_HOME}/bin/gjavah
>> -       ln -sf jar                              ${D}${JDK_HOME}/bin/fastjar
>> +       install -d                              ${D}${JDK_HOME}/bin
>> +       ln -sf javah                            ${D}${JDK_HOME}/bin/gjavah
>> +       ln -sf jar                              ${D}${JDK_HOME}/bin/fastjar
>>  }
>>
>>  BBCLASSEXTEND = "native"
>> --
>> 2.7.4
>>
>> 2017-10-27 14:18 GMT+02:00 Vincent Prince <vincent.prince.fr@gmail.com>:
>>> Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
>>> ---
>>>  recipes-devtools/oracle-java/oracle-jse-jdk.inc | 16 ++++++++--------
>>>  1 file changed, 8 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk.inc b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
>>> index a7210d9..11fe17b 100644
>>> --- a/recipes-devtools/oracle-java/oracle-jse-jdk.inc
>>> +++ b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
>>> @@ -12,16 +12,16 @@ JDK_JRE = "jdk"
>>>  require oracle-jse.inc
>>>
>>>  do_install_class-native() {
>>> -       install -d                              ${D}${libdir_jvm}
>>> -       cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE} ${D}${JDK_HOME}
>>> +       install -d ${D}${libdir_jvm}
>>> +       cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE} ${D}${JDK_HOME}
>>>
>>> -       install -d                              ${D}${bindir}
>>> -       ln -sf ${JDK_HOME}/bin/java             ${D}${bindir}
>>> -       ln -sf ${JDK_HOME}/bin/javac            ${D}${bindir}
>>> +       install -d ${D}${bindir}
>>> +       ln -sf ${D}${JDK_HOME}/bin/java ${D}${bindir}
>>> +       ln -sf ${D}${JDK_HOME}/bin/javac ${D}${bindir}
>>>
>>> -       install -d                              ${D}${JDK_HOME}/bin
>>> -       ln -sf javah                            ${D}${JDK_HOME}/bin/gjavah
>>> -       ln -sf jar                              ${D}${JDK_HOME}/bin/fastjar
>>> +       install -d ${D}${JDK_HOME}/bin
>>> +       ln -sf javah ${D}${JDK_HOME}/bin/gjavah
>>> +       ln -sf jar ${D}${JDK_HOME}/bin/fastjar
>>>  }
>>>
>>>  BBCLASSEXTEND = "native"
>>> --
>>> 2.7.4
>>>
>> --
>> _______________________________________________
>> yocto mailing list
>> yocto@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/yocto


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [meta-oracle-java][PATCH V2 1/2] On headless arm, do_package() complains about missing libX11.so.6 provider.
  2017-10-27 12:18 [meta-oracle-java][PATCH 1/2] Fix do_populate_sysroot: sstate found an absolute path symlink Vincent Prince
  2017-10-27 12:18 ` [meta-oracle-java][PATCH 2/2] On headless arm, do_package() complains about missing libX11.so.6 provider Vincent Prince
  2017-10-27 16:47 ` [meta-oracle-java][PATCH 1/2] Fix do_populate_sysroot: sstate found an absolute path symlink Vincent Prince
@ 2017-10-30  9:32 ` Vincent Prince
  2017-10-30  9:32   ` [meta-oracle-java][PATCH V2 2/2] Fix do_populate_sysroot: sstate found an absolute path symlink Vincent Prince
  2 siblings, 1 reply; 7+ messages in thread
From: Vincent Prince @ 2017-10-30  9:32 UTC (permalink / raw)
  To: yocto, maxin.john

Full JRE created by jrecreate contains awt/swing dynamic libraries linked to libX11.
We patch binaries to remove libX11 dependencies

Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
---
 recipes-devtools/oracle-java/oracle-jse-ejre.inc | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/recipes-devtools/oracle-java/oracle-jse-ejre.inc b/recipes-devtools/oracle-java/oracle-jse-ejre.inc
index d7a4b33..114a7dc 100644
--- a/recipes-devtools/oracle-java/oracle-jse-ejre.inc
+++ b/recipes-devtools/oracle-java/oracle-jse-ejre.inc
@@ -11,7 +11,7 @@ DESCRIPTION = "This is the proprietary JRE from Sun/Oracle, with the Hotspot JVM
 JDK_JRE = "ejre"
 require oracle-jse.inc
 
-DEPENDS = "virtual/java-native"
+DEPENDS = "virtual/java-native patchelf-native"
 
 LIC_FILES_CHKSUM = "\
 	file://${LICENSE_DIR}/COPYRIGHT;md5=3dc1bfbd5bed75d650ad0506a0df5930 \
@@ -22,4 +22,16 @@ do_compile() {
 	DEST=${S}/${JDK_JRE}${PV}_${PV_UPDATE}
 	rm -rf ${DEST}
 	JAVA_HOME=${STAGING_DIR_NATIVE}/${JDK_HOME} ejdk${PV}_${PV_UPDATE}/bin/jrecreate.sh --dest ${DEST}
+
+	PATCHELF_DIR=${STAGING_DIR_NATIVE}/usr/bin
+	${PATCHELF_DIR}/patchelf --remove-needed libX11.so.6 ${DEST}/bin/policytool
+
+	${PATCHELF_DIR}/patchelf --remove-needed libX11.so.6 \
+                                 --remove-needed libXext.so.6 ${DEST}/lib/arm/libsplashscreen.so
+
+	${PATCHELF_DIR}/patchelf --remove-needed libX11.so.6 \
+                                 --remove-needed libXrender.so.1 \
+                                 --remove-needed libXtst.so.6 \
+                                 --remove-needed libXi.so.6 \
+                                 --remove-needed libXext.so.6 ${DEST}/lib/arm/libawt_xawt.so
 }
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [meta-oracle-java][PATCH V2 2/2] Fix do_populate_sysroot: sstate found an absolute path symlink
  2017-10-30  9:32 ` [meta-oracle-java][PATCH V2 1/2] On headless arm, do_package() complains about missing libX11.so.6 provider Vincent Prince
@ 2017-10-30  9:32   ` Vincent Prince
  0 siblings, 0 replies; 7+ messages in thread
From: Vincent Prince @ 2017-10-30  9:32 UTC (permalink / raw)
  To: yocto, maxin.john

Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
---
 recipes-devtools/oracle-java/oracle-jse-jdk.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk.inc b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
index a7210d9..84772e6 100644
--- a/recipes-devtools/oracle-java/oracle-jse-jdk.inc
+++ b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
@@ -16,8 +16,8 @@ do_install_class-native() {
 	cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE}	${D}${JDK_HOME}
 
 	install -d				${D}${bindir}
-	ln -sf ${JDK_HOME}/bin/java		${D}${bindir}
-	ln -sf ${JDK_HOME}/bin/javac		${D}${bindir}
+	ln -sf ../lib/jvm/${JDK_DIR}/bin/java	${D}${bindir}
+	ln -sf ../lib/jvm/${JDK_DIR}/bin/javac	${D}${bindir}
 
 	install -d				${D}${JDK_HOME}/bin
 	ln -sf javah				${D}${JDK_HOME}/bin/gjavah
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2017-10-30  9:51 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-27 12:18 [meta-oracle-java][PATCH 1/2] Fix do_populate_sysroot: sstate found an absolute path symlink Vincent Prince
2017-10-27 12:18 ` [meta-oracle-java][PATCH 2/2] On headless arm, do_package() complains about missing libX11.so.6 provider Vincent Prince
2017-10-27 16:47 ` [meta-oracle-java][PATCH 1/2] Fix do_populate_sysroot: sstate found an absolute path symlink Vincent Prince
2017-10-27 18:11   ` Khem Raj
2017-10-27 19:26     ` Vincent Prince
2017-10-30  9:32 ` [meta-oracle-java][PATCH V2 1/2] On headless arm, do_package() complains about missing libX11.so.6 provider Vincent Prince
2017-10-30  9:32   ` [meta-oracle-java][PATCH V2 2/2] Fix do_populate_sysroot: sstate found an absolute path symlink Vincent Prince

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.