aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorS. Lockwood-Childs <sjl@vctlabs.com>2017-07-12 01:36:34 -0700
committerMaxin B. John <maxin.john@intel.com>2017-07-21 12:04:01 +0300
commitc4b9b97c7c60ad5c0c3392ccf143b2e4e6c7df24 (patch)
treec50915969f1f4ac63f9064b58e877f074ef14510
parent879d6efe42fcc5695a37e7f455e0d3e59b2ed01a (diff)
downloadmeta-java-c4b9b97c7c60ad5c0c3392ccf143b2e4e6c7df24.tar.gz
meta-java-c4b9b97c7c60ad5c0c3392ccf143b2e4e6c7df24.tar.bz2
meta-java-c4b9b97c7c60ad5c0c3392ccf143b2e4e6c7df24.zip
java-library.bbclass: compatibility with per-recipe sysroots
The removebinaries task was intended to remove pre-built .jar and .class files from the unpacked source, but when per-recipe sysroots were implemented and ended up under WORKDIR, .jar or .class in those sysroots inadvertently started getting killed as well. For instance, ${WORKDIR}/recipe-sysroot-native/usr/share/java/ecj-bootstrap.jar was deleted when attempting to build jlex-native... which made javac in that sysroot rather unhappy. Solve by excluding both recipe-sysroot and recipe-sysroot-native dirs from the search-and-destroy operation. Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
-rw-r--r--classes/java-library.bbclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass
index 58d5a40..ce1cd28 100644
--- a/classes/java-library.bbclass
+++ b/classes/java-library.bbclass
@@ -50,8 +50,10 @@ ALTJARFILENAMES = "${BPN}.jar"
# Java "source" distributions often contain precompiled things
# we want to delete first.
do_removebinaries() {
- find ${WORKDIR} -name "*.jar" -exec rm {} \;
- find ${WORKDIR} -name "*.class" -exec rm {} \;
+ find ${WORKDIR} ! -path "${RECIPE_SYSROOT}/*" ! -path "${RECIPE_SYSROOT_NATIVE}/*" \
+ -name "*.jar" -exec rm {} \;
+ find ${WORKDIR} ! -path "${RECIPE_SYSROOT}/*" ! -path "${RECIPE_SYSROOT_NATIVE}/*" \
+ -name "*.class" -exec rm {} \;
}
addtask removebinaries after do_unpack before do_patch