Skip to contentSkip to conversation

oracle-java: create directory before creating links

PATCH Superseded Jan Remmet 3 participants 4 messages Aug 16, 2017 – Aug 17, 2017

lore
Share & tools
lore

Jan Remmet

author
#0 lore raw

PATCH 1/1 oracle-java: create directory before creating links

if bindir directory doesn't exists the link is created wrongly:

file -b tmp/work/x86_64-linux/oracle-jse-jdk-x86-64-native/1.8.0-u131r0/image/home/yocto/build/tmp/sysroots/x86_64-linux/usr/bin symbolic link to
`/home/yocto/build/tmp/sysroots/x86_64-linux/usr/lib/jvm/java-8-oracle/bin/javac'

tested on morty

Signed-off-by Jan Remmet <[email protected]>
---
 recipes-devtools/oracle-java/oracle-jse-jdk.inc | 3 +++
 1 file changed, 3 insertions(+)
recipes-devtools/oracle-java/oracle-jse-jdk.inc +3 -0
index 935ad9bc2d9f..a5723879862b 100644
@@ -15,8 +15,11 @@ do_install_class-native() {
 	install -d -m 0755			${D}${libdir_jvm}
 	cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE}	${D}${JDK_HOME}
 
+	install -d -m 0755			${D}${bindir}
 	ln -sf ${JDK_HOME}/bin/java		${D}${bindir}
 	ln -sf ${JDK_HOME}/bin/javac		${D}${bindir}
+
+	install -d -m 0755			${D}${JDK_HOME}/bin
 	ln -sf javah				${D}${JDK_HOME}/bin/gjavah
 	ln -sf jar				${D}${JDK_HOME}/bin/fastjar
 }
Signature · 1 line
1.9.1
#1 lore raw
Quoted 18 lines · Jan Remmet

if bindir directory doesn't exists the link is created wrongly:

file -b tmp/work/x86_64-linux/oracle-jse-jdk-x86-64-native/1.8.0-u131r0/image/home/yocto/build/tmp/sysroots/x86_64-linux/usr/bin symbolic link to
`/home/yocto/build/tmp/sysroots/x86_64-linux/usr/lib/jvm/java-8-oracle/bin/javac'

tested on morty

Signed-off-by Jan Remmet <[email protected]>
---
 recipes-devtools/oracle-java/oracle-jse-jdk.inc | 3 +++
 1 file changed, 3 insertions(+)
recipes-devtools/oracle-java/oracle-jse-jdk.inc +0 -0
index 935ad9bc2d9f..a5723879862b 100644

recipes-devtools/oracle-java/oracle-jse-jdk.inc do_install_class-native() { · line 18

Quoted 4 lines
recipes-devtools/oracle-java/oracle-jse-jdk.inc +1 -0
@@ -15,8 +15,11 @@ do_install_class-native() {
        install -d -m 0755                      ${D}${libdir_jvm}
        cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE} ${D}${JDK_HOME}
 
+       install -d -m 0755                      ${D}${bindir}

I think -m 0755 is redundant here

Quoted 15 lines
recipes-devtools/oracle-java/oracle-jse-jdk.inc +2 -1
        ln -sf ${JDK_HOME}/bin/java             ${D}${bindir}
        ln -sf ${JDK_HOME}/bin/javac            ${D}${bindir}
+
+       install -d -m 0755                      ${D}${JDK_HOME}/bin
        ln -sf javah                            ${D}${JDK_HOME}/bin/gjavah
        ln -sf jar                              ${D}${JDK_HOME}/bin/fastjar
 }
--

1.9.1

--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto

author
#2 lore raw

PATCH v2 1/1 oracle-java: create directory before creating links

In reply to Jan Remmet

if bindir directory doesn't exists the link is created wrongly:

file -b tmp/work/x86_64-linux/oracle-jse-jdk-x86-64-native/1.8.0-u131r0/image/home/yocto/build/tmp/sysroots/x86_64-linux/usr/bin symbolic link to
`/home/yocto/build/tmp/sysroots/x86_64-linux/usr/lib/jvm/java-8-oracle/bin/javac'

tested on morty

Signed-off-by Jan Remmet <[email protected]>

---
v2: remove default -m 0755 from install command

 recipes-devtools/oracle-java/oracle-jse-jdk.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
recipes-devtools/oracle-java/oracle-jse-jdk.inc +4 -1
index 935ad9bc2d9f..a7210d9ca475 100644
@@ -12,11 +12,14 @@ JDK_JRE = "jdk"
 require oracle-jse.inc
 
 do_install_class-native() {
-	install -d -m 0755			${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}${JDK_HOME}/bin
 	ln -sf javah				${D}${JDK_HOME}/bin/gjavah
 	ln -sf jar				${D}${JDK_HOME}/bin/fastjar
 }
Signature · 1 line
1.9.1
#3 lore raw

Hi,

Quoted 26 lines · Jan Remmet

if bindir directory doesn't exists the link is created wrongly:

file -b tmp/work/x86_64-linux/oracle-jse-jdk-x86-64-native/1.8.0-u131r0/image/home/yocto/build/tmp/sysroots/x86_64-linux/usr/bin symbolic link to
`/home/yocto/build/tmp/sysroots/x86_64-linux/usr/lib/jvm/java-8-oracle/bin/javac'

tested on morty

Signed-off-by Jan Remmet <[email protected]>

---
v2: remove default -m 0755 from install command

 recipes-devtools/oracle-java/oracle-jse-jdk.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
recipes-devtools/oracle-java/oracle-jse-jdk.inc +1 -1
index 935ad9bc2d9f..a7210d9ca475 100644
@@ -12,11 +12,14 @@ JDK_JRE = "jdk"
 require oracle-jse.inc
 
 do_install_class-native() {
-	install -d -m 0755			${D}${libdir_jvm}
+	install -d				${D}${libdir_jvm}

recipes-devtools/oracle-java/oracle-jse-jdk.inc JDK_JRE = "jdk" · line 25

Quoted 10 lines
recipes-devtools/oracle-java/oracle-jse-jdk.inc +3 -0
 	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}${JDK_HOME}/bin
 	ln -sf javah				${D}${JDK_HOME}/bin/gjavah
 	ln -sf jar				${D}${JDK_HOME}/bin/fastjar
 }

Pushed now. Thanks.

Regards,
Maxin