Signed-off-by: AJ Bagwell <anthony.bagw...@hivehome.com>
---
classes/java-library.bbclass | 4 ++--
recipes-core/ant/ant-native_1.8.1.bb | 4 ++--
recipes-core/junit/junit_3.8.2.bb | 4 ++--
recipes-core/openjdk/openjdk-8-release-common.inc | 3 ++-
recipes-core/xml-commons/xom_1.2.10.bb | 2 +-
5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass
index 62fabec..67541d2 100644
--- a/classes/java-library.bbclass
+++ b/classes/java-library.bbclass
@@ -54,14 +54,14 @@ ALTJARFILENAMES = "${BPN}.jar"
# Java "source" distributions often contain precompiled things
# we want to delete first.
-do:removebinaries() {
+do_deletebinaries() {
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
+addtask deletebinaries after do_unpack before do_patch
do_install:append() {
oe_jarinstall ${JARFILENAME} ${ALTJARFILENAMES}
diff --git a/recipes-core/ant/ant-native_1.8.1.bb
b/recipes-core/ant/ant-native_1.8.1.bb
index fa37dd1..8814039 100644
--- a/recipes-core/ant/ant-native_1.8.1.bb
+++ b/recipes-core/ant/ant-native_1.8.1.bb
@@ -20,7 +20,7 @@ DEPENDS = " \
junit-native jdepend-native commons-net-native commons-logging-native \
"
-do:removecruft() {
+do_deletecruft() {
# Removes thing that need proprietary Jar files or are otherwise
problematic
rm -rf ${S}/src/main/org/apache/tools/ant/taskdefs/optional/image
rm -rf ${S}/src/main/org/apache/tools/ant/types/optional/image
@@ -30,7 +30,7 @@ do:removecruft() {
rm -rf
${S}/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
}
-addtask removecruft before do_patch after do:removebinaries
+addtask deletecruft before do_patch after do_deletebinaries
do_compile() {
mkdir -p build
diff --git a/recipes-core/junit/junit_3.8.2.bb
b/recipes-core/junit/junit_3.8.2.bb
index 4f10575..feaddc3 100644
--- a/recipes-core/junit/junit_3.8.2.bb
+++ b/recipes-core/junit/junit_3.8.2.bb
@@ -16,14 +16,14 @@ inherit java-library
do_unpackpost[dirs] = "${B}"
do_unpackpost() {
mkdir -p src
- # Prevent deletion by do:removebinaries.
+ # Prevent deletion by do_deletebinraries.
if [ -e src.jar ]; then
mv src.jar src.zip
fi
unzip -o src.zip -d src
}
-addtask unpackpost before do:removebinaries after do_unpack
+addtask unpackpost before do_deletebinraries after do_unpack
do_compile() {
mkdir -p build
diff --git a/recipes-core/openjdk/openjdk-8-release-common.inc
b/recipes-core/openjdk/openjdk-8-release-common.inc
index 6c7bdd2..ff8d96e 100644
--- a/recipes-core/openjdk/openjdk-8-release-common.inc
+++ b/recipes-core/openjdk/openjdk-8-release-common.inc
@@ -1,3 +1,4 @@
+
PATCHES_URI = "\
file://0001-Allow-using-a-system-installed-libjpeg.patch \
file://0002-Allow-using-a-system-installed-libpng.patch \
@@ -56,7 +57,7 @@ PATCHES_URI:append:libc-musl = "\
${DISABLE_AGENT_BUILD_PT2} \
file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-common.patch \
${REMOVE_GLIBC_DEPENDENCIES_PT2} \
-
file://musl-0007-hotspot-os_linux:x86-remove-glibc-dependencies-fpu_c.patch \
+
file://musl-0007-hotspot-os_linux_x86-remove-glibc-dependencies-fpu_c.patch \
file://musl-0008-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch \
file://musl-0009-jdk-musl-has-gethostby_r.patch \
"
diff --git a/recipes-core/xml-commons/xom_1.2.10.bb
b/recipes-core/xml-commons/xom_1.2.10.bb
index 5a71655..2520405 100644
--- a/recipes-core/xml-commons/xom_1.2.10.bb
+++ b/recipes-core/xml-commons/xom_1.2.10.bb
@@ -36,7 +36,7 @@ do_move_jaxen() {
}
-addtask move_jaxen after do:removebinaries before do_patch
+addtask move_jaxen after do_deletebinraries before do_patch
do_compile() {
mkdir -p build
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#92538):
https://lists.openembedded.org/g/openembedded-devel/message/92538
Mute This Topic: https://lists.openembedded.org/mt/84767852/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
