[oe] [meta-java][PATCH] do_unpackpost: explicitly set working directory

[Patrick Ohly]

bitbake rev 67a7b8b02 "build: don't use $B as the default cwd for
functions" (included in current bitbake master) breaks the assumption
that do_unpackpost runs inside the build directory. Now that has to be
set explicitly, which is also okay for older bitbake versions.

Signed-off-by: Patrick Ohly <patrick.ohly at intel.com>
---
 recipes-core/ecj/libecj-bootstrap.inc                   | 1 +
 recipes-core/jakarta-commons/jakarta-commons.inc        | 1 +
 recipes-core/junit/junit_3.8.2.bb                       | 1 +
 recipes-core/servlet-api/jsp2.0_5.5.26.bb               | 1 +
 recipes-core/servlet-api/servlet2.3_4.1.37.bb           | 1 +
 recipes-core/servlet-api/servlet2.4_5.5.26.bb           | 1 +
 recipes-core/xerces-j/xerces-j_2.11.0.bb                | 1 +
 recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb | 1 +
 8 files changed, 8 insertions(+)

diff --git a/recipes-core/ecj/libecj-bootstrap.inc b/recipes-core/ecj/libecj-bootstrap.inc
index 020b8d3..dde09c6 100644
--- a/recipes-core/ecj/libecj-bootstrap.inc
+++ b/recipes-core/ecj/libecj-bootstrap.inc
@@ -15,6 +15,7 @@ S = "${WORKDIR}"
 
 JAR = "ecj-bootstrap-${PV}.jar"
 
+do_unpackpost[dirs] = "${B}"
 do_unpackpost() {
   if [ ! -d source ]; then
     mkdir source
diff --git a/recipes-core/jakarta-commons/jakarta-commons.inc b/recipes-core/jakarta-commons/jakarta-commons.inc
index 5968164..5a22f1e 100644
--- a/recipes-core/jakarta-commons/jakarta-commons.inc
+++ b/recipes-core/jakarta-commons/jakarta-commons.inc
@@ -22,6 +22,7 @@ FINDARGS = "-name '*.properties'"
 CLEAN_PATH = ""
 
 # Some projects have a replaceable version number in their manifest template.
+do_unpackpost[dirs] = "${B}"
 do_unpackpost() {
     if [ -d src/conf ]
     then
diff --git a/recipes-core/junit/junit_3.8.2.bb b/recipes-core/junit/junit_3.8.2.bb
index bae022d..90ffd66 100644
--- a/recipes-core/junit/junit_3.8.2.bb
+++ b/recipes-core/junit/junit_3.8.2.bb
@@ -13,6 +13,7 @@ DEPENDS += "unzip-native"
 
 inherit java-library
 
+do_unpackpost[dirs] = "${B}"
 do_unpackpost() {
 	mkdir -p src
 	# Prevent deletion by do_removebinaries.
diff --git a/recipes-core/servlet-api/jsp2.0_5.5.26.bb b/recipes-core/servlet-api/jsp2.0_5.5.26.bb
index e831501..98e3468 100644
--- a/recipes-core/servlet-api/jsp2.0_5.5.26.bb
+++ b/recipes-core/servlet-api/jsp2.0_5.5.26.bb
@@ -18,6 +18,7 @@ IMPL_REVISION = "public_draft"
 JARFILENAME = "jsp-api-2.0.${IMPL_REVISION}.jar"
 ALTJARFILENAMES = "jsp-api-2.0.jar jsp-api.jar"
 
+do_unpackpost[dirs] = "${B}"
 do_unpackpost() {
   sed -i -e "s|@implementation.version@|${IMPL_REVISION}|" src/etc/manifest
 }
diff --git a/recipes-core/servlet-api/servlet2.3_4.1.37.bb b/recipes-core/servlet-api/servlet2.3_4.1.37.bb
index fbda5c8..1fa12f8 100644
--- a/recipes-core/servlet-api/servlet2.3_4.1.37.bb
+++ b/recipes-core/servlet-api/servlet2.3_4.1.37.bb
@@ -18,6 +18,7 @@ IMPL_REVISION = "1"
 JARFILENAME = "servlet-2.3.${IMPL_REVISION}.jar"
 ALTJARFILENAMES = "servlet-2.3.jar servlet2.3.jar"
 
+do_unpackpost[dirs] = "${B}"
 do_unpackpost() {
   sed -i -e "s|@implementation.version@|${IMPL_REVISION}|" src/etc/manifest
 }
diff --git a/recipes-core/servlet-api/servlet2.4_5.5.26.bb b/recipes-core/servlet-api/servlet2.4_5.5.26.bb
index b34b23d..f9259aa 100644
--- a/recipes-core/servlet-api/servlet2.4_5.5.26.bb
+++ b/recipes-core/servlet-api/servlet2.4_5.5.26.bb
@@ -17,6 +17,7 @@ IMPL_REVISION = "1"
 JARFILENAME = "servlet-api-2.4.${IMPL_REVISION}.jar"
 ALTJARFILENAMES = "servlet-api-2.4.jar servlet-api.jar servlet2.4.jar"
 
+do_unpackpost[dirs] = "${B}"
 do_unpackpost() {
   sed -i -e "s|2.3. at implementation.version@|2.4.${IMPL_REVISION}|" src/etc/manifest
 }
diff --git a/recipes-core/xerces-j/xerces-j_2.11.0.bb b/recipes-core/xerces-j/xerces-j_2.11.0.bb
index f9e497e..4a0cc91 100644
--- a/recipes-core/xerces-j/xerces-j_2.11.0.bb
+++ b/recipes-core/xerces-j/xerces-j_2.11.0.bb
@@ -26,6 +26,7 @@ DEPENDS_virtclass-native = "fastjar-native jaxp1.3-native xml-commons-resolver1.
 RDEPENDS_${PN} = "libjaxp1.3-java libxml-commons-resolver1.1-java"
 RDEPENDS_${PN}_virtclass-native = ""
 
+do_unpackpost[dirs] = "${B}"
 do_unpackpost() {
   find src -exec \
     sed -i -e "s|@impl.name@|Xerces-J ${PV}|" \
diff --git a/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb b/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb
index 5853895..77556fc 100644
--- a/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb
+++ b/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb
@@ -13,6 +13,7 @@ S = "${WORKDIR}/xml-commons-resolver-${PV}"
 DEPENDS = "fastjar-native jaxp1.3"
 DEPENDS_virtclass-native = "fastjar-native jaxp1.3-native"
 
+do_unpackpost[dirs] = "${B}"
 do_unpackpost() {
   find src -exec \
     sed -i -e "s|@impl.name@|XmlResolver|" \
-- 
2.1.4