[meta-java][PATCH 00/23] Multiple patches for multiconfig

[meta-java][PATCH 00/23] Multiple patches for multiconfig

[Ricardo Ribalda Delgado]

Patches to build meta-java with multiconfig and aarch64.

Ricardo Ribalda Delgado (23):
  icedtea7: Add x11 as default pkgconfig
  openjd7: remove support for kerberos
  openjd8: remove support for kerberos
  classpath: Fix build with targets aarch64
  jamvm: Do not build for aarch64 targets
  cacao: Do not build for aarch64 targets
  javasqlite: Create cc tool to make libtool happy
  jdon: Fix location of S
  rxtx: Fix path of javac
  jamvm: Fix binary location for ecj-initial
  cup: Do not use all as PACKAGE_ARCH
  dbus-java: Do not use all as PACKAGE_ARCH
  rhino: Do not use all as PACKAGE_ARCH
  ca-certificates: Cannot be an allarch package
  xalan-j: Do not use all as PACKAGE_ARCH
  xom: Do not use all as PACKAGE_ARCH
  jaxen: Do not build an all PACKAGE_ARCH
  jlex: Do not build as an all PACKAGE_ARCH
  bsf: Do not build as all PACKAGE_ARCH
  poi: Do not build as all PACKAGE_ARCH
  xom: Allow re-running do_compile
  jdom: Do not use all as PACKAGE_ARCH
  dom4j: Do not use all as PACKAGE_ARCH

 .../ca-certificates-java_20180516.bb          |  2 +-
 recipes-core/cacao/cacao_1.6.1.bb             |  2 ++
 .../classpath/classpath-0.99/aarch64.patch    | 19 +++++++++++++++
 recipes-core/classpath/classpath_0.99.bb      |  1 +
 recipes-core/cup/cup_0.10k.bb                 |  1 +
 recipes-core/icedtea/icedtea7-native.inc      |  2 +-
 recipes-core/jakarta-libs/bsf_2.4.0.bb        |  4 +++-
 recipes-core/jakarta-libs/poi_3.0.bb          |  2 ++
 recipes-core/jamvm/jamvm.inc                  |  2 +-
 recipes-core/jamvm/jamvm_git.bb               |  1 +
 .../javasqlite/javasqlite_20150419.bb         |  8 ++++++-
 recipes-core/jlex/jlex_1.2.6.bb               |  2 ++
 recipes-core/openjdk/openjdk-7-common.inc     |  3 ++-
 recipes-core/openjdk/openjdk-8-cross.inc      |  2 +-
 recipes-core/rhino/rhino_1.7r4.bb             |  2 ++
 recipes-core/xalan-j/xalan-j_2.7.1.bb         |  4 +++-
 recipes-core/xml-commons/dom4j_1.6.1.bb       |  1 +
 recipes-core/xml-commons/jaxen_1.1.6.bb       |  2 ++
 recipes-core/xml-commons/jdom_1.1.3.bb        |  4 ++++
 recipes-core/xml-commons/xom_1.2.10.bb        |  9 ++++++--
 recipes-extended/dbus/dbus-java_2.7.bb        |  4 +++-
 recipes-extended/rxtx/files/javapath.patch    | 23 +++++++++++++++++++
 recipes-extended/rxtx/rxtx_2.2.0.bb           |  5 ++--
 23 files changed, 92 insertions(+), 13 deletions(-)
 create mode 100644 recipes-core/classpath/classpath-0.99/aarch64.patch
 create mode 100644 recipes-extended/rxtx/files/javapath.patch

-- 
2.20.1

[meta-java][PATCH 01/23] icedtea7: Add x11 as default pkgconfig

[Ricardo Ribalda Delgado]

Seems to be a basic dependency, not optional.

Fixes:
| checking X11/X.h usability... no
| checking X11/X.h presence... no
| checking for X11/X.h... no
| configure: error: "xorg headers were not found -
| 	try installing xorg-x11-proto-devel."
| NOTE: The following config.log files may provide further information.
| NOTE: /workdir/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/config.log
| ERROR: configure failed
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_configure (log file is located at /workdir/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/temp/log.do_configure.29594)
ERROR: Task (/workdir/repo/poky/../meta-java/recipes-core/icedtea/icedtea7-native_2.1.3.bb:do_configure) failed with exit code '1'

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 recipes-core/icedtea/icedtea7-native.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc
index 69f5d25..747bb72 100644
--- a/recipes-core/icedtea/icedtea7-native.inc
+++ b/recipes-core/icedtea/icedtea7-native.inc
@@ -11,7 +11,7 @@ DEPENDS = "virtual/javac-native virtual/java-native classpath-native \
 	   unzip-native make-native util-linux-native\
           "
 
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "x11"
 PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xorgproto-native libxt-native libxext-native libxrender-native"
 
 OEMAKE_BUILD_HEADLESS_ONLY = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}"
-- 
2.20.1

[meta-java][PATCH 02/23] openjd7: remove support for kerberos

[Ricardo Ribalda Delgado]

It triggers a lot of dependencies, and it is no clear that
is needed.

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 recipes-core/openjdk/openjdk-7-common.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
index 794bf58..26e71ce 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -67,7 +67,7 @@ DEPENDS = " \
     jpeg libpng giflib \
     gtk+ glib-2.0 \
     cups fontconfig \
-    rhino krb5 \
+    rhino \
     libxt libxinerama libxrender libxtst libxi \
     freetype alsa-lib libffi \
     attr \
@@ -134,6 +134,7 @@ EXTRA_OECONF = " \
 EXTRA_OECONF += " \
     --disable-system-pcsc \
     --disable-system-sctp \
+    --disable-system-kerberos \
 "
 
 do_configure_prepend() {
-- 
2.20.1

[meta-java][PATCH 03/23] openjd8: remove support for kerberos

[Ricardo Ribalda Delgado]

It triggers a lot of dependencies, and it is no clear that
is needed.

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 recipes-core/openjdk/openjdk-8-cross.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc
index d04b0d3..a2bd23e 100644
--- a/recipes-core/openjdk/openjdk-8-cross.inc
+++ b/recipes-core/openjdk/openjdk-8-cross.inc
@@ -3,7 +3,7 @@ JRE_HOME = "${libdir_jvm}/openjre-8"
 
 DEPENDS = "\
     openjdk-8-native zip-native ant-native libxslt \
-    krb5 libffi fontconfig freetype \
+    libffi fontconfig freetype \
 "
 
 PRIVATE_LIBS = "\
-- 
2.20.1

[meta-java][PATCH 04/23] classpath: Fix build with targets aarch64

[Ricardo Ribalda Delgado]

Fixes:
| In file included from ../../../classpath-0.99/native/fdlibm/fdlibm.h:36,
|                  from ../../../classpath-0.99/native/fdlibm/e_exp.c:76:
| ../../../classpath-0.99/native/fdlibm/ieeefp.h:163:2: error: #error Endianess not declared!!
|  #error Endianess not declared!!
|   ^~~~~
| In file included from ../../classpath-0.99/native/fdlibm/fdlibm.h:40,

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 .../classpath/classpath-0.99/aarch64.patch    | 19 +++++++++++++++++++
 recipes-core/classpath/classpath_0.99.bb      |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 recipes-core/classpath/classpath-0.99/aarch64.patch

diff --git a/recipes-core/classpath/classpath-0.99/aarch64.patch b/recipes-core/classpath/classpath-0.99/aarch64.patch
new file mode 100644
index 0000000..4de40fb
--- /dev/null
+++ b/recipes-core/classpath/classpath-0.99/aarch64.patch
@@ -0,0 +1,19 @@
+Upstream-Status: Inappropriate [upstream is dead]
+
+Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com>
+
+diff --git a/native/fdlibm/ieeefp.h b/native/fdlibm/ieeefp.h
+index c230bbb..700dd3a 100644
+--- a/native/fdlibm/ieeefp.h
++++ b/native/fdlibm/ieeefp.h
+@@ -158,6 +158,10 @@
+ #define __IEEE_BIG_ENDIAN
+ #endif
+ 
++#ifdef __aarch64__
++#define __IEEE_LITTLE_ENDIAN
++#endif
++
+ #ifndef __IEEE_BIG_ENDIAN
+ #ifndef __IEEE_LITTLE_ENDIAN
+ #error Endianess not declared!!
diff --git a/recipes-core/classpath/classpath_0.99.bb b/recipes-core/classpath/classpath_0.99.bb
index 6aa3baa..714503a 100644
--- a/recipes-core/classpath/classpath_0.99.bb
+++ b/recipes-core/classpath/classpath_0.99.bb
@@ -14,6 +14,7 @@ SRC_URI += " \
             file://toolwrapper-exithook.patch \
             file://use_libdir.patch \
             file://freetype2.patch \
+            file://aarch64.patch \
            "
 
 SRC_URI[md5sum] = "0ae1571249172acd82488724a3b8acb4"
-- 
2.20.1

[meta-java][PATCH 05/23] jamvm: Do not build for aarch64 targets

[Ricardo Ribalda Delgado]

Avoids:
| configure: error: aarch64-poky-linux-gnu not supported
| NOTE: The following config.log files may provide further information.
| NOTE: /workdir/build/tmp/work/aarch64-poky-linux/jamvm/2.0.0-devel+gitAUTOINC+6cef41d859-r0/build/config.log
| ERROR: configure failed

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 recipes-core/jamvm/jamvm_git.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-core/jamvm/jamvm_git.bb b/recipes-core/jamvm/jamvm_git.bb
index 1762ade..57f7e64 100644
--- a/recipes-core/jamvm/jamvm_git.bb
+++ b/recipes-core/jamvm/jamvm_git.bb
@@ -15,3 +15,4 @@ SRC_URI = "git://git.code.sf.net/p/jamvm/code;protocol=git \
 
 S = "${WORKDIR}/git"
 
+COMPATIBLE_MACHINE_aarch64 = "-"
-- 
2.20.1

[meta-java][PATCH 06/23] cacao: Do not build for aarch64 targets

[Ricardo Ribalda Delgado]

Avoids:
| configure: error: aarch64 systems are currently not supported.
| NOTE: The following config.log files may provide further information.
| NOTE: /workdir/build/tmp/work/aarch64-poky-linux/cacao/1.6.1-r0/cacao-1.6.1/src/mm/boehm-gc/libatomic_ops/config.log /workdir/build/tmp/work/aarch64-poky-linux/cacao/1.6.1-r0/cacao-1.6.1/config.log

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 recipes-core/cacao/cacao_1.6.1.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-core/cacao/cacao_1.6.1.bb b/recipes-core/cacao/cacao_1.6.1.bb
index 1074ff5..a55d877 100644
--- a/recipes-core/cacao/cacao_1.6.1.bb
+++ b/recipes-core/cacao/cacao_1.6.1.bb
@@ -63,3 +63,5 @@ FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/.debug/lib*.so*"
 FILES_${PN}-doc += "${datadir}/gc"
 
 BBCLASSEXTEND = "native"
+
+COMPATIBLE_MACHINE_aarch64 = "-"
-- 
2.20.1

[meta-java][PATCH 07/23] javasqlite: Create cc tool to make libtool happy

[Ricardo Ribalda Delgado]

Libtool has hardcoded cc as the name for the compiler. We make a script
that calls gcc.

Fixes:

| ./libtool --mode=link cc -I/workdir/build/tmp/work/dbfp4-poky-linux/javasqlite/20150419-r0/recipe-sysroot-native/usr/lib/jvm/icedtea7-native//include -I/workdir/build/tmp/work/dbfp4-poky-linux/javasqlite/20150419-r0/recipe-sysroot-native/usr/lib/jvm/icedtea7-native//include/linux  -I/workdir/build/tmp/work/dbfp4-poky-linux/javasqlite/20150419-r0/recipe-sysroot-native/usr/include -DHAVE_SQLITE2=0 -DHAVE_SQLITE3=1 -DHAVE_SQLITE_FUNCTION_TYPE=0 -DHAVE_SQLITE_OPEN_AUX_FILE=0 -DHAVE_SQLITE_SET_AUTHORIZER=0 -DHAVE_SQLITE_TRACE=0 -DHAVE_SQLITE_COMPILE=0 -DHAVE_SQLITE_PROGRESS_HANDLER=0 -DHAVE_SQLITE3_MALLOC=1 -DHAVE_SQLITE3_PREPARE_V2=1 -DHAVE_SQLITE3_PREPARE16_V2=1 -DHAVE_SQLITE3_BIND_ZEROBLOB=1 -DHAVE_SQLITE3_CLEAR_BINDINGS=1 -DHAVE_SQLITE3_COLUMN_TABLE_NAME16=0 -DHAVE_SQLITE3_COLUMN_DATABASE_NAME16=0 -DHAVE_SQLITE3_COLUMN_ORIGIN_NAME16=0 -DHAVE_SQLITE3_BIND_PARAMETER_COUNT=1 -DHAVE_SQLITE3_BIND_PARAMETER_NAME=1 -DHAVE_SQLITE3_BIND_PARAMETER_INDEX=1 -DHAVE_SQLITE3_RESULT_ZEROBLOB=1 -DHAVE_SQLITE3_INCRBLOBIO=1 -DHAVE_SQLITE3_KEY=0 -DHAVE_SQLITE3_SHARED_CACHE=1 -DHAVE_SQLITE3_OPEN_V2=1 -DHAVE_SQLITE3_LOAD_EXTENSION=0 -DHAVE_SQLITE3_BACKUPAPI=1 -DHAVE_SQLITE3_PROFILE=1 -DHAVE_SQLITE3_STATUS=1 -DHAVE_SQLITE3_DB_STATUS=1 -DHAVE_SQLITE3_STMT_STATUS=1 -DCANT_PASS_VALIST_AS_CHARPTR=1  -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DLL=1 -o native/mkconst native/mkconst.c
| libtool: link: cc -I/workdir/build/tmp/work/dbfp4-poky-linux/javasqlite/20150419-r0/recipe-sysroot-native/usr/lib/jvm/icedtea7-native//include -I/workdir/build/tmp/work/dbfp4-poky-linux/javasqlite/20150419-r0/recipe-sysroot-native/usr/lib/jvm/icedtea7-native//include/linux -I/workdir/build/tmp/work/dbfp4-poky-linux/javasqlite/20150419-r0/recipe-sysroot-native/usr/include -DHAVE_SQLITE2=0 -DHAVE_SQLITE3=1 -DHAVE_SQLITE_FUNCTION_TYPE=0 -DHAVE_SQLITE_OPEN_AUX_FILE=0 -DHAVE_SQLITE_SET_AUTHORIZER=0 -DHAVE_SQLITE_TRACE=0 -DHAVE_SQLITE_COMPILE=0 -DHAVE_SQLITE_PROGRESS_HANDLER=0 -DHAVE_SQLITE3_MALLOC=1 -DHAVE_SQLITE3_PREPARE_V2=1 -DHAVE_SQLITE3_PREPARE16_V2=1 -DHAVE_SQLITE3_BIND_ZEROBLOB=1 -DHAVE_SQLITE3_CLEAR_BINDINGS=1 -DHAVE_SQLITE3_COLUMN_TABLE_NAME16=0 -DHAVE_SQLITE3_COLUMN_DATABASE_NAME16=0 -DHAVE_SQLITE3_COLUMN_ORIGIN_NAME16=0 -DHAVE_SQLITE3_BIND_PARAMETER_COUNT=1 -DHAVE_SQLITE3_BIND_PARAMETER_NAME=1 -DHAVE_SQLITE3_BIND_PARAMETER_INDEX=1 -DHAVE_SQLITE3_RESULT_ZEROBLOB=1 -DHAVE_SQLITE3_INCRBLOBIO=1 -DHAVE_SQLITE3_KEY=0 -DHAVE_SQLITE3_SHARED_CACHE=1 -DHAVE_SQLITE3_OPEN_V2=1 -DHAVE_SQLITE3_LOAD_EXTENSION=0 -DHAVE_SQLITE3_BACKUPAPI=1 -DHAVE_SQLITE3_PROFILE=1 -DHAVE_SQLITE3_STATUS=1 -DHAVE_SQLITE3_DB_STATUS=1 -DHAVE_SQLITE3_STMT_STATUS=1 -DCANT_PASS_VALIST_AS_CHARPTR=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DLL=1 -o native/mkconst native/mkconst.c
| ./libtool: line 1720: cc: command not found
| make: *** [Makefile:222: native/mkconst] Error 127

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 recipes-core/javasqlite/javasqlite_20150419.bb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/recipes-core/javasqlite/javasqlite_20150419.bb b/recipes-core/javasqlite/javasqlite_20150419.bb
index d721d66..6a41cee 100644
--- a/recipes-core/javasqlite/javasqlite_20150419.bb
+++ b/recipes-core/javasqlite/javasqlite_20150419.bb
@@ -7,7 +7,7 @@ That API is wrapped by methods in the SQLite.Database class."
 
 LICENSE = "BSD"
 SECTION = "application"
-PR = "r0"
+PE = "1"
 SRC_URI =  " \
     http://www.ch-werner.de/javasqlite/${BPN}-${PV}.tar.gz \
     file://0001-fix-errors-during-cross-compile.patch \
@@ -40,3 +40,9 @@ INSANE_SKIP_${PN}-dev = "dev-elf"
 do_configure_append (){
 	cp ${S}/*-libtool ${S}/libtool
 }
+
+do_compile_prepend (){
+	echo '#!/bin/sh' > ${STAGING_BINDIR_NATIVE}/cc
+	echo 'gcc $@' >> ${STAGING_BINDIR_NATIVE}/cc
+	chmod a+x ${STAGING_BINDIR_NATIVE}/cc
+}
-- 
2.20.1

[meta-java][PATCH 08/23] jdon: Fix location of S

[Ricardo Ribalda Delgado]

Otherwise License files cannot be found.

Fixes:
WARNING: jdom-1.1.3-r0 do_populate_lic: Could not copy license file /workdir/build/tmp/work/all-poky-linux/jdom/1.1.3-r0/jdom-1.1.3/LICENSE.txt to /workdir/build/tmp/work/all-poky-linux/jdom/1.1.3-r0/license-destdir/jdom/LICENSE.txt: [Errno 2] No such file or directory: '/workdir/build/tmp/work/all-poky-linux/jdom/1.1.3-r0/jdom-1.1.3/LICENSE.txt'
ERROR: jdom-1.1.3-r0 do_populate_lic: QA Issue: jdom: LIC_FILES_CHKSUM points to an invalid file: /workdir/build/tmp/work/all-poky-linux/jdom/1.1.3-r0/jdom-1.1.3/LICENSE.txt [license-checksum]
ERROR: jdom-1.1.3-r0 do_populate_lic: Fatal QA errors found, failing task.
ERROR: jdom-1.1.3-r0 do_populate_lic:
ERROR: jdom-1.1.3-r0 do_populate_lic: Function failed: populate_lic_qa_checksum
ERROR: Logfile of failure stored in: /workdir/build/tmp/work/all-poky-linux/jdom/1.1.3-r0/temp/log.do_populate_lic.4246
ERROR: Task (/workdir/repo/poky/../meta-java/recipes-core/xml-commons/jdom_1.1.3.bb:do_populate_lic) failed with exit code '1'

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 recipes-core/xml-commons/jdom_1.1.3.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-core/xml-commons/jdom_1.1.3.bb b/recipes-core/xml-commons/jdom_1.1.3.bb
index 8997bcc..8073819 100644
--- a/recipes-core/xml-commons/jdom_1.1.3.bb
+++ b/recipes-core/xml-commons/jdom_1.1.3.bb
@@ -14,6 +14,8 @@ SRC_URI[sha256sum] = "d471718c4ac7a1a2f10715b93cb3fcd2ecbab60384b73ad1c089712e47
 
 inherit java-library
 
+S = "${WORKDIR}/${PN}"
+
 do_compile() {
   mkdir -p build
 
-- 
2.20.1

[meta-java][PATCH 09/23] rxtx: Fix path of javac

[Ricardo Ribalda Delgado]

rxtx was wrongly using the patch from cacao sysroot.

Fixes:

| /bin/bash: /workdir/build/tmp/work/x86_64-linux/cacao-native/1.6.1-r0/recipe-sysroot-native/usr/bin/javac: No such file or directory
| Makefile:834: recipe for target '/workdir/build/tmp/work/dbfp4-poky-linux/rxtx/2.2.0-r2/rxtx-2.2pre2/gnu/io/UnsupportedCommOperationException.class' failed
| make: *** [/workdir/build/tmp/work/dbfp4-poky-linux/rxtx/2.2.0-r2/rxtx-2.2pre2/gnu/io/UnsupportedCommOperationException.class] Error 127
| make: *** Waiting for unfinished jobs....

Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com>
Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 recipes-extended/rxtx/files/javapath.patch | 23 ++++++++++++++++++++++
 recipes-extended/rxtx/rxtx_2.2.0.bb        |  5 +++--
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 recipes-extended/rxtx/files/javapath.patch

diff --git a/recipes-extended/rxtx/files/javapath.patch b/recipes-extended/rxtx/files/javapath.patch
new file mode 100644
index 0000000..e0c1737
--- /dev/null
+++ b/recipes-extended/rxtx/files/javapath.patch
@@ -0,0 +1,23 @@
+Upstream-Status: Inappropriate
+
+Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com>
+
+diff --git a/configure.in b/configure.in
+index 1778a52..344f5ac 100644
+--- a/configure.in
++++ b/configure.in
+@@ -484,10 +484,10 @@ if test "$CC" = "gcc" || test "$CC"="egcs"; then
+ 		;;
+ 	*)
+ 		find_java_native_include jni_md.h
+-		JAVAH="\$(JPATH)/bin/javah -classpath \$(CLASSPATH) -d \$(DEST) -jni"
+-		JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.3 -target 1.3"
+-		JAR="\$(JPATH)/bin/jar"
+-		JAVADOC="\$(JPATH)/bin/javadoc"
++		JAVAH="gjavah -classpath \$(CLASSPATH) -d \$(DEST) -jni"
++		JAVAC="javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.3 -target 1.3"
++		JAR="fastjar"
++		JAVADOC="javadoc"
+ 		CFLAGS=$CFLAGS" -D_BSD_SOURCE"
+ 		;;
+ 	esac
diff --git a/recipes-extended/rxtx/rxtx_2.2.0.bb b/recipes-extended/rxtx/rxtx_2.2.0.bb
index d4fbb9d..8216e26 100644
--- a/recipes-extended/rxtx/rxtx_2.2.0.bb
+++ b/recipes-extended/rxtx/rxtx_2.2.0.bb
@@ -2,7 +2,7 @@ SUMMARY = "Full Java CommAPI implementation"
 DEPENDS = "virtual/javac-native"
 LICENSE = "RXTXv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=32303a23463f90b12a7d1dafb8deabf4"
-PR = "r2"
+PE = "1"
 
 SRC_URI = "http://rxtx.qbang.org/pub/rxtx/rxtx-2.2pre2.zip \
            file://zsystem_init_exception.patch \
@@ -19,7 +19,8 @@ SRC_URI = "http://rxtx.qbang.org/pub/rxtx/rxtx-2.2pre2.zip \
            file://usb_38400.patch \
            file://fix_snprintf.patch \
            file://format_security.patch \
-           file://0001-Support-Freescale-i.MX-serial-ports.patch"
+           file://0001-Support-Freescale-i.MX-serial-ports.patch\
+           file://javapath.patch"
 
 SRC_URI[md5sum] = "7eedb18e3f33a427e2b0e9be8ce3f94c"
 SRC_URI[sha256sum] = "3c30373e760f444def3650c76c5a00ae12fb1d860ec008750d084f4880495b03"
-- 
2.20.1

[meta-java][PATCH 10/23] jamvm: Fix binary location for ecj-initial

[Ricardo Ribalda Delgado]

| /bin/bash: /workdir/build/tmp/work/dbfp4-poky-linux/jamvm/2.0.0-devel+gitAUTOINC+6cef41d859-r0/recipe-sysroot-native/usr/bin/ecj-initial: No such file or directory
| Makefile:663: recipe for target 'classes.zip' failed

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 recipes-core/jamvm/jamvm.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-core/jamvm/jamvm.inc b/recipes-core/jamvm/jamvm.inc
index fc21380..85b7aaa 100644
--- a/recipes-core/jamvm/jamvm.inc
+++ b/recipes-core/jamvm/jamvm.inc
@@ -35,7 +35,7 @@ EXTRA_OECONF = "--with-classpath-install-dir=${prefix} --libdir=${libdir}/jamvm
 CFLAGS_append_class-native = " -DDEFAULT_MAX_HEAP=1024*MB"
 
 # Enforce usage of ecj-initial.
-EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial \
+EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/ecj-bootstrap \
                 GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath/glibj.zip \
                "
 
-- 
2.20.1

[meta-java][PATCH 11/23] cup: Do not use all as PACKAGE_ARCH

[Ricardo Ribalda Delgado]

cup has RDEPEND that are not PACKAGE_ARCH=all

Fixes:
ERROR: mc:qt5022:cup-0.10k-r0 do_package_write_deb_setscene: Error executing a python function in exec_python_func() autogenerated:

The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function: <module>
     0001:
 *** 0002:do_package_write_deb_setscene(d)
     0003:
File: '/workdir/repo/poky/meta/classes/package_deb.bbclass', lineno: 296, function: do_package_write_deb_setscene
     0292:
     0293:    if os.access(os.path.join(tmpdir, "stamps", "DEB_PACKAGE_INDEX_CLEAN"),os.R_OK):
     0294:        os.unlink(os.path.join(tmpdir, "stamps", "DEB_PACKAGE_INDEX_CLEAN"))
     0295:
 *** 0296:    sstate_setscene(d)
     0297:}
     0298:addtask do_package_write_deb_setscene
     0299:
     0300:python () {

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 recipes-core/cup/cup_0.10k.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-core/cup/cup_0.10k.bb b/recipes-core/cup/cup_0.10k.bb
index 7792c62..3ce5a21 100644
--- a/recipes-core/cup/cup_0.10k.bb
+++ b/recipes-core/cup/cup_0.10k.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=2c9db91c00f38e52cfc8e67bafaa7c
 
 RDEPENDS_${PN} = "java2-runtime"
 RDEPENDS_${PN}_class-native = ""
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
 
 inherit java-library
 
-- 
2.20.1

[meta-java][PATCH 12/23] dbus-java: Do not use all as PACKAGE_ARCH

[Ricardo Ribalda Delgado]

dbus-java has RDEPEND that are not PACKAGE_ARCH=all

Fixes:
ERROR: dbus-java-2.7-r0 do_populate_sysroot_setscene: Error executing a python function in exec_python_func() autogenerated:

The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function: <module>
     0001:
 *** 0002:do_populate_sysroot_setscene(d)
     0003:
File: '/workdir/repo/poky/meta/classes/staging.bbclass', lineno: 126, function: do_populate_sysroot_setscene
     0122:do_populate_sysroot[sstate-outputdirs] = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/${PN}"
     0123:do_populate_sysroot[sstate-fixmedir] = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/${PN}"
     0124:
     0125:python do_populate_sysroot_setscene () {
 *** 0126:    sstate_setscene(d)
     0127:}
     0128:addtask do_populate_sysroot_setscene
     0129:
     0130:def staging_copyfile(c, target, dest, postinsts, seendirs):

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 recipes-extended/dbus/dbus-java_2.7.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes-extended/dbus/dbus-java_2.7.bb b/recipes-extended/dbus/dbus-java_2.7.bb
index 0b093a0..7715325 100644
--- a/recipes-extended/dbus/dbus-java_2.7.bb
+++ b/recipes-extended/dbus/dbus-java_2.7.bb
@@ -11,7 +11,9 @@ RDEPENDS_${PN}-viewer = "java2-runtime libunixsocket-java ${PN}-bin libmatthew-d
 RDEPENDS_${PN}-bin = "java2-runtime libunixsocket-java libmatthew-debug-java ${JPN}"
 RSUGGESTS_${JPN} = "libunixsocket-java"
 
-PR = "r0"
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
+PE = "1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=72cc739fb93ae32741edbae802490e92"
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz"
 
-- 
2.20.1

[meta-java][PATCH 13/23] rhino: Do not use all as PACKAGE_ARCH

[Ricardo Ribalda Delgado]

rhino has RDEPEND that are not PACKAGE_ARCH=all

Fixes:

ERROR: mc:inteli7:rhino-1.7r4-r0 do_package_write_deb_setscene: Error executing a python function in exec_python_func() autogenerated:

The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function: <module>
     0001:
 *** 0002:do_package_write_deb_setscene(d)
     0003:
File: '/workdir/repo/poky/meta/classes/package_deb.bbclass', lineno: 296, function: do_package_write_deb_setscene
     0292:
     0293:    if os.access(os.path.join(tmpdir, "stamps", "DEB_PACKAGE_INDEX_CLEAN"),os.R_OK):
     0294:        os.unlink(os.path.join(tmpdir, "stamps", "DEB_PACKAGE_INDEX_CLEAN"))
     0295:
 *** 0296:    sstate_setscene(d)
     0297:}
     0298:addtask do_package_write_deb_setscene
     0299:
     0300:python () {

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 recipes-core/rhino/rhino_1.7r4.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-core/rhino/rhino_1.7r4.bb b/recipes-core/rhino/rhino_1.7r4.bb
index 0a84473..4242005 100644
--- a/recipes-core/rhino/rhino_1.7r4.bb
+++ b/recipes-core/rhino/rhino_1.7r4.bb
@@ -6,6 +6,8 @@ DEPENDS_class-native += "classpath-native"
 
 BBCLASSEXTEND = "native"
 
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
 inherit java-library
 
 SRC_URI = "\
-- 
2.20.1

[meta-java][PATCH 14/23] ca-certificates: Cannot be an allarch package

[Ricardo Ribalda Delgado]

It RDEPENDS on PACKAGE_ARCH!=all packages

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 .../ca-certificates-java/ca-certificates-java_20180516.bb       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb b/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
index 2db1915..feaa7dc 100644
--- a/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
+++ b/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
@@ -24,7 +24,7 @@ SRC_URI = "\
 
 SRCREV = "793b846dcd4e79371bbe8069e4125ec2fd462e57"
 
-inherit java allarch
+inherit java
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
-- 
2.20.1

[meta-java][PATCH 15/23] xalan-j: Do not use all as PACKAGE_ARCH

[Ricardo Ribalda Delgado]

It has DEPENDS that are not -native.

Fixes:

ERROR: mc:inteli7:xalan-j-2.7.1-r1 do_package: Error executing a python function in exec_python_func() autogenerated:

The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function: <module>
     0001:
 *** 0002:emit_pkgdata(d)
     0003:
File: '/workdir/repo/poky/meta/classes/package.bbclass', lineno: 1502, function: emit_pkgdata
     1498:        allow_empty = d.getVar('ALLOW_EMPTY_%s' % pkg)
     1499:        if not allow_empty:
     1500:            allow_empty = d.getVar('ALLOW_EMPTY')
     1501:        root = "%s/%s" % (pkgdest, pkg)
 *** 1502:        os.chdir(root)
     1503:        g = glob('*')
     1504:        if g or allow_empty == "1":
     1505:            # Symlinks needed for reverse lookups (from the final package name)
     1506:            subdata_sym = pkgdatadir + "/runtime-reverse/%s" % pkgval
Exception: FileNotFoundError: [Errno 2] No such file or directory: '/workdir/build/tmp/work/all-poky-linux/xalan-j/2.7.1-r1/packages-split/xalan-j-src'

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 recipes-core/xalan-j/xalan-j_2.7.1.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes-core/xalan-j/xalan-j_2.7.1.bb b/recipes-core/xalan-j/xalan-j_2.7.1.bb
index 7c68fba..922e293 100644
--- a/recipes-core/xalan-j/xalan-j_2.7.1.bb
+++ b/recipes-core/xalan-j/xalan-j_2.7.1.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
 AUTHOR = "Apache Software Foundation"
 HOMEPAGE = "http://xml.apache.org/xalan-j"
 
-PR = "r1"
+PE = "1"
 
 DEPENDS = "xerces-j regexp jlex cup jaxp1.3 bcel"
 
@@ -18,6 +18,8 @@ SRC_URI = "\
 
 S = "${WORKDIR}/${BPN}_2_7_1"
 
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
 inherit java-library
 
 JPN = "libxalan2-java"
-- 
2.20.1

[meta-java][PATCH 16/23] xom: Do not use all as PACKAGE_ARCH

[Ricardo Ribalda Delgado]

It RDEPENDS on packages that ar not PACKAGE_ARCH=all

Fixes:
ERROR: mc:qt5507:xom-1.2.10-r0 do_compile: Function failed: do_compile (log file is located at /workdir/build/tmp/work/all-poky-linux/xom/1.2.10-r0/temp/log.do_compile.3256)
ERROR: Logfile of failure stored in: /workdir/build/tmp/work/all-poky-linux/xom/1.2.10-r0/temp/log.do_compile.3256
Log data follows:
| DEBUG: Executing shell function do_compile
| mv: cannot stat '/workdir/build/tmp/work/all-poky-linux/xom/1.2.10-r0/git/jaxen': No such file or directory
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_compile (log file is located at /workdir/build/tmp/work/all-poky-linux/xom/1.2.10-r0/temp/log.do_compile.3256)
NOTE: recipe xom-1.2.10-r0: task do_compile: Failed

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 recipes-core/xml-commons/xom_1.2.10.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-core/xml-commons/xom_1.2.10.bb b/recipes-core/xml-commons/xom_1.2.10.bb
index 0e923d4..8755ddc 100644
--- a/recipes-core/xml-commons/xom_1.2.10.bb
+++ b/recipes-core/xml-commons/xom_1.2.10.bb
@@ -22,6 +22,8 @@ SRC_URI[archive.sha256sum] = "39985c2debb8044005fd07b09cb06f10e75652b3c048c9b443
 
 S = "${WORKDIR}/XOM"
 
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
 inherit java-library
 
 DEPENDS = "fastjar-native virtual/javac-native xerces-j xalan-j"
-- 
2.20.1

[meta-java][PATCH 17/23] jaxen: Do not build an all PACKAGE_ARCH

[Ricardo Ribalda Delgado]

jaxen depends on non -native recipes and breaks multiconfig.

Fixes:

| 138 problems (138 warnings)rm: cannot remove 'build/org/jdom/input': Directory not empty
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_compile (log file is located at /workdir/build/tmp/work/all-poky-linux/jaxen/1.1.6-r0/temp/log.do_compile.21778)
NOTE: recipe jaxen-1.1.6-r0: task do_compile: Failed
ERROR: Task (multiconfig:inteli7:/workdir/repo/poky/../meta-java/recipes-core/xml-commons/jaxen_1.1.6.bb:do_compile) failed with exit code '1'

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 recipes-core/xml-commons/jaxen_1.1.6.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-core/xml-commons/jaxen_1.1.6.bb b/recipes-core/xml-commons/jaxen_1.1.6.bb
index d75ce75..2741f2c 100644
--- a/recipes-core/xml-commons/jaxen_1.1.6.bb
+++ b/recipes-core/xml-commons/jaxen_1.1.6.bb
@@ -23,6 +23,8 @@ SRC_URI[jdom.sha256sum] = "a13549087141be24ad176b659afdc2c675f1ffa5288ff999a193d
 
 S = "${WORKDIR}/git/jaxen"
 
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
 inherit java-library
 
 do_compile() {
-- 
2.20.1

[meta-java][PATCH 18/23] jlex: Do not build as an all PACKAGE_ARCH

[Ricardo Ribalda Delgado]

jlex RDEPENDS on non -all package and breaks multiconfig.

Fixes:

ERROR: mc:qt5506:jlex-1.2.6-r0 do_package_write_deb: Fatal errors occurred in subprocesses:
Command 'PATH="/workdir/build/tmp/sysroots-uninative/x86_64-linux/usr/bin:/workdir/repo/poky/scripts:/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/recipe-sysroot-native/usr/bin/allarch-poky-linux:/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/recipe-sysroot/usr/bin/crossscripts:/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/recipe-sysroot-native/usr/sbin:/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/recipe-sysroot-native/usr/bin:/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/recipe-sysroot-native/sbin:/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/recipe-sysroot-native/bin:/workdir/repo/poky/bitbake/bin:/workdir/build/tmp/hosttools" dpkg-deb -b /workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/packages-split/jlex /workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/deploy-debs/all' returned non-zero exit status 2
Subprocess output:dpkg-deb: building package 'jlex' in '/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/deploy-debs/all'.
dpkg-deb: error: unable to create '/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/deploy-debs/all': No such file or directory

ERROR: mc:qt5506:jlex-1.2.6-r0 do_package_write_deb:
ERROR: mc:qt5506:jlex-1.2.6-r0 do_package_write_deb: Function failed: do_package_deb
ERROR: Logfile of failure stored in: /workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/temp/log.do_package_write_deb.1491

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 recipes-core/jlex/jlex_1.2.6.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-core/jlex/jlex_1.2.6.bb b/recipes-core/jlex/jlex_1.2.6.bb
index 45d76ed..b8f9ffb 100644
--- a/recipes-core/jlex/jlex_1.2.6.bb
+++ b/recipes-core/jlex/jlex_1.2.6.bb
@@ -3,6 +3,8 @@ AUTHOR = "Elliot Berk, A. Appel, C. Scott Ananian"
 LICENSE = "JLEX"
 LIC_FILES_CHKSUM = "file://Main.java;beginline=148;endline=166;md5=9bf4a6a951053991db64f9d7330d648a"
 
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
 RDEPENDS_${PN} = "java2-runtime"
 RDEPENDS_${PN}_class-native = ""
 
-- 
2.20.1

[meta-java][PATCH 19/23] bsf: Do not build as all PACKAGE_ARCH

[Ricardo Ribalda Delgado]

The package DEPENDS on non -native package, which breaks multiconfig.

Fixes:

NOTE: recipe bsf-2.4.0-r1: task do_package: Succeeded
ERROR: mc:qt5507:bsf-2.4.0-r1 do_package: Error executing a python function in exec_python_func() autogenerated:

The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function: <module>
     0001:
 *** 0002:populate_packages(d)
     0003:
File: '/workdir/repo/poky/meta/classes/package.bbclass', lineno: 1237, function: populate_packages
     1233:
     1234:            mkdir_recurse(dvar, root, os.path.dirname(file))
     1235:            fpath = os.path.join(root,file)
     1236:            if not cpath.islink(file):
 *** 1237:                os.link(file, fpath)
     1238:                continue
     1239:            ret = bb.utils.copyfile(file, fpath)
     1240:            if ret is False or ret == 0:
     1241:                bb.fatal("File population failed")
Exception: FileExistsError: [Errno 17] File exists: './usr/share/java/bsf-2.4.0.jar' -> '/workdir/build/tmp/work/all-poky-linux/bsf/2.4.0-r1/packages-split/libbsf-java/./usr/share/java/bsf-2.4.0.jar'

ERROR: mc:qt5507:bsf-2.4.0-r1 do_package: [Errno 17] File exists: './usr/share/java/bsf-2.4.0.jar' -> '/workdir/build/tmp/work/all-poky-linux/bsf/2.4.0-r1/packages-split/libbsf-java/./usr/share/java/bsf-2.4.0.jar'
ERROR: mc:qt5507:bsf-2.4.0-r1 do_package: Function failed: populate_packages
ERROR: Logfile of failure stored in: /workdir/build/tmp/work/all-poky-linux/bsf/2.4.0-r1/temp/log.do_package.12673
NOTE: recipe bsf-2.4.0-r1: task do_package: Failed
ERROR: Task (multiconfig:qt5507:/workdir/repo/poky/../meta-java/recipes-core/jakarta-libs/bsf_2.4.0.bb:do_package) failed with exit code '1'

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 recipes-core/jakarta-libs/bsf_2.4.0.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes-core/jakarta-libs/bsf_2.4.0.bb b/recipes-core/jakarta-libs/bsf_2.4.0.bb
index 1037396..e1cb34f 100644
--- a/recipes-core/jakarta-libs/bsf_2.4.0.bb
+++ b/recipes-core/jakarta-libs/bsf_2.4.0.bb
@@ -1,11 +1,13 @@
 SUMMARY = "Bean Scripting Framework package"
 AUTHOR = "Apache Software Foundation"
 LICENSE = "Apache-2.0"
-PR = "r1"
+PE = "1"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b1e01b26bacfc2232046c90a330332b3"
 
 SRC_URI = "http://archive.apache.org/dist/jakarta/bsf/source/bsf-src-${PV}.tar.gz"
 
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
 inherit java-library
 
 DEPENDS = "jacl commons-logging rhino xalan-j bcel"
-- 
2.20.1

[meta-java][PATCH 20/23] poi: Do not build as all PACKAGE_ARCH

[Ricardo Ribalda Delgado]

poi DEPENDS on non -native packages, which breaks multiconfig.

Fixes:

ERROR: mc:inteli7:poi-3.0-r0 do_packagedata: Command 'cd /workdir/build/tmp/work/all-poky-linux/poi/3.0-r0/pkgdata; find . -type d -print | tar --xattrs --xattrs-include='*' -cf - -S -C /workdir/build/tmp/work/all-poky-linux/poi/3.0-r0/pkgdata -p --no-recursion --files-from - | tar --xattrs --xattrs-include='*' -xhf - -C /workdir/build/tmp/pkgdata/inteli7' returned non-zero exit status 2
ERROR: mc:inteli7:poi-3.0-r0 do_packagedata: Function failed: sstate_task_postfunc
ERROR: Logfile of failure stored in: /workdir/build/tmp/work/all-poky-linux/poi/3.0-r0/temp/log.do_packagedata.27730
NOTE: recipe poi-3.0-r0: task do_packagedata: Failed
ERROR: Task (multiconfig:inteli7:/workdir/repo/poky/../meta-java/recipes-core/jakarta-libs/poi_3.0.bb:do_packagedata) failed with exit code '1'

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 recipes-core/jakarta-libs/poi_3.0.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-core/jakarta-libs/poi_3.0.bb b/recipes-core/jakarta-libs/poi_3.0.bb
index f9178f2..e33f2f2 100644
--- a/recipes-core/jakarta-libs/poi_3.0.bb
+++ b/recipes-core/jakarta-libs/poi_3.0.bb
@@ -7,6 +7,8 @@ SRC_URI = "http://archive.apache.org/dist/jakarta/poi/release/src/${BPN}-src-${P
 
 S = "${WORKDIR}/${BPN}-3.0-rc4"
 
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
 inherit java-library
 
 DEPENDS = "fastjar-native commons-collections3 commons-logging commons-lang commons-beanutils log4j1.2 xalan-j"
-- 
2.20.1

[meta-java][PATCH 21/23] xom: Allow re-running do_compile

[Ricardo Ribalda Delgado]

do_compile modified the source directory destructively (mv and rm),
avoiding its re-run.

Fixes:
ERROR: xom-1.2.10-r0 do_compile: Function failed: do_compile (log file is located at /workdir/build/tmp/work/dbfp4-poky-linux/xom/1.2.10-r0/temp/log.do_compile.1523)
ERROR: Logfile of failure stored in: /workdir/build/tmp/work/dbfp4-poky-linux/xom/1.2.10-r0/temp/log.do_compile.1523
Log data follows:
| DEBUG: Executing shell function do_compile
| mv: cannot stat '/workdir/build/tmp/work/dbfp4-poky-linux/xom/1.2.10-r0/git/jaxen': No such file or directory
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_compile (log file is located at /workdir/build/tmp/work/dbfp4-poky-linux/xom/1.2.10-r0/temp/log.do_compile.1523)
NOTE: recipe xom-1.2.10-r0: task do_compile: Failed
ERROR: Task (/workdir/repo/poky/../meta-java/recipes-core/xml-commons/xom_1.2.10.bb:do_compile) failed with exit code '1'
ERROR: mc:inteli7:xom-1.2.10-r0 do_compile: Function failed: do_compile (log file is located at /workdir/build/tmp/work/corei7-64-poky-linux/xom/1.2.10-r0/temp/log.do_compile.1522)

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 recipes-core/xml-commons/xom_1.2.10.bb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/recipes-core/xml-commons/xom_1.2.10.bb b/recipes-core/xml-commons/xom_1.2.10.bb
index 8755ddc..621a5e1 100644
--- a/recipes-core/xml-commons/xom_1.2.10.bb
+++ b/recipes-core/xml-commons/xom_1.2.10.bb
@@ -34,8 +34,11 @@ do_compile() {
     oe_makeclasspath cp -s xercesImpl xalan2
     cp=build:$cp
 
-    mv ${WORKDIR}/git/jaxen ${WORKDIR}/jaxen-${PV_jaxen}
-    rm -rf ${WORKDIR}/git
+    if [ -d ${WORKDIR}/git ] ; then
+        mv ${WORKDIR}/git/jaxen ${WORKDIR}/jaxen-${PV_jaxen}
+        rm -rf ${WORKDIR}/git
+    fi
+
     scp="${WORKDIR}/jaxen-${PV_jaxen}/src/java/main"
 
     javac -sourcepath src:$scp -cp $cp -d build `find src -name "*.java" -and -not \( -wholename "*tests*" -or -wholename "*samples*" -or -wholename "*tools*" \)`
-- 
2.20.1

[meta-java][PATCH 22/23] jdom: Do not use all as PACKAGE_ARCH

[Ricardo Ribalda Delgado]

It DEPENDS on packages that are not -native.

Fixes:

ERROR: mc:qt5506:jdom-1.1.3-r0 do_package: Package already staged (/workdir/build/tmp/sstate-control/manifest-allarch-jdom.package)?!
ERROR: mc:qt5506:jdom-1.1.3-r0 do_package:
ERROR: mc:qt5506:jdom-1.1.3-r0 do_package: Function failed: sstate_task_postfunc
ERROR: Logfile of failure stored in: /workdir/build/tmp/work/all-poky-linux/jdom/1.1.3-r0/temp/log.do_package.5632

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 recipes-core/xml-commons/jdom_1.1.3.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-core/xml-commons/jdom_1.1.3.bb b/recipes-core/xml-commons/jdom_1.1.3.bb
index 8073819..df9125d 100644
--- a/recipes-core/xml-commons/jdom_1.1.3.bb
+++ b/recipes-core/xml-commons/jdom_1.1.3.bb
@@ -12,6 +12,8 @@ SRC_URI = "http://www.jdom.org/dist/source/archive/jdom-${PV}.tar.gz"
 SRC_URI[md5sum] = "dc8391e84cfdb170fcd8279aa370019f"
 SRC_URI[sha256sum] = "d471718c4ac7a1a2f10715b93cb3fcd2ecbab60384b73ad1c089712e47bd8d1f"
 
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
 inherit java-library
 
 S = "${WORKDIR}/${PN}"
-- 
2.20.1

[meta-java][PATCH 23/23] dom4j: Do not use all as PACKAGE_ARCH

[Ricardo Ribalda Delgado]

It has DEPENDS that are not -native

Fixes:

ERROR: mc:qt5506:dom4j-1.6.1-r0 do_packagedata: Error executing a python function in exec_python_func() autogenerated:

The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function: <module>
     0001:
 *** 0002:sstate_task_postfunc(d)
     0003:
File: '/workdir/repo/poky/meta/classes/sstate.bbclass', lineno: 739, function: sstate_task_postfunc
     0735:
     0736:    sstateinst = d.getVar("SSTATE_INSTDIR")
     0737:    d.setVar('SSTATE_FIXMEDIR', shared_state['fixmedir'])
     0738:
 *** 0739:    sstate_installpkgdir(shared_state, d)
     0740:
     0741:    bb.utils.remove(d.getVar("SSTATE_BUILDDIR"), recurse=True)
     0742:}
     0743:sstate_task_postfunc[dirs] = "${WORKDIR}"
File: '/workdir/repo/poky/meta/classes/sstate.bbclass', lineno: 379, function: sstate_installpkgdir
     0375:        oe.path.remove(dir)
     0376:
     0377:    for state in ss['dirs']:
     0378:        prepdir(state[1])
 *** 0379:        os.rename(sstateinst + state[0], state[1])
     0380:    sstate_install(ss, d)
     0381:
     0382:    for plain in ss['plaindirs']:
     0383:        workdir = d.getVar('WORKDIR')
Exception: FileNotFoundError: [Errno 2] No such file or directory: '/workdir/build/tmp/work/all-poky-linux/dom4j/1.6.1-r0/sstate-build-packagedata/pkgdata' ->

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 recipes-core/xml-commons/dom4j_1.6.1.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-core/xml-commons/dom4j_1.6.1.bb b/recipes-core/xml-commons/dom4j_1.6.1.bb
index 97c9947..ee46dfd 100644
--- a/recipes-core/xml-commons/dom4j_1.6.1.bb
+++ b/recipes-core/xml-commons/dom4j_1.6.1.bb
@@ -18,6 +18,7 @@ SRC_URI[archive.sha256sum] = "01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e192
 SRC_URI[jaxme.md5sum] = "084ebfe4a816058f8ff6bd731fa70df4"
 SRC_URI[jaxme.sha256sum] = "0415d721259acf95c564fb84606bb17f6227c1cc444e89b78d1cd9903c1c88dc"
 
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
 inherit java-library
 
 do_compile() {
-- 
2.20.1

Re: [meta-java][PATCH 01/23] icedtea7: Add x11 as default pkgconfig

[Ricardo Ribalda Delgado]

Hi

On Tue, Jun 25, 2019 at 11:04 AM Jacob Kroon <jacob.kroon@mikrodidakt.se> wrote:
>
> Hi Ricardo,
>
> FYI, I notice that we have gone off-list.

Sorry, not on purpose :S

Will try also with that

thanks

>
> You probably need to add more dependencies as you iterate the builds.
>
> It looks like "libx11-native" is missing now.
>
> /Jacob
>
> On 6/25/19 10:57 AM, Ricardo Ribalda Delgado wrote:
> > Hi Jacob
> >
> > Unfortunately it crashes at do_compile: :(
> >
> > build-boot/tmp/sun/sun.awt/awt/obj64/Disposer.o
> > ../../../src/share/native/sun/awt/../java2d/Disposer.c
> > | In file included from
> > ../../../src/share/native/sun/awt/../java2d/pipe/Region.h:34:0,
> > |                  from
> > ../../../src/share/native/sun/awt/../java2d/pipe/Region.c:30:
> > | ../../../src/solaris/native/sun/awt/utility/rect.h:31:22: fatal
> > error: X11/Xlib.h: No such file or directory
> > |  #include <X11/Xlib.h>
> > |                       ^
> > | compilation terminated.
> > | make[6]: *** [/workdir/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk-boot/jdk/make/common/internal/NativeCompileRules.gmk:75:
> > /workdir/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk.build-boot/tmp/sun/sun.awt/awt/obj64/Region.o]
> > Error 1
> > | make[6]: *** Waiting for unfinished jobs....
> >
> > So the initial proposal stays. Unless you want to fix it :P
> >
> > Cheers!
> >
> > On Tue, Jun 25, 2019 at 10:44 AM Ricardo Ribalda Delgado
> > <ricardo@ribalda.com> wrote:
> >>
> >> Hi Jacob
> >>
> >>
> >> On Tue, Jun 25, 2019 at 10:35 AM Jacob Kroon <jacob.kroon@mikrodidakt.se> wrote:
> >>>
> >>> Hi Ricardo,
> >>>
> >>> On 6/25/19 9:52 AM, Ricardo Ribalda Delgado wrote:
> >>>> Seems to be a basic dependency, not optional.
> >>>>
> >>>> Fixes:
> >>>> | checking X11/X.h usability... no
> >>>> | checking X11/X.h presence... no
> >>>> | checking for X11/X.h... no
> >>>> | configure: error: "xorg headers were not found -
> >>>> | try installing xorg-x11-proto-devel."
> >>>> | NOTE: The following config.log files may provide further information.
> >>>> | NOTE: /workdir/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/config.log
> >>>> | ERROR: configure failed
> >>>> | WARNING: exit code 1 from a shell command.
> >>>> | ERROR: Function failed: do_configure (log file is located at /workdir/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/temp/log.do_configure.29594)
> >>>> ERROR: Task (/workdir/repo/poky/../meta-java/recipes-core/icedtea/icedtea7-native_2.1.3.bb:do_configure) failed with exit code '1'
> >>>>
> >>>> Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
> >>>> ---
> >>>>    recipes-core/icedtea/icedtea7-native.inc | 2 +-
> >>>>    1 file changed, 1 insertion(+), 1 deletion(-)
> >>>>
> >>>> diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc
> >>>> index 69f5d25..747bb72 100644
> >>>> --- a/recipes-core/icedtea/icedtea7-native.inc
> >>>> +++ b/recipes-core/icedtea/icedtea7-native.inc
> >>>> @@ -11,7 +11,7 @@ DEPENDS = "virtual/javac-native virtual/java-native classpath-native \
> >>>>       unzip-native make-native util-linux-native\
> >>>>              "
> >>>>
> >>>> -PACKAGECONFIG ??= ""
> >>>> +PACKAGECONFIG ??= "x11"
> >>>>    PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xorgproto-native libxt-native libxext-native libxrender-native"
> >>>>
> >>>>    OEMAKE_BUILD_HEADLESS_ONLY = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}"
> >>>>
> >>>
> >>> I have run into this as well; instead of turning on x11 by default,
> >>> wouldn't it be better to add "xorgproto-native" to DEPENDS ? I doubt the
> >>> native build needs x11 support in most cases.
> >>
> >> That is definitely better. I have fixed the patch on
> >> https://github.com/ribalda/meta-java/commit/1f48e7d72ac9eeb45b5d9c872e95e3b32fd74f8d
> >>
> >> I will resend the set when I get more comments
> >>
> >> Thanks!
> >>
> >>>
> >>> /Jacob
> >>>
> >>>
> >>> [mikrodidakt]
> >>> Jacob Kroon • +46 46325040
> >>>
> >>> mikrodidakt.se • Skiffervägen 48, SE-224 78 LUND, Sweden
> >>>
> >>> Consultans since 1980 • SW, HW, Embedded Systems, Linux
> >>>
> >>>
> >>
> >>
> >> --
> >> Ricardo Ribalda
> >
> >
> >
>
>
> [mikrodidakt]
> Jacob Kroon • +46 46325040
>
> mikrodidakt.se • Skiffervägen 48, SE-224 78 LUND, Sweden
>
> Consultans since 1980 • SW, HW, Embedded Systems, Linux
>
>


-- 
Ricardo Ribalda

Re: [meta-java][PATCH 02/23] openjd7: remove support for kerberos

[Richard Leitner]

Hi Ricardo,
thanks for the patches!

On 25/06/2019 09:52, Ricardo Ribalda Delgado wrote:
> It triggers a lot of dependencies, and it is no clear that
> is needed.

To be honest I don't know if it's needed or used by anybody, but would 
it be possible to create a PACKAGECONFIG for de-/selecting the 
system-kerberos?

Furthermore if you send a v2 can you please fix the subject (openjd7 -> 
openjdk7)?

Same goes for openjdk-8.

Thanks & regards;Richard.L

> 
> Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
> ---
>   recipes-core/openjdk/openjdk-7-common.inc | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
> index 794bf58..26e71ce 100644
> --- a/recipes-core/openjdk/openjdk-7-common.inc
> +++ b/recipes-core/openjdk/openjdk-7-common.inc
> @@ -67,7 +67,7 @@ DEPENDS = " \
>       jpeg libpng giflib \
>       gtk+ glib-2.0 \
>       cups fontconfig \
> -    rhino krb5 \
> +    rhino \
>       libxt libxinerama libxrender libxtst libxi \
>       freetype alsa-lib libffi \
>       attr \
> @@ -134,6 +134,7 @@ EXTRA_OECONF = " \
>   EXTRA_OECONF += " \
>       --disable-system-pcsc \
>       --disable-system-sctp \
> +    --disable-system-kerberos \
>   "
>   
>   do_configure_prepend() {
> 

Re: [meta-java][PATCH 02/23] openjd7: remove support for kerberos

[Ricardo Ribalda Delgado]

Hi Richard

On Tue, Jun 25, 2019 at 11:41 AM Richard Leitner
<richard.leitner@skidata.com> wrote:
>
> Hi Ricardo,
> thanks for the patches!
>
> On 25/06/2019 09:52, Ricardo Ribalda Delgado wrote:
> > It triggers a lot of dependencies, and it is no clear that
> > is needed.
>
> To be honest I don't know if it's needed or used by anybody, but would
> it be possible to create a PACKAGECONFIG for de-/selecting the
> system-kerberos?

Sure,

I am working at:
https://github.com/ribalda/meta-java/tree/v2

Do you prefer that I resend the patches after all the feedback is
fixed or you rather pull directly from there?

So far I have fix

- x11 native
-packageconfig for kerberos openjdk8 and openjdk7


>
> Furthermore if you send a v2 can you please fix the subject (openjd7 ->
> openjdk7)?
>
> Same goes for openjdk-8.
>
> Thanks & regards;Richard.L
>
> >
> > Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
> > ---
> >   recipes-core/openjdk/openjdk-7-common.inc | 3 ++-
> >   1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
> > index 794bf58..26e71ce 100644
> > --- a/recipes-core/openjdk/openjdk-7-common.inc
> > +++ b/recipes-core/openjdk/openjdk-7-common.inc
> > @@ -67,7 +67,7 @@ DEPENDS = " \
> >       jpeg libpng giflib \
> >       gtk+ glib-2.0 \
> >       cups fontconfig \
> > -    rhino krb5 \
> > +    rhino \
> >       libxt libxinerama libxrender libxtst libxi \
> >       freetype alsa-lib libffi \
> >       attr \
> > @@ -134,6 +134,7 @@ EXTRA_OECONF = " \
> >   EXTRA_OECONF += " \
> >       --disable-system-pcsc \
> >       --disable-system-sctp \
> > +    --disable-system-kerberos \
> >   "
> >
> >   do_configure_prepend() {
> >
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel



-- 
Ricardo Ribalda

Re: [meta-java][PATCH 02/23] openjd7: remove support for kerberos

[Richard Leitner]

On 25/06/2019 12:03, Ricardo Ribalda Delgado wrote:
> Hi Richard
> 
> On Tue, Jun 25, 2019 at 11:41 AM Richard Leitner
> <richard.leitner@skidata.com> wrote:
>>
>> Hi Ricardo,
>> thanks for the patches!
>>
>> On 25/06/2019 09:52, Ricardo Ribalda Delgado wrote:
>>> It triggers a lot of dependencies, and it is no clear that
>>> is needed.
>>
>> To be honest I don't know if it's needed or used by anybody, but would
>> it be possible to create a PACKAGECONFIG for de-/selecting the
>> system-kerberos?
> 
> Sure,
> 
> I am working at:
> https://github.com/ribalda/meta-java/tree/v2
> 
> Do you prefer that I resend the patches after all the feedback is
> fixed or you rather pull directly from there?

For me pulling would be fine, but I think sending to the list would be 
preferred as anybody can leave comments then.

I'll review and test the other patches today or tomorrow and give you 
feedback for the v2!

Thanks again & regards;Richard.L

> 
> So far I have fix
> 
> - x11 native
> -packageconfig for kerberos openjdk8 and openjdk7
> 
> 
>>
>> Furthermore if you send a v2 can you please fix the subject (openjd7 ->
>> openjdk7)?
>>
>> Same goes for openjdk-8.
>>