classpath-initial: remove files shared with classpath-native

* bump PR

1 files changed, 12 insertions, 1 deletions

diff --git a/recipes-core/classpath/classpath-initial_0.93.bb b/recipes-core/classpath/classpath-initial_0.93.bb
index 4d7dfa3..adb2d73 100644
--- a/recipes-core/classpath/classpath-initial_0.93.bb
+++ b/recipes-core/classpath/classpath-initial_0.93.bb
@@ -7,7 +7,7 @@ DESCRIPTION="Java1.4-compatible GNU Classpath variant that is used as bootclassp
 LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510"
 DEPENDS += "jikes-native"
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI += " \
             file://autotools.patch \
@@ -36,6 +36,17 @@ EXTRA_OECONF = " \
 # Ensure tools.zip is not installed at same path as classpath-native
 EXTRA_OEMAKE += "pkgdatadir=${STAGING_DATADIR_NATIVE}/classpath-initial"
 
+# remove files clashing with classpath-native in sysroot
+do_install_append() {
+
+        FILES='gappletviewer gjarsigner gkeytool gjar gnative2ascii gserialver grmiregistry gtnameserv gorbd grmid'
+        for i in ${FILES}
+        do
+                rm ${D}${bindir}/${i}
+        done
+        rm ${D}${libdir}/logging.properties
+        rm ${D}${libdir}/security/classpath.security
+}
 SRC_URI[md5sum] = "ffa9e9cac31c5acbf0ea9eff9efa923d"
 SRC_URI[sha256sum] = "df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945"