[oe] [openembedded-devel][meta-java][PATCH] openjdk: fix do_install for out of source builds

Alex Gonzalez alex.gonzalez at digi.com
Fri Dec 26 17:36:26 UTC 2014


From: Max Krummenacher <max.oss.09 at gmail.com>

use ${B} to specify the build directory, thus keep working for
daisy and older versions as well as for dizzy and newer.
---
 recipes-core/openjdk/openjdk-6-common.inc | 2 +-
 recipes-core/openjdk/openjdk-7-common.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc
index 5aa435dc16a1..4254c9f3e13e 100644
--- a/recipes-core/openjdk/openjdk-6-common.inc
+++ b/recipes-core/openjdk/openjdk-6-common.inc
@@ -234,7 +234,7 @@ do_compile() {
 
 do_install() {
 	install -d ${D}${libdir_jvm}
-	cp -R ${WORKDIR}/build/${BUILD_DIR}/j2sdk-image ${D}${JDK_HOME}
+	cp -R ${B}/${BUILD_DIR}/j2sdk-image ${D}${JDK_HOME}
 
 	chmod u+rw -R ${D}${JDK_HOME}
 
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
index 32fab1612465..e14603c2daba 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -172,7 +172,7 @@ do_compile() {
 
 do_install() {
 	install -d ${D}${libdir_jvm}
-	cp -R ${WORKDIR}/build/${BUILD_DIR}/j2sdk-image ${D}${JDK_HOME}
+	cp -R ${B}/${BUILD_DIR}/j2sdk-image ${D}${JDK_HOME}
 
 	chmod u+rw -R ${D}${JDK_HOME}
 



More information about the Openembedded-devel mailing list