From 74389d2acb676ad1c204e36af01cb47dac070502 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Thu, 10 Jan 2013 20:41:48 +0100 Subject: classpath-initial: remove files shared with classpath-native * bump PR --- recipes-core/classpath/classpath-initial_0.93.bb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'recipes-core/classpath/classpath-initial_0.93.bb') 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" -- cgit v1.2.3-54-g00ecf