summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2016-07-20 11:48:36 +0200
committerOtavio Salvador <otavio@ossystems.com.br>2016-07-22 11:46:51 -0300
commit4ae7c0c40e1f8fccc98d2f58cf61ef58c5a27da6 (patch)
tree69dbbebfb395f446051184914c64238e1411b7b5
parent065ee5a0160d7ad95861417a845c9e208499061e (diff)
downloadmeta-java-4ae7c0c40e1f8fccc98d2f58cf61ef58c5a27da6.tar.gz
do_unpackpost: explicitly set working directory
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@intel.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--recipes-core/ecj/libecj-bootstrap.inc1
-rw-r--r--recipes-core/jakarta-commons/jakarta-commons.inc1
-rw-r--r--recipes-core/junit/junit_3.8.2.bb1
-rw-r--r--recipes-core/servlet-api/jsp2.0_5.5.26.bb1
-rw-r--r--recipes-core/servlet-api/servlet2.3_4.1.37.bb1
-rw-r--r--recipes-core/servlet-api/servlet2.4_5.5.26.bb1
-rw-r--r--recipes-core/xerces-j/xerces-j_2.11.0.bb1
-rw-r--r--recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb1
8 files changed, 8 insertions, 0 deletions
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}"
15 15
16JAR = "ecj-bootstrap-${PV}.jar" 16JAR = "ecj-bootstrap-${PV}.jar"
17 17
18do_unpackpost[dirs] = "${B}"
18do_unpackpost() { 19do_unpackpost() {
19 if [ ! -d source ]; then 20 if [ ! -d source ]; then
20 mkdir source 21 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'"
22CLEAN_PATH = "" 22CLEAN_PATH = ""
23 23
24# Some projects have a replaceable version number in their manifest template. 24# Some projects have a replaceable version number in their manifest template.
25do_unpackpost[dirs] = "${B}"
25do_unpackpost() { 26do_unpackpost() {
26 if [ -d src/conf ] 27 if [ -d src/conf ]
27 then 28 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"
13 13
14inherit java-library 14inherit java-library
15 15
16do_unpackpost[dirs] = "${B}"
16do_unpackpost() { 17do_unpackpost() {
17 mkdir -p src 18 mkdir -p src
18 # Prevent deletion by do_removebinaries. 19 # 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"
18JARFILENAME = "jsp-api-2.0.${IMPL_REVISION}.jar" 18JARFILENAME = "jsp-api-2.0.${IMPL_REVISION}.jar"
19ALTJARFILENAMES = "jsp-api-2.0.jar jsp-api.jar" 19ALTJARFILENAMES = "jsp-api-2.0.jar jsp-api.jar"
20 20
21do_unpackpost[dirs] = "${B}"
21do_unpackpost() { 22do_unpackpost() {
22 sed -i -e "s|@implementation.version@|${IMPL_REVISION}|" src/etc/manifest 23 sed -i -e "s|@implementation.version@|${IMPL_REVISION}|" src/etc/manifest
23} 24}
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"
18JARFILENAME = "servlet-2.3.${IMPL_REVISION}.jar" 18JARFILENAME = "servlet-2.3.${IMPL_REVISION}.jar"
19ALTJARFILENAMES = "servlet-2.3.jar servlet2.3.jar" 19ALTJARFILENAMES = "servlet-2.3.jar servlet2.3.jar"
20 20
21do_unpackpost[dirs] = "${B}"
21do_unpackpost() { 22do_unpackpost() {
22 sed -i -e "s|@implementation.version@|${IMPL_REVISION}|" src/etc/manifest 23 sed -i -e "s|@implementation.version@|${IMPL_REVISION}|" src/etc/manifest
23} 24}
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"
17JARFILENAME = "servlet-api-2.4.${IMPL_REVISION}.jar" 17JARFILENAME = "servlet-api-2.4.${IMPL_REVISION}.jar"
18ALTJARFILENAMES = "servlet-api-2.4.jar servlet-api.jar servlet2.4.jar" 18ALTJARFILENAMES = "servlet-api-2.4.jar servlet-api.jar servlet2.4.jar"
19 19
20do_unpackpost[dirs] = "${B}"
20do_unpackpost() { 21do_unpackpost() {
21 sed -i -e "s|2.3.@implementation.version@|2.4.${IMPL_REVISION}|" src/etc/manifest 22 sed -i -e "s|2.3.@implementation.version@|2.4.${IMPL_REVISION}|" src/etc/manifest
22} 23}
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.
26RDEPENDS_${PN} = "libjaxp1.3-java libxml-commons-resolver1.1-java" 26RDEPENDS_${PN} = "libjaxp1.3-java libxml-commons-resolver1.1-java"
27RDEPENDS_${PN}_virtclass-native = "" 27RDEPENDS_${PN}_virtclass-native = ""
28 28
29do_unpackpost[dirs] = "${B}"
29do_unpackpost() { 30do_unpackpost() {
30 find src -exec \ 31 find src -exec \
31 sed -i -e "s|@impl.name@|Xerces-J ${PV}|" \ 32 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}"
13DEPENDS = "fastjar-native jaxp1.3" 13DEPENDS = "fastjar-native jaxp1.3"
14DEPENDS_virtclass-native = "fastjar-native jaxp1.3-native" 14DEPENDS_virtclass-native = "fastjar-native jaxp1.3-native"
15 15
16do_unpackpost[dirs] = "${B}"
16do_unpackpost() { 17do_unpackpost() {
17 find src -exec \ 18 find src -exec \
18 sed -i -e "s|@impl.name@|XmlResolver|" \ 19 sed -i -e "s|@impl.name@|XmlResolver|" \