[oe-commits] org.oe.dev classpath: some more fixes to packaging, etc and clean-up

[Laibsch commit]

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

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 86eacc43ad1d11e9d0f9fd2bf034da287c974ffe
ViewMTN: http://monotone.openembedded.org/revision.psp?id=86eacc43ad1d11e9d0f9fd2bf034da287c974ffe
Files:
1
packages/classpath/classpath-gtk_0.93.bb
packages/classpath/classpath-minimal-native_0.93.bb
packages/classpath/classpath-minimal_0.90.bb
packages/classpath/classpath.inc
Diffs:

#
# mt diff -raeb3d1a31886bb45c060d3b140ac77e547c26e46 -r86eacc43ad1d11e9d0f9fd2bf034da287c974ffe
#
# 
# 
# patch "packages/classpath/classpath-gtk_0.93.bb"
#  from [ff181753a8bd030618856024b99afb591b7ce073]
#    to [29471612c52f1a188aaf73a43ff614b4d3287cc6]
# 
# patch "packages/classpath/classpath-minimal-native_0.93.bb"
#  from [0beb0e48423e4aa6edec36dd8f01055d699dff9b]
#    to [c55a20a34483babe4a85fbdbabfc8c762ed34d96]
# 
# patch "packages/classpath/classpath-minimal_0.90.bb"
#  from [895d2c22f4aba491306fd29fd65472cc87779b80]
#    to [7d81cd98d13478abeb43424709d6e0fc7481e3ad]
# 
# patch "packages/classpath/classpath.inc"
#  from [9ccf64cc6c824d5135c1c6bdfb1ebe5988852670]
#    to [79ca11a969e17a040267d3e92c101f763fefe104]
# 
============================================================
--- packages/classpath/classpath-gtk_0.93.bb	ff181753a8bd030618856024b99afb591b7ce073
+++ packages/classpath/classpath-gtk_0.93.bb	29471612c52f1a188aaf73a43ff614b4d3287cc6
@@ -1,18 +1,9 @@ RCONFLICTS_${PN} = "classpath-minimal"
 require classpath.inc
 
 DEPENDS = "glib-2.0 gtk+ cairo gconf libart-lgpl pango libxtst jikes-native zip-native"
 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"
============================================================
--- packages/classpath/classpath-minimal-native_0.93.bb	0beb0e48423e4aa6edec36dd8f01055d699dff9b
+++ packages/classpath/classpath-minimal-native_0.93.bb	c55a20a34483babe4a85fbdbabfc8c762ed34d96
@@ -1,8 +1,10 @@ PR = "r1"
 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
============================================================
--- packages/classpath/classpath-minimal_0.90.bb	895d2c22f4aba491306fd29fd65472cc87779b80
+++ packages/classpath/classpath-minimal_0.90.bb	7d81cd98d13478abeb43424709d6e0fc7481e3ad
@@ -1,16 +1,9 @@ RCONFLICTS_${PBN}-minimal = "${PBN}-gtk"
 require classpath.inc
 
 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"
+SRC_URI += "file://disable-automake-checks.patch;patch=1"
 
+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}"
-
-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"
============================================================
--- packages/classpath/classpath.inc	9ccf64cc6c824d5135c1c6bdfb1ebe5988852670
+++ packages/classpath/classpath.inc	79ca11a969e17a040267d3e92c101f763fefe104
@@ -7,7 +7,6 @@ SRC_URI = "${GNU_MIRROR}/classpath/class
 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-dbg += "${libdir}/classp
 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}
-}