classpath: some more fixes to packaging, etc and clean-up

diff --git a/packages/classpath/classpath-gtk_0.93.bb b/packages/classpath/classpath-gtk_0.93.bb
index 137ee8f..a3b39d9 100644 (file)
--- a/packages/classpath/classpath-gtk_0.93.bb
+++ b/packages/classpath/classpath-gtk_0.93.bb
@@ -4,15 +4,6 @@ DEPENDS = "glib-2.0 gtk+ cairo gconf libart-lgpl pango libxtst jikes-native zip-
 RDEPENDS_${PN} = "classpath-common (>= ${PV})"
 RCONFLICTS_${PN} = "classpath-minimal"
 
-SRC_URI += "file://gconf_version.patch;patch=1"
+SRC_URI += "file://disable-automake-checks-v2.patch;patch=1"
 
 EXTRA_OECONF = "--with-jikes --disable-plugin --disable-dssi"
-
-PACKAGES = "classpath-dev classpath-doc classpath-common classpath-examples classpath-tools ${PN}"
-
-FILES_classpath-doc = "${datadir}/info"
-FILES_classpath-dev = "${includedir}"
-FILES_${PN} = "${libdir} ${bindir}"
-FILES_classpath-common = "${datadir}/classpath/glibj.zip"
-FILES_classpath-examples = "${datadir}/classpath/examples"
-FILES_classpath-tools = "${datadir}/classpath/tools.zip"

diff --git a/packages/classpath/classpath-minimal-native_0.93.bb b/packages/classpath/classpath-minimal-native_0.93.bb
index f8e88a0..83cb601 100644 (file)
--- a/packages/classpath/classpath-minimal-native_0.93.bb
+++ b/packages/classpath/classpath-minimal-native_0.93.bb
@@ -3,6 +3,8 @@ require classpath.inc
 DEPENDS = "glib-2.0 libart-lgpl pango libxtst jikes-native zip-native"
 PR = "r1"
 
+SRC_URI += "file://disable-automake-checks-v2.patch;patch=1"
+
 S = "${WORKDIR}/classpath-${PV}"
 
 inherit native

diff --git a/packages/classpath/classpath-minimal_0.90.bb b/packages/classpath/classpath-minimal_0.90.bb
index 1339b2d..8d9554c 100644 (file)
--- a/packages/classpath/classpath-minimal_0.90.bb
+++ b/packages/classpath/classpath-minimal_0.90.bb
@@ -4,13 +4,6 @@ DEPENDS = "jikes-native zip-native"
 RDEPENDS_${PBN}-minimal = "${PBN}-common (>= ${PV})"
 RCONFLICTS_${PBN}-minimal = "${PBN}-gtk"
 
-EXTRA_OECONF = "--with-jikes --without-x --with-glibj --disable-gtk-peer --disable-alsa"
-
-PACKAGES = "${PBN}-dev ${PBN}-doc ${PBN}-common ${PBN}-examples ${PBN}-tools ${PN}"
+SRC_URI += "file://disable-automake-checks.patch;patch=1"
 
-FILES_${PBN}-doc = "${datadir}/info"
-FILES_${PBN}-dev = "${includedir}"
-FILES_${PN} = "${libdir}"
-FILES_${PBN}-common = "${datadir}/${PBN}/glibj.zip"
-FILES_${PBN}-examples = "${datadir}/${PBN}/examples"
-FILES_${PBN}-tools = "${datadir}/${PBN}/tools"
+EXTRA_OECONF = "--with-jikes --without-x --with-glibj --disable-gtk-peer --disable-alsa"

diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc
index db75d52..d9498c9 100644 (file)
--- a/packages/classpath/classpath.inc
+++ b/packages/classpath/classpath.inc
@@ -7,7 +7,6 @@ PROVIDES = "classpath"
 RPROVIDES = "classpath"
 
 SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz \
-           file://disable-automake-checks.patch;patch=1 \
            file://gconf_version.patch;patch=1 \
            file://fix-endian-arm-floats.patch;patch=1"
 
@@ -29,15 +28,3 @@ FILES_classpath-examples += "${datadir}/classpath/examples"
 FILES_classpath-tools += "${datadir}/classpath/tools.zip ${datadir}/classpath/tools"
 FILES_classpath-dev += "${libdir}/*.so"
 FILES_classpath-dbg += "${libdir}/classpath/.debug"
-
-do_stage() {
-       install -d ${STAGING_INCDIR}/classpath
-       install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/
-       install -d ${STAGING_DATADIR}/classpath
-       install -m 0755 lib/glibj.zip ${STAGING_DATADIR}/classpath/
-}
-
-do_install() {
-       autotools_do_install
-       mv ${D}${libdir}/security ${D}${libdir}/${PN}
-}