Skip to contentSkip to conversation

Fix do_populate_sysroot: sstate found an absolute path symlink

PATCH In review Vincent Prince 2 participants 7 messages Oct 27, 2017 – Oct 30, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 Fix do_populate_sysroot: sstate found an absolute path symlink

---
 recipes-devtools/oracle-java/oracle-jse-jdk.inc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
recipes-devtools/oracle-java/oracle-jse-jdk.inc +8 -8
index a7210d9..11fe17b 100644
@@ -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"
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/2 On headless arm, do_package() complains about missing libX11.so.6 provider.

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

This patch creates a compact JRE without those libraries.

---
 recipes-devtools/oracle-java/oracle-jse-ejre.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-devtools/oracle-java/oracle-jse-ejre.inc +1 -1
index d7a4b33..0b0d978 100644
@@ -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}
 }
Signature · 1 line
2.7.4
#2 lore raw
In reply to Vincent Prince

I was mistaken, following patch fixes it for real

---
 recipes-devtools/oracle-java/oracle-jse-jdk.inc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
(quoted diff) +0 -0

b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
index a7210d9..1092a34 100644

recipes-devtools/oracle-java/oracle-jse-jdk.inc +7 -7
@@ -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"
Signature · 3 lines
2.7.4

2017-10-27 14:18 GMT+02:00 Vincent Prince <[email protected]>:
Quoted 37 lines
---
 recipes-devtools/oracle-java/oracle-jse-jdk.inc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
recipes-devtools/oracle-java/oracle-jse-jdk.inc +8 -9
index a7210d9..11fe17b 100644
@@ -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

#3 lore raw
Quoted 13 lines · Vincent Prince

I was mistaken, following patch fixes it for real

---
 recipes-devtools/oracle-java/oracle-jse-jdk.inc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
recipes-devtools/oracle-java/oracle-jse-jdk.inc +0 -0
index a7210d9..1092a34 100644

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

Quoted 5 lines
recipes-devtools/oracle-java/oracle-jse-jdk.inc +1 -1
@@ -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.

Quoted 64 lines
recipes-devtools/oracle-java/oracle-jse-jdk.inc +6 -7
        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 <[email protected]>:

Quoted 35 lines
---
 recipes-devtools/oracle-java/oracle-jse-jdk.inc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
recipes-devtools/oracle-java/oracle-jse-jdk.inc +8 -9
index a7210d9..11fe17b 100644
@@ -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"
--
Quoted 2 lines

2.7.4

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

#4 lore raw

Hi Khem,

it's true, the only revelant part is

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

Quoted 2 lines
recipes-devtools/oracle-java/oracle-jse-jdk.inc +2 -0
+       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 <[email protected]>:

Quoted 87 lines
Quoted 13 lines · Vincent Prince

I was mistaken, following patch fixes it for real

---
 recipes-devtools/oracle-java/oracle-jse-jdk.inc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
recipes-devtools/oracle-java/oracle-jse-jdk.inc +0 -0
index a7210d9..1092a34 100644

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

Quoted 5 lines
recipes-devtools/oracle-java/oracle-jse-jdk.inc +1 -1
@@ -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.

Quoted 64 lines
recipes-devtools/oracle-java/oracle-jse-jdk.inc +6 -7
        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 <[email protected]>:

Quoted 35 lines
---
 recipes-devtools/oracle-java/oracle-jse-jdk.inc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
recipes-devtools/oracle-java/oracle-jse-jdk.inc +8 -9
index a7210d9..11fe17b 100644
@@ -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"
--
Quoted 2 lines

2.7.4

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

#5 lore raw

PATCH v2 1/2 On headless arm, do_package() complains about missing libX11.so.6 provider.

In reply to Vincent Prince

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

---
 recipes-devtools/oracle-java/oracle-jse-ejre.inc | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
recipes-devtools/oracle-java/oracle-jse-ejre.inc +13 -1
index d7a4b33..114a7dc 100644
@@ -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
 }
Signature · 1 line
2.7.4
#6 lore raw

PATCH v2 2/2 Fix do_populate_sysroot: sstate found an absolute path symlink

---
 recipes-devtools/oracle-java/oracle-jse-jdk.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-devtools/oracle-java/oracle-jse-jdk.inc +2 -2
index a7210d9..84772e6 100644
@@ -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
Signature · 1 line
2.7.4