diff options
author | Patrick Ohly <patrick.ohly@intel.com> | 2016-07-20 11:48:36 +0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-07-22 11:46:51 -0300 |
commit | 4ae7c0c40e1f8fccc98d2f58cf61ef58c5a27da6 (patch) | |
tree | 69dbbebfb395f446051184914c64238e1411b7b5 /recipes-core | |
parent | 065ee5a0160d7ad95861417a845c9e208499061e (diff) | |
download | meta-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>
Diffstat (limited to 'recipes-core')
-rw-r--r-- | recipes-core/ecj/libecj-bootstrap.inc | 1 | ||||
-rw-r--r-- | recipes-core/jakarta-commons/jakarta-commons.inc | 1 | ||||
-rw-r--r-- | recipes-core/junit/junit_3.8.2.bb | 1 | ||||
-rw-r--r-- | recipes-core/servlet-api/jsp2.0_5.5.26.bb | 1 | ||||
-rw-r--r-- | recipes-core/servlet-api/servlet2.3_4.1.37.bb | 1 | ||||
-rw-r--r-- | recipes-core/servlet-api/servlet2.4_5.5.26.bb | 1 | ||||
-rw-r--r-- | recipes-core/xerces-j/xerces-j_2.11.0.bb | 1 | ||||
-rw-r--r-- | recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb | 1 |
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 | ||
16 | JAR = "ecj-bootstrap-${PV}.jar" | 16 | JAR = "ecj-bootstrap-${PV}.jar" |
17 | 17 | ||
18 | do_unpackpost[dirs] = "${B}" | ||
18 | do_unpackpost() { | 19 | do_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'" | |||
22 | CLEAN_PATH = "" | 22 | CLEAN_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. |
25 | do_unpackpost[dirs] = "${B}" | ||
25 | do_unpackpost() { | 26 | do_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 | ||
14 | inherit java-library | 14 | inherit java-library |
15 | 15 | ||
16 | do_unpackpost[dirs] = "${B}" | ||
16 | do_unpackpost() { | 17 | do_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" | |||
18 | JARFILENAME = "jsp-api-2.0.${IMPL_REVISION}.jar" | 18 | JARFILENAME = "jsp-api-2.0.${IMPL_REVISION}.jar" |
19 | ALTJARFILENAMES = "jsp-api-2.0.jar jsp-api.jar" | 19 | ALTJARFILENAMES = "jsp-api-2.0.jar jsp-api.jar" |
20 | 20 | ||
21 | do_unpackpost[dirs] = "${B}" | ||
21 | do_unpackpost() { | 22 | do_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" | |||
18 | JARFILENAME = "servlet-2.3.${IMPL_REVISION}.jar" | 18 | JARFILENAME = "servlet-2.3.${IMPL_REVISION}.jar" |
19 | ALTJARFILENAMES = "servlet-2.3.jar servlet2.3.jar" | 19 | ALTJARFILENAMES = "servlet-2.3.jar servlet2.3.jar" |
20 | 20 | ||
21 | do_unpackpost[dirs] = "${B}" | ||
21 | do_unpackpost() { | 22 | do_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" | |||
17 | JARFILENAME = "servlet-api-2.4.${IMPL_REVISION}.jar" | 17 | JARFILENAME = "servlet-api-2.4.${IMPL_REVISION}.jar" |
18 | ALTJARFILENAMES = "servlet-api-2.4.jar servlet-api.jar servlet2.4.jar" | 18 | ALTJARFILENAMES = "servlet-api-2.4.jar servlet-api.jar servlet2.4.jar" |
19 | 19 | ||
20 | do_unpackpost[dirs] = "${B}" | ||
20 | do_unpackpost() { | 21 | do_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. | |||
26 | RDEPENDS_${PN} = "libjaxp1.3-java libxml-commons-resolver1.1-java" | 26 | RDEPENDS_${PN} = "libjaxp1.3-java libxml-commons-resolver1.1-java" |
27 | RDEPENDS_${PN}_virtclass-native = "" | 27 | RDEPENDS_${PN}_virtclass-native = "" |
28 | 28 | ||
29 | do_unpackpost[dirs] = "${B}" | ||
29 | do_unpackpost() { | 30 | do_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}" | |||
13 | DEPENDS = "fastjar-native jaxp1.3" | 13 | DEPENDS = "fastjar-native jaxp1.3" |
14 | DEPENDS_virtclass-native = "fastjar-native jaxp1.3-native" | 14 | DEPENDS_virtclass-native = "fastjar-native jaxp1.3-native" |
15 | 15 | ||
16 | do_unpackpost[dirs] = "${B}" | ||
16 | do_unpackpost() { | 17 | do_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|" \ |