Skip to contentSkip to conversation

Allow build for multiple ARCH in the same builddir

PATCH In review Max Krummenacher 2 participants 8 messages Feb 17, 2015

lore
Share & tools
lore
#0 lore raw

v2 cover Allow build for multiple ARCH in the same builddir

v2: Patch 6/6: mark broken recipes with PNBLACKLIST[recipe] rather than
documenting them in a README.nonworking

Building a recipe which provides packages for allarch and ${TUNE_PKGARCH} fails if one builds in the same build directory for different TUNE_PKGARCHs.

An example is rhino which fails as follows when one builds first for armv7at2hf-vfp and then for armv7at2hf-vfp-neon.
ERROR: The recipe rhino is trying to install files into a shared area when those files already exist. Those files and their manifest location are:
/.../ipk/all/librhino-java_1.7r4-r0_all.ipk
Matched in manifest-armv7at2hf-vfp-rhino-package_write_ipk

The change in package arch is done in java-library.bbclass. Most of the users of java-library.bbclass don't install any files in the ${TUNE_PKGARCH} packages or install shell scripts which may also be deployed in an allarch package.

Most of the recipes including java-library.bbclass no longer build with newer layer revisions.
This patchset first update the recipes to build again, changes java-library build all packages in allarch by default and recipes which must have some of their packages in ${TUNE_PKGARCH} to have all of their recipes in ${TUNE_PKGARCH}.
Finaly some of the recipes I tried did not build before and after the proposed changes. Adding a PNBLACKLIST statement to mark them as I don't have the time to work on these and I guess no one has been interested in years.

Regards
Max

Max Krummenacher (6):
cleanup whitespace in tasks
licence: add missing LIC_FILES_CHKSUM
rxtx: use autotools-brokensep
java-library: inherit allarch
antlr: fix override for native build
mark broken recipes with PNBLACKLIST

 classes/java-library.bbclass                       |  8 ++-
 recipes-core/antlr/antlr_2.7.7.bb                  | 18 +++---
 recipes-core/jakarta-commons/commons-cli_1.1.bb    |  1 +
 recipes-core/jakarta-commons/commons-codec_1.3.bb  |  1 +
 .../jakarta-commons/commons-configuration_1.5.bb   |  2 +
 .../jakarta-commons/commons-discovery_0.4.bb       |  1 +
 recipes-core/jakarta-commons/commons-el_1.0.bb     |  3 +-
 .../jakarta-commons/commons-fileupload_1.2.1.bb    |  1 +
 .../jakarta-commons/commons-httpclient_3.1.bb      |  1 +
 recipes-core/jakarta-commons/commons-io_1.4.bb     |  1 +
 recipes-core/jakarta-commons/commons-jxpath_1.3.bb |  2 +
 recipes-core/jakarta-commons/commons-lang_2.4.bb   |  1 +
 .../jakarta-commons/commons-logging_1.1.1.bb       |  1 -
 recipes-core/jakarta-commons/commons-pool_1.4.bb   |  1 +
 recipes-core/jakarta-commons/jakarta-commons.inc   | 68 +++++++++++-----------
 recipes-core/jakarta-libs/poi_3.0.bb               |  3 +-
 recipes-core/junit/junit4_4.3.1.bb                 |  3 +-
 recipes-core/libmatthew/libmatthew.inc             |  1 +
 recipes-core/servlet-api/jsp2.0_5.5.26.bb          |  3 +-
 recipes-core/servlet-api/servlet2.4_5.5.26.bb      |  3 +-
 recipes-core/xml-commons/dom4j_1.6.1.bb            |  2 +
 recipes-core/xml-commons/jaxen_1.1.1.bb            |  2 +
 recipes-core/xml-commons/jaxme_0.5.2.bb            | 57 +++++++++++-------
 recipes-core/xml-commons/jdom_1.1.bb               |  2 +
 recipes-core/xml-commons/xom_1.1.bb                | 40 ++++++++-----
 recipes-core/xml-commons/xpp2_2.1.10.bb            | 24 ++++----
 recipes-core/xml-commons/xpp3_1.1.3.4.O.bb         | 39 +++++++------
 recipes-extended/hsqldb/hsqldb_1.8.0.10.bb         | 29 ++++-----
 recipes-extended/rxtx/rxtx_2.2.0.bb                |  3 +-
 29 files changed, 188 insertions(+), 133 deletions(-)
Signature · 1 line
1.9.3
#1 lore raw

PATCH v2 1/6 cleanup whitespace in tasks

Indent with 4 spaces in task definitions.

---
 recipes-core/jakarta-commons/jakarta-commons.inc | 66 ++++++++++++------------
 recipes-core/xml-commons/jaxme_0.5.2.bb          | 39 +++++++-------
 recipes-core/xml-commons/xom_1.1.bb              | 26 +++++-----
 recipes-core/xml-commons/xpp2_2.1.10.bb          | 22 ++++----
 recipes-core/xml-commons/xpp3_1.1.3.4.O.bb       | 38 +++++++-------
 recipes-extended/hsqldb/hsqldb_1.8.0.10.bb       | 26 +++++-----
 6 files changed, 108 insertions(+), 109 deletions(-)
recipes-core/jakarta-commons/jakarta-commons.inc +33 -33
index 4f7b700..bd85610 100644
@@ -21,42 +21,42 @@ CLEAN_PATH = ""
 
 # Some projects have a replaceable version number in their manifest template.
 do_unpackpost() {
-  if [ -d src/conf ]
-  then
-    find src/conf -exec \
-      sed -i -e "s|@version@|${PV}|" {} \;
-  fi
+    if [ -d src/conf ]
+    then
+        find src/conf -exec \
+        sed -i -e "s|@version@|${PV}|" {} \;
+    fi
 }
 
 addtask unpackpost after do_unpack before do_patch
 # Compile step is very similar for Jakarta commons packages
 do_compile() {
-  mkdir -p build
-
-  if [ "${CP}" ]
-  then
-     oe_makeclasspath cp -s ${CP}
-  else
-     cp=.
-  fi
-
-  echo "javac -sourcepath ${COMPILE_SOURCEPATH} -cp $cp -d build \`find ${MAINSOURCES} ${COMPILE_FINDARGS}\`"
-  javac -sourcepath ${COMPILE_SOURCEPATH} -cp $cp -d build `find ${MAINSOURCES} ${COMPILE_FINDARGS}`
-
-  # Copy extraneous files
-  echo "(cd ${MAINSOURCES} && find . ${FINDARGS} -exec cp {} ../../build/{} \;)"
-  (cd ${MAINSOURCES} && find . ${FINDARGS} -exec cp {} ../../build/{} \;)
-
-	# Optionally remove stuff after compilation (needed for sourcepath hacks).
-	if [ ${CLEAN_PATH} ]; then
-		rm -rf ${CLEAN_PATH}
-	fi
-
-  # Some projects have manifest, some have not. This works for both.
-  if [ -f src/conf/MANIFEST.MF ]
-  then
-    fastjar cfm ${JARFILENAME} src/conf/MANIFEST.MF -C build .
-  else
-    fastjar cf ${JARFILENAME} -C build .
-  fi
+    mkdir -p build
+
+    if [ "${CP}" ]
+    then
+       oe_makeclasspath cp -s ${CP}
+    else
+       cp=.
+    fi
+
+    echo "javac -sourcepath ${COMPILE_SOURCEPATH} -cp $cp -d build \`find ${MAINSOURCES} ${COMPILE_FINDARGS}\`"
+    javac -sourcepath ${COMPILE_SOURCEPATH} -cp $cp -d build `find ${MAINSOURCES} ${COMPILE_FINDARGS}`
+
+    # Copy extraneous files
+    echo "(cd ${MAINSOURCES} && find . ${FINDARGS} -exec cp {} ../../build/{} \;)"
+    (cd ${MAINSOURCES} && find . ${FINDARGS} -exec cp {} ../../build/{} \;)
+
+    # Optionally remove stuff after compilation (needed for sourcepath hacks).
+    if [ ${CLEAN_PATH} ]; then
+        rm -rf ${CLEAN_PATH}
+    fi
+
+    # Some projects have manifest, some have not. This works for both.
+    if [ -f src/conf/MANIFEST.MF ]
+    then
+        fastjar cfm ${JARFILENAME} src/conf/MANIFEST.MF -C build .
+    else
+        fastjar cf ${JARFILENAME} -C build .
+    fi
 }
recipes-core/xml-commons/jaxme_0.5.2.bb +19 -20
index 304c06d..65b406e 100644
@@ -16,27 +16,26 @@ inherit java-library
 DEPENDS = "fastjar-native log4j1.2 xerces-j xalan-j commons-codec hsqldb antlr antlr-native"
 
 do_compile() {
-	oe_makeclasspath cp -s log4j-1.2 xercesImpl xalan2 commons-codec hsqldb antlr
-  cp=build-api:build-jaxme:build-js:build-xs:build-pm:$cp
+    oe_makeclasspath cp -s log4j-1.2 xercesImpl xalan2 commons-codec hsqldb antlr
+    cp=build-api:build-jaxme:build-js:build-xs:build-pm:$cp
 
+    jaxme_build src/api build-api $cp jaxmeapi-${PV}.jar
 
-	jaxme_build src/api build-api $cp jaxmeapi-${PV}.jar
+    runantlr -o src/js/org/apache/ws/jaxme/js/jparser src/js/org/apache/ws/jaxme/js/jparser/java15.g
+    jaxme_build src/js build-js $cp jaxmejs-${PV}.jar
 
-	runantlr -o src/js/org/apache/ws/jaxme/js/jparser src/js/org/apache/ws/jaxme/js/jparser/java15.g
-	jaxme_build src/js build-js $cp jaxmejs-${PV}.jar
+    jaxme_build src/xs build-xs $cp jaxmexs-${PV}.jar
 
-	jaxme_build src/xs build-xs $cp jaxmexs-${PV}.jar
+    jaxme_build src/jaxme build-jaxme $cp ${JARFILENAME}
 
-	jaxme_build src/jaxme build-jaxme $cp ${JARFILENAME}
-
-#	jaxme_build src/pm build-pm $cp jaxmepm-${PV}.jar
+#    jaxme_build src/pm build-pm $cp jaxmepm-${PV}.jar
 }
 
 do_install_append() {
-	oe_jarinstall jaxmeapi-${PV}.jar jaxmeapi.jar
-	oe_jarinstall jaxmejs-${PV}.jar jaxmejs.jar
-	oe_jarinstall jaxmexs-${PV}.jar jaxmexs.jar
-	oe_jarinstall jaxmepm-${PV}.jar jaxmepm.jar
+    oe_jarinstall jaxmeapi-${PV}.jar jaxmeapi.jar
+    oe_jarinstall jaxmejs-${PV}.jar jaxmejs.jar
+    oe_jarinstall jaxmexs-${PV}.jar jaxmexs.jar
+    oe_jarinstall jaxmepm-${PV}.jar jaxmepm.jar
 }
 
 # Compile helper
@@ -45,17 +44,17 @@ do_install_append() {
 # 3 - classpath
 # 4 - jar file name
 jaxme_build() {
-  mkdir -p $2
+    mkdir -p $2
 
-	ant_sourcepath=${WORKDIR}/apache-ant-1.7.1/src/main
+    ant_sourcepath=${WORKDIR}/apache-ant-1.7.1/src/main
 
-  echo "javac -sourcepath $ant_sourcepath:$1 -cp $3 -d $2 \`find $1 -name "*.java"\`"
-  javac -sourcepath $ant_sourcepath:$1 -cp $3 -d $2 `find $1 -name "*.java" -and -not \( -wholename "*junit*" -or -wholename "*examples*" \) `
-  (cd $1 && find . -name "*.properties" -exec cp {} ${S}/$2/{} \;)
+    echo "javac -sourcepath $ant_sourcepath:$1 -cp $3 -d $2 \`find $1 -name "*.java"\`"
+    javac -sourcepath $ant_sourcepath:$1 -cp $3 -d $2 `find $1 -name "*.java" -and -not \( -wholename "*junit*" -or -wholename "*examples*" \) `
+    (cd $1 && find . -name "*.properties" -exec cp {} ${S}/$2/{} \;)
 
-	rm -rf $2/org/apache/tools
+    rm -rf $2/org/apache/tools
 
-  fastjar -C $2 -c -f $4 .
+    fastjar -C $2 -c -f $4 .
 }
 
 SRC_URI[archive.md5sum] = "084ebfe4a816058f8ff6bd731fa70df4"
recipes-core/xml-commons/xom_1.1.bb +13 -13
index 697e01d..56701b2 100644
@@ -16,24 +16,24 @@ inherit java-library
 DEPENDS = "fastjar-native xerces-j xalan-j"
 
 do_compile() {
-  mkdir -p build
+    mkdir -p build
 
-	oe_makeclasspath cp -s xercesImpl xalan2
-  cp=build:$cp
+    oe_makeclasspath cp -s xercesImpl xalan2
+    cp=build:$cp
 
-	scp="${WORKDIR}/jaxen-1.1.1/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*" \)`
-  javac -sourcepath fatsrc:$scp -cp $cp -d build `find fatsrc -name "*.java" -and -not \( -wholename "*tests*" -or -wholename "*samples*" -or -wholename "*tools*" \)`
-  javac -sourcepath src15:$scp -cp $cp -d build `find src15 -name "*.java" -and -not \( -wholename "*tests*" -or -wholename "*samples*" -or -wholename "*tools*" \)`
+    scp="${WORKDIR}/jaxen-1.1.1/src/java/main"
 
-  (cd src && find . -name "*.properties" -exec cp {} ../build/{} \;)
+    javac -sourcepath src:$scp -cp $cp -d build `find src -name "*.java" -and -not \( -wholename "*tests*" -or -wholename "*samples*" -or -wholename "*tools*" \)`
+    javac -sourcepath fatsrc:$scp -cp $cp -d build `find fatsrc -name "*.java" -and -not \( -wholename "*tests*" -or -wholename "*samples*" -or -wholename "*tools*" \)`
+    javac -sourcepath src15:$scp -cp $cp -d build `find src15 -name "*.java" -and -not \( -wholename "*tests*" -or -wholename "*samples*" -or -wholename "*tools*" \)`
 
-	#	Remove Jaxen classes from build
-	rm -rf build/org/jaxen
-	rm -rf build/org/w3c
+    (cd src && find . -name "*.properties" -exec cp {} ../build/{} \;)
 
-  fastjar -C build -c -f ${JARFILENAME} .
+    # Remove Jaxen classes from build
+    rm -rf build/org/jaxen
+    rm -rf build/org/w3c
+
+    fastjar -C build -c -f ${JARFILENAME} .
 }
 
 SRC_URI[archive.md5sum] = "e5ae82568d7b1faeb950140c34fbbcb1"
recipes-core/xml-commons/xpp2_2.1.10.bb +11 -11
index 2239173..54d69f4 100644
@@ -12,22 +12,22 @@ inherit java-library
 DEPENDS = "fastjar-native virtual/javac-native"
 
 do_compile() {
-	if [ -d build-oe ]; then
-		rm -rf build-oe
-	fi
-  mkdir -p build-oe
+    if [ -d build-oe ]; then
+        rm -rf build-oe
+    fi
+    mkdir -p build-oe
 
-	sourcepath="src/java/drivers/jaxp11:src/java/drivers/sax2:src/java/impl/factory:src/java/impl/format:src/java/impl/node:src/java/impl/pullparser:src/java/impl/tag:src/java/intf"
+    sourcepath="src/java/drivers/jaxp11:src/java/drivers/sax2:src/java/impl/factory:src/java/impl/format:src/java/impl/node:src/java/impl/pullparser:src/java/impl/tag:src/java/intf"
 
-	findpath="${sourcepath//:/ }"
+    findpath="${sourcepath//:/ }"
 
-  javac -sourcepath $sourcepath -d build-oe `find $findpath -name "*.java"`
+    javac -sourcepath $sourcepath -d build-oe `find $findpath -name "*.java"`
 
-	mkdir -p build-oe/META-INF/services
-	cp src/java/drivers/jaxp11/META-INF/services/javax.xml.parsers.SAXParserFactory build-oe/META-INF/services
-	cp src/java/impl/factory/META-INF/services/org.gjt.xpp.XmlPullParserFactory build-oe/META-INF/services
+    mkdir -p build-oe/META-INF/services
+    cp src/java/drivers/jaxp11/META-INF/services/javax.xml.parsers.SAXParserFactory build-oe/META-INF/services
+    cp src/java/impl/factory/META-INF/services/org.gjt.xpp.XmlPullParserFactory build-oe/META-INF/services
 
-  fastjar -C build-oe -c -f ${JARFILENAME} .
+    fastjar -C build-oe -c -f ${JARFILENAME} .
 }
 
 SRC_URI[md5sum] = "865ca4e2496c215d301b57450137626f"
recipes-core/xml-commons/xpp3_1.1.3.4.O.bb +19 -19
index 40f7cb2..b87cccd 100644
@@ -12,34 +12,34 @@ DEPENDS = "fastjar-native virtual/javac-native"
 PACKAGES = "libxpp3-xpath-java ${JPN}"
 
 do_compile() {
-	if [ -d build-oe ]; then
-		rm -rf build-oe
-	fi
-  mkdir -p build-oe
+    if [ -d build-oe ]; then
+        rm -rf build-oe
+    fi
+    mkdir -p build-oe
 
-	sourcepath="src/java/api:src/java/builder:src/java/dom2_builder:src/java/mxp1_min:src/java/mxp1_standard:src/java/parser_pool:src/java/sax2_driver:src/java/serializer_impl:src/java/util:src/java/wrapper"
-	findpath="${sourcepath//:/ }"
+    sourcepath="src/java/api:src/java/builder:src/java/dom2_builder:src/java/mxp1_min:src/java/mxp1_standard:src/java/parser_pool:src/java/sax2_driver:src/java/serializer_impl:src/java/util:src/java/wrapper"
+    findpath="${sourcepath//:/ }"
 
-  javac -sourcepath $sourcepath -d build-oe `find $findpath -name "*.java"`
+    javac -sourcepath $sourcepath -d build-oe `find $findpath -name "*.java"`
 
-	mkdir -p build-oe/META-INF/services
-	cp src/java/mxp1_standard/META-INF/services/org.xml* build-oe/META-INF/services
-  fastjar -C build-oe -c -f ${JARFILENAME} .
+    mkdir -p build-oe/META-INF/services
+    cp src/java/mxp1_standard/META-INF/services/org.xml* build-oe/META-INF/services
+    fastjar -C build-oe -c -f ${JARFILENAME} .
 
-	if [ -d build-xpath ]; then
-		rm -rf build-xpath
-	fi
-  mkdir -p build-xpath
+    if [ -d build-xpath ]; then
+        rm -rf build-xpath
+    fi
+    mkdir -p build-xpath
 
-	sourcepath="src/java/xpath"
-	findpath="${sourcepath//:/ }"
-  javac -sourcepath $sourcepath -cp build-oe -d build-xpath `find $findpath -name "*.java"`
+    sourcepath="src/java/xpath"
+    findpath="${sourcepath//:/ }"
+    javac -sourcepath $sourcepath -cp build-oe -d build-xpath `find $findpath -name "*.java"`
 
-  fastjar -C build-xpath -c -f xpp3-xpath-${PV}.jar .
+    fastjar -C build-xpath -c -f xpp3-xpath-${PV}.jar .
 }
 
 do_install_append() {
-	oe_jarinstall xpp3-xpath-${PV}.jar xpp3-xpath.jar
+    oe_jarinstall xpp3-xpath-${PV}.jar xpp3-xpath.jar
 }
 
 FILES_libxpp3-xpath-java = "${datadir}/java/xpp3-xpath*"
recipes-extended/hsqldb/hsqldb_1.8.0.10.bb +13 -13
index e886ae4..ff4908a 100644
@@ -14,25 +14,25 @@ inherit java-library
 DEPENDS = "fastjar-native servlet2.4"
 
 do_compile() {
-  # Build instructions according to build/buildJDK14.bat
-        mkdir -p classes
+    # Build instructions according to build/buildJDK14.bat
+    mkdir -p classes
 
-        oe_makeclasspath cp -s servlet-api-2.4
+    oe_makeclasspath cp -s servlet-api-2.4
 
-        javac -sourcepath src -cp $cp -d build `find src -name "*.java" -and -not -wholename "*test*"`
+    javac -sourcepath src -cp $cp -d build `find src -name "*.java" -and -not -wholename "*test*"`
 
-        mkdir -p classes/org/hsqldb/util
-        mkdir -p classes/org/hsqldb/util/sqltool
-        mkdir -p classes/org/hsqldb/resources
+    mkdir -p classes/org/hsqldb/util
+    mkdir -p classes/org/hsqldb/util/sqltool
+    mkdir -p classes/org/hsqldb/resources
 
-        cp src/org/hsqldb/util/*.gif classes/org/hsqldb/util/
-        cp src/org/hsqldb/util/*.png classes/org/hsqldb/util/
-        cp src/org/hsqldb/util/*.properties classes/org/hsqldb/util/
-        cp src/org/hsqldb/util/sqltool/*.text classes/org/hsqldb/util/sqltool/
+    cp src/org/hsqldb/util/*.gif classes/org/hsqldb/util/
+    cp src/org/hsqldb/util/*.png classes/org/hsqldb/util/
+    cp src/org/hsqldb/util/*.properties classes/org/hsqldb/util/
+    cp src/org/hsqldb/util/sqltool/*.text classes/org/hsqldb/util/sqltool/
 
-        cp src/org/hsqldb/resources/*.properties classes/org/hsqldb/resources
+    cp src/org/hsqldb/resources/*.properties classes/org/hsqldb/resources
 
-  fastjar -C classes -c -f ${JARFILENAME} .
+    fastjar -C classes -c -f ${JARFILENAME} .
 }
 
 SRC_URI[md5sum] = "17410483b5b5f267aa18b7e00b65e6e0"
Signature · 1 line
1.9.3
#2 lore raw

PATCH v2 2/6 licence: add missing LIC_FILES_CHKSUM

In reply to Max Krummenacher

While at it change the LICENSE string to the oe one if applicable. e.g. AL-2.0 -> Apache-2.0

---
 recipes-core/jakarta-commons/commons-cli_1.1.bb          | 1 +
 recipes-core/jakarta-commons/commons-codec_1.3.bb        | 1 +
 recipes-core/jakarta-commons/commons-discovery_0.4.bb    | 1 +
 recipes-core/jakarta-commons/commons-el_1.0.bb           | 3 ++-
 recipes-core/jakarta-commons/commons-fileupload_1.2.1.bb | 1 +
 recipes-core/jakarta-commons/commons-httpclient_3.1.bb   | 1 +
 recipes-core/jakarta-commons/commons-io_1.4.bb           | 1 +
 recipes-core/jakarta-commons/commons-lang_2.4.bb         | 1 +
 recipes-core/jakarta-commons/commons-logging_1.1.1.bb    | 1 -
 recipes-core/jakarta-commons/commons-pool_1.4.bb         | 1 +
 recipes-core/jakarta-commons/jakarta-commons.inc         | 2 ++
 recipes-core/jakarta-libs/poi_3.0.bb                     | 3 ++-
 recipes-core/junit/junit4_4.3.1.bb                       | 3 ++-
 recipes-core/servlet-api/jsp2.0_5.5.26.bb                | 3 ++-
 recipes-core/servlet-api/servlet2.4_5.5.26.bb            | 3 ++-
 recipes-core/xml-commons/jaxme_0.5.2.bb                  | 4 ++--
 recipes-core/xml-commons/xom_1.1.bb                      | 3 ++-
 recipes-core/xml-commons/xpp2_2.1.10.bb                  | 2 +-
 recipes-core/xml-commons/xpp3_1.1.3.4.O.bb               | 1 +
 recipes-extended/hsqldb/hsqldb_1.8.0.10.bb               | 3 ++-
 20 files changed, 28 insertions(+), 11 deletions(-)
recipes-core/jakarta-commons/commons-cli_1.1.bb +1 -0
index cb51765..52dc0ce 100644
@@ -1,4 +1,5 @@
 require jakarta-commons.inc
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a944942e1496af1886903d274dedb13"
 
 PR = "${INC_PR}.1"
 
recipes-core/jakarta-commons/commons-codec_1.3.bb +1 -0
index 3a7ddd4..0377168 100644
@@ -1,4 +1,5 @@
 require jakarta-commons.inc
+LIC_FILES_CHKSUM = "file://src/java/org/apache/commons/codec/BinaryDecoder.java;endline=15;md5=c08c3e117b4fc42b50c1f621fdcecc5f"
 
 PR = "${INC_PR}.1"
 
recipes-core/jakarta-commons/commons-discovery_0.4.bb +1 -0
index 75db064..08c2462 100644
@@ -1,4 +1,5 @@
 require jakarta-commons.inc
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 PR = "${INC_PR}.1"
 
recipes-core/jakarta-commons/commons-el_1.0.bb +2 -1
index 5821473..1446edd 100644
@@ -1,5 +1,6 @@
 require jakarta-commons.inc
-
+LICENSE = "Apache-1.1"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9147d939b3f3f97692e4441bf20bd1cd"
 PR = "${INC_PR}.1"
 
 DESCRIPTION = "Implementation of the JSP2.0 Expression Language API"
recipes-core/jakarta-commons/commons-fileupload_1.2.1.bb +1 -0
index 3954363..dab7996 100644
@@ -1,4 +1,5 @@
 require jakarta-commons.inc
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 PR = "${INC_PR}.1"
 
recipes-core/jakarta-commons/commons-httpclient_3.1.bb +1 -0
index 4f6b1af..dffa9a0 100644
@@ -1,4 +1,5 @@
 require jakarta-commons.inc
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=369b6d7c5a954dcc3f2e7ac3323507c3"
 
 PR = "${INC_PR}.1"
 
recipes-core/jakarta-commons/commons-io_1.4.bb +1 -0
index f4308d2..f1dbc88 100644
@@ -1,4 +1,5 @@
 require jakarta-commons.inc
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fd707e76aa29b6984fbe80629ec55f78"
 
 PR = "${INC_PR}.1"
 
recipes-core/jakarta-commons/commons-lang_2.4.bb +1 -0
index 60c6346..48cc291 100644
@@ -1,4 +1,5 @@
 require jakarta-commons.inc
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 PR = "${INC_PR}.1"
 
recipes-core/jakarta-commons/commons-logging_1.1.1.bb +0 -1
index b04c812..b3b508a 100644
@@ -3,7 +3,6 @@ require jakarta-commons.inc
 PR = "${INC_PR}.1"
 
 DESCRIPTION = "Java Internet protocol suite library"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d273d63619c9aeaf15cdaf76422c4f87"
 
 SRC_URI = "http://archive.apache.org/dist/commons/logging/source/${BP}-src.tar.gz"
 
recipes-core/jakarta-commons/commons-pool_1.4.bb +1 -0
index d5b6def..cacbde7 100644
@@ -1,4 +1,5 @@
 require jakarta-commons.inc
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 PR = "${INC_PR}.1"
 
recipes-core/jakarta-commons/jakarta-commons.inc +2 -0
index bd85610..5968164 100644
@@ -1,5 +1,7 @@
 AUTHOR = "Apache Software Foundation"
 LICENSE = "Apache-2.0"
+#add the common md5sum and overwrite in bb file if changed
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d273d63619c9aeaf15cdaf76422c4f87"
 
 INC_PR = "r0"
 
recipes-core/jakarta-libs/poi_3.0.bb +2 -1
index 6adcf2c..f9178f2 100644
@@ -1,5 +1,6 @@
 DESCRIPTION = "Java library for manipulating various file formats based upon Microsoft's OLE 2 Compound Document"
-LICENSE = "AL2.0"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 AUTHOR = "Apache Software Foundation"
 
 SRC_URI = "http://archive.apache.org/dist/jakarta/poi/release/src/${BPN}-src-${PV}-FINAL-20070503.tar.gz"
recipes-core/junit/junit4_4.3.1.bb +2 -1
index 6b4d158..1cb8674 100644
@@ -1,5 +1,6 @@
 DESCRIPTION = "JUnit is a testing framework for Java"
-LICENSE = "CPL"
+LICENSE = "CPL-1.0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/CPL-1.0;md5=5295cd12fc5acc87bf1cf754455a1c56"
 AUTHOR = "junit.org"
 HOMEPAGE = "http://www.junit.org"
 
recipes-core/servlet-api/jsp2.0_5.5.26.bb +2 -1
index ca94f08..e831501 100644
@@ -1,5 +1,6 @@
 DESCRIPTION = "Java Server Page (JSP) API 2.0 (from Tomcat 5.5)"
-LICENSE = "AL2.0"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 AUTHOR = "Apache Software Foundation"
 
 SRC_URI = "http://archive.apache.org/dist/tomcat/tomcat-5/v${PV}/src/apache-tomcat-${PV}-src.tar.gz"
recipes-core/servlet-api/servlet2.4_5.5.26.bb +2 -1
index ee80e5e..b34b23d 100644
@@ -1,5 +1,6 @@
 DESCRIPTION = "Servlet API 2.4 (from Tomcat 5.5)"
-LICENSE = "AL2.0"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 AUTHOR = "Apache Software Foundation"
 
 SRC_URI = "http://archive.apache.org/dist/tomcat/tomcat-5/v${PV}/src/apache-tomcat-${PV}-src.tar.gz"
recipes-core/xml-commons/jaxme_0.5.2.bb +2 -2
index 65b406e..b4ec750 100644
@@ -1,6 +1,6 @@
 DESCRIPTION = "Implementation of the JAXB API"
-LICENSE = "AL2.0"
-
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 AUTHOR = "Apache Software Foundation"
 HOMEPAGE = "http://ws.apache.org/jaxme"
 
recipes-core/xml-commons/xom_1.1.bb +2 -1
index 56701b2..7405dab 100644
@@ -1,5 +1,6 @@
 DESCRIPTION = "Tree-based API for processing XML with Java"
-LICENSE = "LGPL"
+LICENSE = "LGPL-2.1"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=456080cf80cd56d4d58118c1d10d824f"
 
 HOMEPAGE = "http://xom.nu"
 
recipes-core/xml-commons/xpp2_2.1.10.bb +1 -1
index 54d69f4..d3baca4 100644
@@ -1,6 +1,6 @@
 DESCRIPTION = "Streaming pull XML parser for java"
 LICENSE = "BSD-like"
-
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d40c660a53e36a103a35c170d38d0ef6"
 HOMEPAGE = "http://www.extreme.indiana.edu/xgws/xsoap/xpp/"
 
 SRC_URI = "http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz"
recipes-core/xml-commons/xpp3_1.1.3.4.O.bb +1 -0
index b87cccd..bedb8a9 100644
@@ -1,5 +1,6 @@
 DESCRIPTION = "Streaming pull XML parser for Java (3rd edition)"
 LICENSE = "BSD-like"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=35235e1ea47db355da0627f8d93e3a6c"
 
 HOMEPAGE = "http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1"
 
recipes-extended/hsqldb/hsqldb_1.8.0.10.bb +2 -1
index ff4908a..139d3ae 100644
@@ -1,7 +1,8 @@
 DESCRIPTION = "Lightweight 100% Java SQL Database Engine"
 # BSD-like
 LICENSE = "HypersonicSQL"
-
+LIC_FILES_CHKSUM = "file://doc/hypersonic_lic.txt;md5=778452795343df6f459b725185966888"
+LIC_FILES_CHKSUM = "file://doc/hsqldb_lic.txt;md5=beb9a0581941064345aba5de7e519d53"
 AUTHOR = "HSQLDB Development Group"
 HOMEPAGE = "http://hsqldb.org"
 
Signature · 1 line
1.9.3
#3 lore raw

PATCH v2 3/6 rxtx: use autotools-brokensep

In reply to Max Krummenacher
---
 recipes-extended/rxtx/rxtx_2.2.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-extended/rxtx/rxtx_2.2.0.bb +1 -1
index 28603e3..85f55c0 100644
@@ -22,7 +22,7 @@ S = "${WORKDIR}/rxtx-2.2pre2"
 
 INSANE_SKIP_${PN} += "dev-so"
 
-inherit autotools java-library
+inherit autotools-brokensep java-library
 
 JARFILENAME = "RXTXcomm.jar"
 EXTRA_OEMAKE += "RXTX_PATH=${D}${libdir_jni} \
Signature · 1 line
1.9.3
#4 lore raw

PATCH v2 4/6 java-library: inherit allarch

In reply to Max Krummenacher

Use the allarch class to make every packages in the 'all' ARCH. Recipes inheriting java-library which build additional packages which don't belong in to all ARCH must manually setting PACKAGE_ARCH after inheritting java-library.

This fixes the following error when building e.g. rhino for a second machine of different architecture in the same build directory:
ERROR: The recipe rhino is trying to install files into a shared area when those files already exist. Those files and their manifest location are:
/.../ipk/all/librhino-java_1.7r4-r0_all.ipk
Matched in manifest-armv7at2hf-vfp-rhino-package_write_ipk

---
 classes/java-library.bbclass           | 8 +++++---
 recipes-core/libmatthew/libmatthew.inc | 1 +
 recipes-extended/rxtx/rxtx_2.2.0.bb    | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)
classes/java-library.bbclass +5 -3
index a74c8d3..144cd2f 100644
@@ -7,8 +7,12 @@
 # starts with "lib" and/or ends with "-java". In case the "lib" prefix is part of
 # your package's normal name (e.g. liberator) the guessing is wrong and you have
 # to set JPN manually!
+#
+# package archs are set to all, if the recipe builds also packages which
+# can not be used for all archs, then set the PACKAGE_ARCH of that package
+# manually, see rxtx_xx.bb for an example.
 
-inherit java
+inherit java allarch
 
 # use java_stage for native packages
 JAVA_NATIVE_STAGE_INSTALL = "1"
@@ -35,8 +39,6 @@ DEPENDS_prepend = "virtual/javac-native fastjar-native "
 
 PACKAGES += "${JPN}"
 
-PACKAGE_ARCH_${JPN} = "all"
-
 FILES_${JPN} = "${datadir_java}"
 
 # File name of the libraries' main Jar file
recipes-core/libmatthew/libmatthew.inc +1 -0
index b7e50bd..36622a8 100644
@@ -8,6 +8,7 @@ DEPENDS = "virtual/java-native classpath-native classpath"
 S = "${WORKDIR}/libmatthew-java-${PV}"
 
 inherit java-library
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
 
 # Some internal version numbers which change from time to time.
 # Allowing to override them makes this include file more
recipes-extended/rxtx/rxtx_2.2.0.bb +1 -0
index 85f55c0..0d5aa21 100644
@@ -23,6 +23,7 @@ S = "${WORKDIR}/rxtx-2.2pre2"
 INSANE_SKIP_${PN} += "dev-so"
 
 inherit autotools-brokensep java-library
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
 
 JARFILENAME = "RXTXcomm.jar"
 EXTRA_OEMAKE += "RXTX_PATH=${D}${libdir_jni} \
Signature · 1 line
1.9.3
#5 lore raw

PATCH v2 5/6 antlr: fix override for native build

In reply to Max Krummenacher

The override virtclass_native has been deprecated and removed from the buildsystem, use class-native instead.

While at it fix whitespace issues.

---
 recipes-core/antlr/antlr_2.7.7.bb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
recipes-core/antlr/antlr_2.7.7.bb +9 -9
index 2c7ab8e..9d9d2d4 100644
@@ -5,25 +5,25 @@ LICENSE = "PD"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=361934e706423915b4d9f413ad37fb65"
 
 SRC_URI = "http://www.antlr2.org/download/${BP}.tar.gz"
-SRC_URI_virtclass_native += "file://runantlr"
+SRC_URI_append_class-native = " file://runantlr"
 
 inherit java-library
 
-do_configure_virtclass_native() {
-        sed -i -e"s|@JAR_FILE@|${STAGING_DATADIR_JAVA_NATIVE}/antlr.jar|" ${WORKDIR}/runantlr
+do_configure_class-native() {
+    sed -i -e"s|@JAR_FILE@|${STAGING_DATADIR_JAVA_NATIVE}/antlr.jar|" ${WORKDIR}/runantlr
 }
 
 do_compile() {
-  mkdir -p build
+    mkdir -p build
 
-  javac -sourcepath . -d build `find antlr -name "*.java"`
+    javac -sourcepath . -d build `find antlr -name "*.java"`
 
-  fastjar cf ${JARFILENAME} -C build .
+    fastjar cf ${JARFILENAME} -C build .
 }
 
-do_install_virtclass_native() {
-        install ${D}${bindir}
-        install -m 0755 ${WORKDIR}/runantlr {D}${bindir}/
+do_install_class-native() {
+    install -d ${D}${bindir}
+    install -m 0755 ${WORKDIR}/runantlr ${D}${bindir}/
 }
 
 SRC_URI[md5sum] = "01cc9a2a454dd33dcd8c856ec89af090"
Signature · 1 line
1.9.3
#6 lore raw

PATCH v2 6/6 mark broken recipes with PNBLACKLIST

In reply to Max Krummenacher

While testing commit 'java-library: inherit allarch' I found some recipes throwing errors in do_compile.

The recipes jaxme and xom currently don't build with compiler errors.

jaxen, dom4j, jdom, commons-jxpath, commons-configuration depend directly or indirectly on jaxme and/or xom and thus are unbildable.

---
 recipes-core/jakarta-commons/commons-configuration_1.5.bb |  2 ++
 recipes-core/jakarta-commons/commons-jxpath_1.3.bb        |  2 ++
 recipes-core/xml-commons/dom4j_1.6.1.bb                   |  2 ++
 recipes-core/xml-commons/jaxen_1.1.1.bb                   |  2 ++
 recipes-core/xml-commons/jaxme_0.5.2.bb                   | 14 ++++++++++++++
 recipes-core/xml-commons/jdom_1.1.bb                      |  2 ++
 recipes-core/xml-commons/xom_1.1.bb                       | 11 +++++++++++
 7 files changed, 35 insertions(+)
recipes-core/jakarta-commons/commons-configuration_1.5.bb +2 -0
index 54409e5..eebb7f7 100644
@@ -9,6 +9,8 @@ SRC_URI = " \
 	   http://ftp.hosting-studio.de/pub/linux/apache/ant/source/apache-ant-1.7.1-src.tar.bz2;name=ant \
           "
 
+PNBLACKLIST[commons-configuration] ?= "BROKEN: indirectly depends on broken 'xom'"
+
 DEPENDS += "commons-logging commons-collections3 commons-beanutils commons-codec commons-digester commons-jxpath commons-lang servlet2.4"
 RDEPENDS_${PN} = "libcommons-logging-java libcommons-collections3-java libcommons-beanutils-java libcommons-codec-java libcommons-digester-java libcommons-jxpath-java libcommons-lang-java libservlet2.4-java"
 
recipes-core/jakarta-commons/commons-jxpath_1.3.bb +2 -0
index d380ed9..8ccbad1 100644
@@ -6,6 +6,8 @@ DESCRIPTION = "JXPath interpreter for Java"
 
 SRC_URI = "http://archive.apache.org/dist/commons/jxpath/source/${BP}-src.tar.gz"
 
+PNBLACKLIST[commons-jxpath] ?= "BROKEN: indirectly depends on broken 'xom'"
+
 DEPENDS += "commons-logging commons-collections3 commons-beanutils servlet2.3 jdom"
 RDEPENDS_${PN} = "libcommons-logging-java libcommons-collections3-java libcommons-beanutils-java libservlet2.3-java libjdom-java"
 
recipes-core/xml-commons/dom4j_1.6.1.bb +2 -0
index d26d2ee..19dca74 100644
@@ -11,6 +11,8 @@ SRC_URI = "\
 	file://debian.patch \
 	"
 
+PNBLACKLIST[dom4j] ?= "BROKEN: indirectly depends on broken 'xom'"
+
 inherit java-library
 
 do_compile() {
recipes-core/xml-commons/jaxen_1.1.1.bb +2 -0
index 147ccf9..4853683 100644
@@ -10,6 +10,8 @@ SRC_URI = "\
 	http://www.jdom.org/dist/binary/archive/jdom-1.1.tar.gz;name=jdom \
 	"
 
+PNBLACKLIST[jaxen] ?= "BROKEN: depends on broken 'xom'"
+
 inherit java-library
 
 do_compile() {
recipes-core/xml-commons/jaxme_0.5.2.bb +14 -0
index b4ec750..03f4f57 100644
@@ -9,6 +9,20 @@ SRC_URI = "\
 	http://ftp.hosting-studio.de/pub/linux/apache/ant/source/apache-ant-1.7.1-src.tar.bz2;name=ant \
 	"
 
+# do_compile:
+# 2. ERROR in src/jaxme/org/apache/ws/jaxme/generator/XJCTask.java (at line 30)
+#         import org.apache.ws.jaxme.generator.sg.SGFactoryChain;
+#                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+# The import org.apache.ws.jaxme.generator.sg.SGFactoryChain cannot be resolved
+# ----------
+# 3. ERROR in src/jaxme/org/apache/ws/jaxme/generator/XJCTask.java (at line 1055)
+#         if (!SGFactoryChain.class.isAssignableFrom(c)) {
+#              ^^^^^^^^^^^^^^
+# SGFactoryChain cannot be resolved to a type
+# ----------
+# ... and many more
+PNBLACKLIST[jaxme] ?= "BROKEN: do_compile fails"
+
 S = "${WORKDIR}/ws-${P}"
 
 inherit java-library
recipes-core/xml-commons/jdom_1.1.bb +2 -0
index cb53734..4867e82 100644
@@ -9,6 +9,8 @@ SRC_URI = "\
 	http://www.jdom.org/dist/binary/archive/jdom-${PV}.tar.gz \
 	"
 
+PNBLACKLIST[jdom] ?= "BROKEN: indirectly depends on broken 'xom'"
+
 inherit java-library
 
 do_compile() {
recipes-core/xml-commons/xom_1.1.bb +11 -0
index 7405dab..c37965b 100644
@@ -10,6 +10,17 @@ SRC_URI = "\
 	file://04_remove_sun_import.patch \
 	"
 
+# DEBUG: Executing shell function do_compile
+# ----------
+# 1. ERROR in src/nu/xom/UnicodeUtil.java (at line 0)
+# 	/* Copyright 2005 Elliotte Rusty Harold
+# 	^
+# Internal compiler error: java.lang.StackOverflowError at org.eclipse.jdt.internal.compiler.ast.Expression.checkNPE(Expression.java:511)
+# ----------
+# Exception in thread "main" java.lang.StackOverflowError
+#    at org.eclipse.jdt.internal.compiler.ast.Expression.checkNPE(Expression.java:511)
+PNBLACKLIST[xom] ?= "BROKEN: do_compile fails with internal javac error"
+
 S = "${WORKDIR}/XOM"
 
 inherit java-library
Signature · 1 line
1.9.3
#7 lore raw
In reply to Max Krummenacher
Quoted 63 lines · Max Krummenacher

v2: Patch 6/6: mark broken recipes with PNBLACKLIST[recipe] rather than
documenting them in a README.nonworking

Building a recipe which provides packages for allarch and ${TUNE_PKGARCH} fails if one builds in the same build directory for different TUNE_PKGARCHs.

An example is rhino which fails as follows when one builds first for armv7at2hf-vfp and then for armv7at2hf-vfp-neon.
ERROR: The recipe rhino is trying to install files into a shared area when those files already exist. Those files and their manifest location are:
/.../ipk/all/librhino-java_1.7r4-r0_all.ipk
Matched in manifest-armv7at2hf-vfp-rhino-package_write_ipk

The change in package arch is done in java-library.bbclass. Most of the users of java-library.bbclass don't install any files in the ${TUNE_PKGARCH} packages or install shell scripts which may also be deployed in an allarch package.

Most of the recipes including java-library.bbclass no longer build with newer layer revisions.
This patchset first update the recipes to build again, changes java-library build all packages in allarch by default and recipes which must have some of their packages in ${TUNE_PKGARCH} to have all of their recipes in ${TUNE_PKGARCH}.
Finaly some of the recipes I tried did not build before and after the proposed changes. Adding a PNBLACKLIST statement to mark them as I don't have the time to work on these and I guess no one has been interested in years.

Regards
Max

Max Krummenacher (6):
cleanup whitespace in tasks
licence: add missing LIC_FILES_CHKSUM
rxtx: use autotools-brokensep
java-library: inherit allarch
antlr: fix override for native build
mark broken recipes with PNBLACKLIST

 classes/java-library.bbclass                       |  8 ++-
 recipes-core/antlr/antlr_2.7.7.bb                  | 18 +++---
 recipes-core/jakarta-commons/commons-cli_1.1.bb    |  1 +
 recipes-core/jakarta-commons/commons-codec_1.3.bb  |  1 +
 .../jakarta-commons/commons-configuration_1.5.bb   |  2 +
 .../jakarta-commons/commons-discovery_0.4.bb       |  1 +
 recipes-core/jakarta-commons/commons-el_1.0.bb     |  3 +-
 .../jakarta-commons/commons-fileupload_1.2.1.bb    |  1 +
 .../jakarta-commons/commons-httpclient_3.1.bb      |  1 +
 recipes-core/jakarta-commons/commons-io_1.4.bb     |  1 +
 recipes-core/jakarta-commons/commons-jxpath_1.3.bb |  2 +
 recipes-core/jakarta-commons/commons-lang_2.4.bb   |  1 +
 .../jakarta-commons/commons-logging_1.1.1.bb       |  1 -
 recipes-core/jakarta-commons/commons-pool_1.4.bb   |  1 +
 recipes-core/jakarta-commons/jakarta-commons.inc   | 68 +++++++++++-----------
 recipes-core/jakarta-libs/poi_3.0.bb               |  3 +-
 recipes-core/junit/junit4_4.3.1.bb                 |  3 +-
 recipes-core/libmatthew/libmatthew.inc             |  1 +
 recipes-core/servlet-api/jsp2.0_5.5.26.bb          |  3 +-
 recipes-core/servlet-api/servlet2.4_5.5.26.bb      |  3 +-
 recipes-core/xml-commons/dom4j_1.6.1.bb            |  2 +
 recipes-core/xml-commons/jaxen_1.1.1.bb            |  2 +
Quoted 9 lines
 recipes-core/xml-commons/jaxme_0.5.2.bb            | 57 +++++++++++-------
 recipes-core/xml-commons/jdom_1.1.bb               |  2 +
 recipes-core/xml-commons/xom_1.1.bb                | 40 ++++++++-----
 recipes-core/xml-commons/xpp2_2.1.10.bb            | 24 ++++----
 recipes-core/xml-commons/xpp3_1.1.3.4.O.bb         | 39 +++++++------
 recipes-extended/hsqldb/hsqldb_1.8.0.10.bb         | 29 ++++-----
 recipes-extended/rxtx/rxtx_2.2.0.bb                |  3 +-
 29 files changed, 188 insertions(+), 133 deletions(-)

Whole series looks good to me. Thank you Max.

Bye Henning