[oe-commits] org.oe.dev merge of '213c582b00d27a563e968bbcd4a9c276301fc7cc'

mickeyl commit openembedded-commits at lists.openembedded.org
Tue Jan 15 00:45:09 UTC 2008 

merge of '213c582b00d27a563e968bbcd4a9c276301fc7cc'
     and '25cb2cebe575eb9cbee3dab1ae0fa81368eb3bc6'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: af24529fca449c88382299f705f97290282c1ec8
ViewMTN: http://monotone.openembedded.org/revision/info/af24529fca449c88382299f705f97290282c1ec8
Files:
1
classes/cmake.bbclass
packages/openmoko2/settingsgui_0.7+0.8-beta.bb
packages/musicbrainz/libmusicbrainz_3.0.1.bb
packages/tasks/task-openmoko-feed.bb
packages/ecj/ecj-native_3.2.2.bb
packages/ecj/ecj-native_3.3.bb
packages/ecj/files/ecj.sh
packages/jamvm/jamvm
packages/jamvm/jamvm/sh3sh4-support.patch
packages/ppp-dsl/ppp-dsl_0.1-monolithic.bb
packages/quilt/quilt_0.45.inc
packages/classpath/classpath-gtk_0.93.bb
packages/obsolete/classpath/classpath-gtk_0.93.bb
packages/classpath/classpath-gtk_cvs.bb
packages/obsolete/classpath/classpath-gtk_cvs.bb
packages/classpath/classpath-minimal-native_0.93.bb
packages/obsolete/classpath/classpath-minimal-native_0.93.bb
packages/classpath/classpath-minimal-native_0.95.bb
packages/obsolete/classpath/classpath-minimal-native_0.95.bb
packages/classpath/classpath-minimal_0.90.bb
packages/obsolete/classpath/classpath-minimal_0.90.bb
packages/classpath/classpath-minimal_0.95.bb
packages/obsolete/classpath/classpath-minimal_0.95.bb
packages/classpath/classpath.inc
packages/obsolete/classpath/classpath.inc
packages/classpath/classpath_0.14.bb
packages/obsolete/classpath/classpath_0.14.bb
packages/classpath/classpath_0.15.bb
packages/obsolete/classpath/classpath_0.15.bb
packages/classpath/classpath_0.17.bb
packages/obsolete/classpath/classpath_0.17.bb
packages/classpath/classpath_0.18.bb
packages/obsolete/classpath/classpath_0.18.bb
packages/classpath/classpath_0.19.bb
packages/obsolete/classpath/classpath_0.19.bb
packages/classpath/classpath_0.20.bb
packages/obsolete/classpath/classpath_0.20.bb
packages/classpath/classpath_cvs.bb
packages/obsolete/classpath/classpath_cvs.bb
packages/classpath/files/disable-automake-checks-v2.patch
packages/obsolete/classpath/files/disable-automake-checks-v2.patch
packages/classpath/files/disable-automake-checks.patch
packages/obsolete/classpath/files/disable-automake-checks.patch
packages/classpath/files/fix-endian-arm-floats.patch
packages/obsolete/classpath/files/fix-endian-arm-floats.patch
packages/classpath/files/gconf_version.patch
packages/obsolete/classpath/files/gconf_version.patch
packages/jamvm/jamvm/jamvm-1.3.1-size-defaults.patch
packages/jamvm/files/jamvm-1.3.1-size-defaults.patch
packages/jamvm/jamvm-1.3.0
packages/obsolete/jamvm/jamvm-1.3.0
packages/jamvm/jamvm_1.3.0.bb
packages/obsolete/jamvm/jamvm_1.3.0.bb
packages/jamvm/jamvm_1.3.1.bb
packages/obsolete/jamvm/jamvm_1.3.1.bb
packages/jamvm/jamvm_1.3.2.bb
packages/obsolete/jamvm/jamvm_1.3.2.bb
packages/jamvm/jamvm_1.4.1.bb
packages/obsolete/jamvm/jamvm_1.4.1.bb
packages/ppp-dsl/dsl-provider
packages/ppp-dsl/files/dsl-provider
packages/ppp-dsl/ppp_on_boot.dsl
packages/ppp-dsl/files/ppp_on_boot.dsl
packages/quilt/files/install.patch
packages/quilt/quilt-0.45/install.patch
packages/quilt/quilt-0.39
packages/obsolete/quilt/quilt-0.39
packages/quilt/quilt-0.45/non-gnu.patch
packages/quilt/files/non-gnu.patch
packages/quilt/quilt-native_0.39.bb
packages/obsolete/quilt/quilt-native_0.39.bb
packages/quilt/quilt_0.39.bb
packages/obsolete/quilt/quilt_0.39.bb
packages/quilt/quilt_0.39.inc
packages/obsolete/quilt/quilt_0.39.inc
packages/gpsdrive/gpsdrive-pda
packages/obsolete/classpath
packages/obsolete/classpath/files
packages/obsolete/jamvm
packages/obsolete/jamvm/files
packages/obsolete/quilt
packages/pngcrush
packages/ppp/ppp-gprs
packages/ppp/ppp-gprs/chats
packages/ppp/ppp-gprs/peers
packages/ppp-dsl/files
packages/quilt/quilt-0.46
packages/vsftpd/vsftpd-charconv-2.0.5
packages/cacao/cacao-cldc.inc
packages/cacao/cacao_0.98+hg20071001.bb
packages/cacao/cacaoh-native.inc
packages/cacao/cacaoh-native_0.98+hg20071001.bb
packages/cacao/files/cacao-0.98+hg-arm-cacheflush-workaround.patch
packages/cacao/files/cacao-0.98+hg-attachthread.patch
packages/cacao/files/cacao-0.98+svn-classpath_var.patch
packages/cacao/files/cacao-0.98+svn-libdir.diff
packages/classpath/classpath-minimal_0.96.1.bb
packages/classpath/classpath_0.95.bb
packages/classpath/classpath_0.96.1.bb
packages/gpsdrive/gpsdrive-pda/makefile.patch
packages/gpsdrive/gpsdrive-pda_2.10pre2.bb
packages/jamvm/jamvm.inc
packages/jamvm/jamvm_1.5.0.bb
packages/linux/linux-2.6.23/kallsyms-missing-include.patch
packages/obsolete/jamvm/files/jamvm-1.3.1-size-defaults.patch
packages/pngcrush/pngcrush-native_1.6.4.bb
packages/pngcrush/pngcrush_1.6.4.bb
packages/ppp/ppp-gprs/chats/chat-gprs
packages/ppp/ppp-gprs/peers/_gprs
packages/ppp/ppp-gprs/peers/_gprs-ap-internet
packages/ppp/ppp-gprs_1.0.bb
packages/quilt/quilt-0.46/aclocal.patch
packages/quilt/quilt-0.46/install.patch
packages/quilt/quilt-native_0.46.bb
packages/quilt/quilt_0.46.bb
packages/rp-pppoe/rp-pppoe-3.8/dont-swallow-errors.patch
packages/vsftpd/vsftpd-charconv-2.0.5/vsftpd-charconv.patch
packages/vsftpd/vsftpd-charconv_2.0.5.bb
packages/cacao/cacao-cldc_0.98.bb
packages/cacao/cacao.inc
packages/cacao/cacaoh-cldc-native_0.98.bb
packages/jamvm/jamvm_1.4.5.bb
packages/jikes/jikes-initial.bb
packages/midpath/midpath-cldc-native_0.1.bb
packages/midpath/midpath-cldc-x11_0.1.bb
packages/midpath/midpath-cldc_0.1.bb
packages/midpath/midpath.inc
packages/ppp-dialin/ppp-dialin_0.1.bb
packages/ppp-dsl/ppp-dsl_0.1.bb
packages/quilt/quilt-native.inc
packages/quilt/quilt-native_0.45.bb
packages/quilt/quilt-package.inc
packages/quilt/quilt.inc
packages/quilt/quilt_0.45.bb
packages/rp-pppoe/rp-pppoe_3.8.bb
site/arm-linux
Diffs:

#
# mt diff -r213c582b00d27a563e968bbcd4a9c276301fc7cc -raf24529fca449c88382299f705f97290282c1ec8
#
# 
# 
# add_file "classes/cmake.bbclass"
#  content [02512e3f040f3401c03f13f92d01da77069ce59e]
# 
# add_file "packages/openmoko2/settingsgui_0.7+0.8-beta.bb"
#  content [f6b45b1198a17a3fc45cafda47eb5c17f1299ded]
# 
# patch "packages/musicbrainz/libmusicbrainz_3.0.1.bb"
#  from [d5ac482856546cff7a5115d7afd5413ebd5bba73]
#    to [d048d4237a962dcc7fba95a0c10d08e6c0da89c4]
# 
# patch "packages/tasks/task-openmoko-feed.bb"
#  from [ae8c99389ab3bc3c8f94dfedf504e3829a6cd608]
#    to [9461263af6f125afb45a029174fca08703d76041]
# 
============================================================
--- classes/cmake.bbclass	02512e3f040f3401c03f13f92d01da77069ce59e
+++ classes/cmake.bbclass	02512e3f040f3401c03f13f92d01da77069ce59e
@@ -0,0 +1,7 @@
+inherit autotools
+
+cmake_do_configure() {
+	cmake . -DCMAKE_INSTALL_PREFIX:PATH=${prefix}
+}
+
+EXPORT_FUNCTIONS do_configure
============================================================
--- packages/openmoko2/settingsgui_0.7+0.8-beta.bb	f6b45b1198a17a3fc45cafda47eb5c17f1299ded
+++ packages/openmoko2/settingsgui_0.7+0.8-beta.bb	f6b45b1198a17a3fc45cafda47eb5c17f1299ded
@@ -0,0 +1,11 @@
+DESCRIPTION = "OpenMoko Settings GUI"
+AUTHOR = "Kristian M."
+SECTION = "openmoko/applications"
+RDEPENDS = "python-pygtk python-subprocess python-threading"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://mput.de/~kristian/.openmoko/settingsgui-0.8-beta.tar.bz2"
+S = "${WORKDIR}/settingsgui-0.8-beta"
+
+inherit distutils
============================================================
--- packages/musicbrainz/libmusicbrainz_3.0.1.bb	d5ac482856546cff7a5115d7afd5413ebd5bba73
+++ packages/musicbrainz/libmusicbrainz_3.0.1.bb	d048d4237a962dcc7fba95a0c10d08e6c0da89c4
@@ -1,14 +1,14 @@ LICENSE = "LGPL"
 DEFAULT_PREFERENCE = "-1"
 
 DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. \
 It allows you to access the data held on the MusicBrainz server."
 HOMEPAGE = "http://musicbrainz.org"
 LICENSE = "LGPL"
-DEPENDS = "expat"
+DEPENDS = "expat neon"
 
 SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz"
 
-inherit autotools pkgconfig
+inherit cmake pkgconfig
 
 do_stage() {
 	autotools_stage_all
============================================================
--- packages/tasks/task-openmoko-feed.bb	ae8c99389ab3bc3c8f94dfedf504e3829a6cd608
+++ packages/tasks/task-openmoko-feed.bb	9461263af6f125afb45a029174fca08703d76041
@@ -1,7 +1,7 @@ LICENSE = "MIT"
 DESCRIPTION = "OpenMoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r18"
+PR = "r19"
 
 inherit task
 
@@ -27,6 +27,7 @@ RDEPENDS_task-openmoko-feed = "\
   python python-pygtk python-pyserial python-efl \
   ruby \
   libsdl-x11 libsdl-mixer libsdl-net libsdl-ttf \
+  settingsgui \
   synergy \
   tzdata \
   tor \


#
# mt diff -r25cb2cebe575eb9cbee3dab1ae0fa81368eb3bc6 -raf24529fca449c88382299f705f97290282c1ec8
#
# 
# 
# delete "packages/ecj/ecj-native_3.2.2.bb"
# 
# delete "packages/ecj/ecj-native_3.3.bb"
# 
# delete "packages/ecj/files/ecj.sh"
# 
# delete "packages/jamvm/jamvm"
# 
# delete "packages/jamvm/jamvm/sh3sh4-support.patch"
# 
# delete "packages/ppp-dsl/ppp-dsl_0.1-monolithic.bb"
# 
# delete "packages/quilt/quilt_0.45.inc"
# 
# rename "packages/classpath/classpath-gtk_0.93.bb"
#     to "packages/obsolete/classpath/classpath-gtk_0.93.bb"
# 
# rename "packages/classpath/classpath-gtk_cvs.bb"
#     to "packages/obsolete/classpath/classpath-gtk_cvs.bb"
# 
# rename "packages/classpath/classpath-minimal-native_0.93.bb"
#     to "packages/obsolete/classpath/classpath-minimal-native_0.93.bb"
# 
# rename "packages/classpath/classpath-minimal-native_0.95.bb"
#     to "packages/obsolete/classpath/classpath-minimal-native_0.95.bb"
# 
# rename "packages/classpath/classpath-minimal_0.90.bb"
#     to "packages/obsolete/classpath/classpath-minimal_0.90.bb"
# 
# rename "packages/classpath/classpath-minimal_0.95.bb"
#     to "packages/obsolete/classpath/classpath-minimal_0.95.bb"
# 
# rename "packages/classpath/classpath.inc"
#     to "packages/obsolete/classpath/classpath.inc"
# 
# rename "packages/classpath/classpath_0.14.bb"
#     to "packages/obsolete/classpath/classpath_0.14.bb"
# 
# rename "packages/classpath/classpath_0.15.bb"
#     to "packages/obsolete/classpath/classpath_0.15.bb"
# 
# rename "packages/classpath/classpath_0.17.bb"
#     to "packages/obsolete/classpath/classpath_0.17.bb"
# 
# rename "packages/classpath/classpath_0.18.bb"
#     to "packages/obsolete/classpath/classpath_0.18.bb"
# 
# rename "packages/classpath/classpath_0.19.bb"
#     to "packages/obsolete/classpath/classpath_0.19.bb"
# 
# rename "packages/classpath/classpath_0.20.bb"
#     to "packages/obsolete/classpath/classpath_0.20.bb"
# 
# rename "packages/classpath/classpath_cvs.bb"
#     to "packages/obsolete/classpath/classpath_cvs.bb"
# 
# rename "packages/classpath/files/disable-automake-checks-v2.patch"
#     to "packages/obsolete/classpath/files/disable-automake-checks-v2.patch"
# 
# rename "packages/classpath/files/disable-automake-checks.patch"
#     to "packages/obsolete/classpath/files/disable-automake-checks.patch"
# 
# rename "packages/classpath/files/fix-endian-arm-floats.patch"
#     to "packages/obsolete/classpath/files/fix-endian-arm-floats.patch"
# 
# rename "packages/classpath/files/gconf_version.patch"
#     to "packages/obsolete/classpath/files/gconf_version.patch"
# 
# rename "packages/jamvm/jamvm/jamvm-1.3.1-size-defaults.patch"
#     to "packages/jamvm/files/jamvm-1.3.1-size-defaults.patch"
# 
# rename "packages/jamvm/jamvm-1.3.0"
#     to "packages/obsolete/jamvm/jamvm-1.3.0"
# 
# rename "packages/jamvm/jamvm_1.3.0.bb"
#     to "packages/obsolete/jamvm/jamvm_1.3.0.bb"
# 
# rename "packages/jamvm/jamvm_1.3.1.bb"
#     to "packages/obsolete/jamvm/jamvm_1.3.1.bb"
# 
# rename "packages/jamvm/jamvm_1.3.2.bb"
#     to "packages/obsolete/jamvm/jamvm_1.3.2.bb"
# 
# rename "packages/jamvm/jamvm_1.4.1.bb"
#     to "packages/obsolete/jamvm/jamvm_1.4.1.bb"
# 
# rename "packages/ppp-dsl/dsl-provider"
#     to "packages/ppp-dsl/files/dsl-provider"
# 
# rename "packages/ppp-dsl/ppp_on_boot.dsl"
#     to "packages/ppp-dsl/files/ppp_on_boot.dsl"
# 
# rename "packages/quilt/files/install.patch"
#     to "packages/quilt/quilt-0.45/install.patch"
# 
# rename "packages/quilt/quilt-0.39"
#     to "packages/obsolete/quilt/quilt-0.39"
# 
# rename "packages/quilt/quilt-0.45/non-gnu.patch"
#     to "packages/quilt/files/non-gnu.patch"
# 
# rename "packages/quilt/quilt-native_0.39.bb"
#     to "packages/obsolete/quilt/quilt-native_0.39.bb"
# 
# rename "packages/quilt/quilt_0.39.bb"
#     to "packages/obsolete/quilt/quilt_0.39.bb"
# 
# rename "packages/quilt/quilt_0.39.inc"
#     to "packages/obsolete/quilt/quilt_0.39.inc"
# 
# add_dir "packages/gpsdrive/gpsdrive-pda"
# 
# add_dir "packages/obsolete/classpath"
# 
# add_dir "packages/obsolete/classpath/files"
# 
# add_dir "packages/obsolete/jamvm"
# 
# add_dir "packages/obsolete/jamvm/files"
# 
# add_dir "packages/obsolete/quilt"
# 
# add_dir "packages/pngcrush"
# 
# add_dir "packages/ppp/ppp-gprs"
# 
# add_dir "packages/ppp/ppp-gprs/chats"
# 
# add_dir "packages/ppp/ppp-gprs/peers"
# 
# add_dir "packages/ppp-dsl/files"
# 
# add_dir "packages/quilt/quilt-0.46"
# 
# add_dir "packages/vsftpd/vsftpd-charconv-2.0.5"
# 
# add_file "packages/cacao/cacao-cldc.inc"
#  content [d3ea647ce467d4d617b4ce6b05fb6270e58fda61]
# 
# add_file "packages/cacao/cacao_0.98+hg20071001.bb"
#  content [d618915c42d4979c7f29cc99c5014d3bc2d99c50]
# 
# add_file "packages/cacao/cacaoh-native.inc"
#  content [b5ccb2775f6560095089e77316fc173dd4abc9c5]
# 
# add_file "packages/cacao/cacaoh-native_0.98+hg20071001.bb"
#  content [3e9914f2a492d38de75e478cba4c16addca80a06]
# 
# add_file "packages/cacao/files/cacao-0.98+hg-arm-cacheflush-workaround.patch"
#  content [b4231277ce3d268059eaa141886c615a2dac0fc5]
# 
# add_file "packages/cacao/files/cacao-0.98+hg-attachthread.patch"
#  content [8c2c1d3d004946d41425dd8ce6e7c4602fa41437]
# 
# add_file "packages/cacao/files/cacao-0.98+svn-classpath_var.patch"
#  content [3ba0b66a46c0306ff811d3930f646fe0074b7477]
# 
# add_file "packages/cacao/files/cacao-0.98+svn-libdir.diff"
#  content [b97c32544ee97fef51a7222eb879ce6e68e3d1d4]
# 
# add_file "packages/classpath/classpath-minimal_0.96.1.bb"
#  content [e55ff8e0007e4814498b21013d19e63123d425ee]
# 
# add_file "packages/classpath/classpath.inc"
#  content [f89bbf74a4b188100d82872ac4cea3f094bafca9]
# 
# add_file "packages/classpath/classpath_0.95.bb"
#  content [d2f820a6ce35613717c16b3612ca071f4d918e83]
# 
# add_file "packages/classpath/classpath_0.96.1.bb"
#  content [d2f820a6ce35613717c16b3612ca071f4d918e83]
# 
# add_file "packages/gpsdrive/gpsdrive-pda/makefile.patch"
#  content [c2473ec4972d5084e6249e8d896b9ecca57cbf54]
# 
# add_file "packages/gpsdrive/gpsdrive-pda_2.10pre2.bb"
#  content [29c061374aefcc591a87829d659fc50cdc3acefa]
# 
# add_file "packages/jamvm/jamvm.inc"
#  content [5edcfc7c22cf4daf00c3d364962aa42af749237e]
# 
# add_file "packages/jamvm/jamvm_1.5.0.bb"
#  content [645cab3c8ecedf36901ba0d416cb8956c85f04b1]
# 
# add_file "packages/linux/linux-2.6.23/kallsyms-missing-include.patch"
#  content [4e0b600719116634929705c1b57bde66c11c7a2f]
# 
# add_file "packages/obsolete/jamvm/files/jamvm-1.3.1-size-defaults.patch"
#  content [87b384507b8adbd40cca46154ac6911a8a79c4d6]
# 
# add_file "packages/pngcrush/pngcrush-native_1.6.4.bb"
#  content [0c0ea8c7613f6d0177ff82807f6f30883858aebd]
# 
# add_file "packages/pngcrush/pngcrush_1.6.4.bb"
#  content [97eadbe6dc00b130393dc9fa876e44980ee6dad5]
# 
# add_file "packages/ppp/ppp-gprs/chats/chat-gprs"
#  content [3c17c4742880eb980b1f32c5bfb8ec89be225b16]
# 
# add_file "packages/ppp/ppp-gprs/peers/_gprs"
#  content [b8d56b83b8ed0db469e296a2adb24896adf7ebf3]
# 
# add_file "packages/ppp/ppp-gprs/peers/_gprs-ap-internet"
#  content [7ec04eac6aae50cf06036988b2d63e7f754abcd2]
# 
# add_file "packages/ppp/ppp-gprs_1.0.bb"
#  content [698b8ad36ea9b264cbdc9d217158f578b0635aaf]
# 
# add_file "packages/quilt/quilt-0.46/aclocal.patch"
#  content [ccc9f868c7adc5563ec7c822d1612d06662d62f0]
# 
# add_file "packages/quilt/quilt-0.46/install.patch"
#  content [b821f6cd66eca792042c080bc1e0e8410ede1e41]
# 
# add_file "packages/quilt/quilt-native_0.46.bb"
#  content [1b9a395ef79efd98777f42c6b6d0a14688f00c8f]
# 
# add_file "packages/quilt/quilt_0.46.bb"
#  content [3045f450628e75b65e19e531f085bd587c17bf41]
# 
# add_file "packages/rp-pppoe/rp-pppoe-3.8/dont-swallow-errors.patch"
#  content [4ca15864a833bc6abfdf0c03ffab5d3c5269862d]
# 
# add_file "packages/vsftpd/vsftpd-charconv-2.0.5/vsftpd-charconv.patch"
#  content [cdc10852ee931d281c723603f3ca9a03d6a4aa12]
# 
# add_file "packages/vsftpd/vsftpd-charconv_2.0.5.bb"
#  content [b18d90a8c25102a694d9e0674e76a1fa58e240c2]
# 
# patch "packages/cacao/cacao-cldc_0.98.bb"
#  from [30dc5f90b7c873db39b062938df364519af3816b]
#    to [7a579745f970088319acb19f5f2f1ab814666abf]
# 
# patch "packages/cacao/cacao.inc"
#  from [d8bc9087bb9ca79854ffb1d26ff94e4bafea0159]
#    to [51c2d3e8fe9d317751a001037be7b6061a61b276]
# 
# patch "packages/cacao/cacaoh-cldc-native_0.98.bb"
#  from [5b676e0ee5aa6d0369047b0842da204b9aee2143]
#    to [cc2ee6f43a136dc2ba76ed7bea4fec2f935c6fdb]
# 
# patch "packages/jamvm/jamvm_1.4.5.bb"
#  from [d3200cc6d653922acc3679bbb1ca8a3c97b8e67b]
#    to [d778d272861de9bf5a6bc422f452f11f0e078df7]
# 
# patch "packages/jikes/jikes-initial.bb"
#  from [ccc5500cd108638a643a49a0af8fb6fb71ff6e8b]
#    to [acb7ab273c93fa5264bb5d431ef94cf91cb08c8b]
# 
# patch "packages/midpath/midpath-cldc-native_0.1.bb"
#  from [876ed1db01ef361d0403dfa49aa970522a41661d]
#    to [d64ba8f09d50ebb96843da8f4964ad681eaa163a]
# 
# patch "packages/midpath/midpath-cldc-x11_0.1.bb"
#  from [fa9d3d7fe3f54287c26f6d9e57241640e7edf920]
#    to [0c3c6192bfffb9e6b32dfd1e9953519ba473c133]
# 
# patch "packages/midpath/midpath-cldc_0.1.bb"
#  from [207ecb961824e78d5556506fd417a98aec0cdeba]
#    to [1c7d1a97f62b6096cc25b16d15f1178e5b9cc402]
# 
# patch "packages/midpath/midpath.inc"
#  from [5390ede5a215319620bb1df840e3383b3308e5be]
#    to [4ec39c10e6cf8f56277e239747ebd3f4809d0ba5]
# 
# patch "packages/ppp-dialin/ppp-dialin_0.1.bb"
#  from [f4333082495bb63c50b8db64800d2ecba27c6405]
#    to [e838c3f9f295491e08c1860d566389a718c6cb46]
# 
# patch "packages/ppp-dsl/ppp-dsl_0.1.bb"
#  from [8b0fd04cb574caa5fcd9d34c742789a19b9d0de4]
#    to [06eb87eb8e23416d02759d02f5b8733d517967c8]
# 
# patch "packages/quilt/quilt-native.inc"
#  from [8745ec800da185c3a83b466b7265c099e2ff3d3d]
#    to [367967333d8a9ba352ec4ff387843a19293b7c2c]
# 
# patch "packages/quilt/quilt-native_0.45.bb"
#  from [2331affab68253b1fa2bc9cb673aba72b45e9eb0]
#    to [1b9a395ef79efd98777f42c6b6d0a14688f00c8f]
# 
# patch "packages/quilt/quilt-package.inc"
#  from [6c3059863a33e504cbe199c672100fa271383b5f]
#    to [a242c39bf9c9973c0f64ad7a6e1d5cf3892f09fc]
# 
# patch "packages/quilt/quilt.inc"
#  from [3fcab8b0e414d12021ebd2b2f40168412f4ad8d0]
#    to [ba830afc24cbfc119251f97b3fe64e37bb5c7dfd]
# 
# patch "packages/quilt/quilt_0.45.bb"
#  from [8f756223ce9e287788362df20a70a06d5c21b2c0]
#    to [3045f450628e75b65e19e531f085bd587c17bf41]
# 
# patch "packages/rp-pppoe/rp-pppoe_3.8.bb"
#  from [f96008f57859c05eee60eee5a53f342d0d5ae18a]
#    to [f8ae220f213a955ff0c2de626b2b8af37d1481c0]
# 
# patch "site/arm-linux"
#  from [641c4cf99a3af4480173b3d79e47be6ff22c8c93]
#    to [e8c70e76869b6a3fc4d35dfe9beb6db6d0de7c99]
# 
============================================================
--- packages/cacao/cacao-cldc.inc	d3ea647ce467d4d617b4ce6b05fb6270e58fda61
+++ packages/cacao/cacao-cldc.inc	d3ea647ce467d4d617b4ce6b05fb6270e58fda61
@@ -0,0 +1,64 @@
+DESCRIPTION = "Cacao-cldc is a Java Virtual Machine, which uses MIDPath CLDC as default Java core library"
+HOMEPAGE = "http://www.cacaojvm.org/"
+LICENSE  = "GPL"
+PRIORITY = "optional"
+SECTION  = "interpreters"
+
+DEPENDS = "zlib libtool classpath midpath-cldc cacaoh-cldc-native virtual/javac-native"
+
+# Avoid version number here, otherwise dpkg will expect a package name
+# and cannot be satisfied with a package that provides classpath.
+RDEPENDS = "midpath-cldc"
+
+PROVIDES = "cacao-cldc virtual/java-cldc"
+RPROVIDES_cacao-cldc = "java-cldc-runtime"
+
+inherit autotools update-alternatives
+
+EXTRA_OECONF = "\
+	${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \
+	--enable-debug \
+	--enable-jni \
+	--disable-libjvm \
+	--enable-java=cldc1.1 \
+	--with-classpath=cldc1.1 \
+	--with-classpath-classes=${STAGING_DATADIR}/midpath-cldc/midpath-cldc1.1.jar \
+	--with-target-classpath-classes=${datadir}/midpath-cldc/midpath-cldc1.1.jar \
+	--with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh-cldc-${PV} \
+	--with-classpath-libdir=${STAGING_LIBDIR}/classpath \
+	--with-classpath-includedir=${STAGING_INCDIR}/classpath \
+	--with-vm-zip=${datadir}/cacao-cldc/vm.zip \
+	--libdir=${libdir}/cacao-cldc \
+	--program-suffix=-cldc \
+	"
+
+S = "${WORKDIR}/cacao-${PV}"
+
+PACKAGES = "${PN} ${PN}-doc ${PN}-dbg"
+
+FILES_${PN} = "${bindir}/${PN} ${libdir}/lib*.so* ${datadir}/${PN}"
+FILES_${PN}-doc = "${datadir}/man"
+FILES_${PN}-dbg = "${bindir}/.debug ${libdir}/.debug/lib*.so*"
+
+ALTERNATIVE_NAME = "java-cldc"
+ALTERNATIVE_LINK = "${bindir}/${ALTERNATIVE_NAME}"
+ALTERNATIVE_PATH = "${bindir}/cacao-cldc"
+ALTERNATIVE_PRIORITY = "10"
+
+do_configure_prepend() {
+  # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory
+  # configured in OE.
+  if [ -e src/vm/properties.c ]; then
+    sed -i -e "s|OE_LIBDIR_JNI|${libdir}/jni|" src/vm/properties.c
+  fi
+
+  if [ -e src/vm/properties.c ]; then
+    sed -i -e "s|OE_LIBDIR_JNI|${libdir}/jni|" src/vm/vm.c
+  fi
+}
+
+do_configure_append() {
+  # Fix the executable name in the wrapper script.
+  sed -i -e "s|exec cacao|exec cacao-cldc|" src/scripts/java.in
+}
+
============================================================
--- packages/cacao/cacao_0.98+hg20071001.bb	d618915c42d4979c7f29cc99c5014d3bc2d99c50
+++ packages/cacao/cacao_0.98+hg20071001.bb	d618915c42d4979c7f29cc99c5014d3bc2d99c50
@@ -0,0 +1,16 @@
+require cacao.inc
+
+PR = "r5"
+
+SRC_URI = "\
+        http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518 \
+        file://cacao-0.98+svn-libdir.diff;patch=1 \
+        file://cacao-0.98+svn-classpath_var.patch;patch=1 \
+        file://cacao-0.98+hg-arm-cacheflush-workaround.patch;patch=1 \
+        file://cacao-0.98+hg-attachthread.patch;patch=1 \
+        "
+
+EXTRA_OECONF += "\
+    --enable-annotations \
+		"
+
============================================================
--- packages/cacao/cacaoh-native.inc	b5ccb2775f6560095089e77316fc173dd4abc9c5
+++ packages/cacao/cacaoh-native.inc	b5ccb2775f6560095089e77316fc173dd4abc9c5
@@ -0,0 +1,28 @@
+DESCRIPTION = "Header generator for Cacao JVM - Needed for cross-compilation builds"
+HOMEPAGE = "http://www.cacaojvm.org/"
+LICENSE  = "GPL"
+
+DEPENDS = "libtool-native zlib-native virtual/javac-native classpath-native"
+
+S = "${WORKDIR}/cacao-${PV}"
+
+PR = "r1"
+
+inherit autotools
+inherit native
+
+EXTRA_OECONF = " \
+    --with-classpath-includedir=${STAGING_INCDIR}/classpath \
+    --with-classpath-classes=${STAGING_DATADIR}/classpath/glibj.zip \
+    "
+
+do_compile() {
+  # Compile the header generator only (and what is needed for it).
+  oe_runmake -C src/toolbox libtoolbox.la
+  oe_runmake -C src/vmcore libvmcore.la
+  oe_runmake -C src/cacaoh cacaoh
+}
+
+do_stage() {
+	install -m 0755 src/cacaoh/.libs/cacaoh ${STAGING_BINDIR}/cacaoh-${PV}
+}
============================================================
--- packages/cacao/cacaoh-native_0.98+hg20071001.bb	3e9914f2a492d38de75e478cba4c16addca80a06
+++ packages/cacao/cacaoh-native_0.98+hg20071001.bb	3e9914f2a492d38de75e478cba4c16addca80a06
@@ -0,0 +1,5 @@
+require cacaoh-native.inc
+
+SRC_URI = "http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518"
+
+
============================================================
--- packages/cacao/files/cacao-0.98+hg-arm-cacheflush-workaround.patch	b4231277ce3d268059eaa141886c615a2dac0fc5
+++ packages/cacao/files/cacao-0.98+hg-arm-cacheflush-workaround.patch	b4231277ce3d268059eaa141886c615a2dac0fc5
@@ -0,0 +1,50 @@
+Index: cacao-0.98+hg7750/src/vm/jit/arm/asmpart.S
+===================================================================
+--- cacao-0.98+hg7750.orig/src/vm/jit/arm/asmpart.S	2007-11-28 10:14:51.000000000 +0100
++++ cacao-0.98+hg7750/src/vm/jit/arm/asmpart.S	2007-11-28 10:15:31.000000000 +0100
+@@ -302,35 +302,21 @@
+ *                                                                              *
+ *******************************************************************************/
+ 
+-.equ sys_cacheflush,__ARM_NR_cacheflush /* syscall number for cache flushing  */
+-
++.equ sys_cacheflush, 0x9f0002
+ asm_cacheflush:
+-	add   a1, a0, a1
+-	mov   a2, #0
+-
+-#if defined(__ARM_EABI__)
+-	/* According to EABI, the syscall number should be passed via R7,
+-	   see "http://wiki.debian.org/ArmEabiPort" for additional details. */
+-
+-	stmfd sp!, {r7}
+-	mov   r7, #0x0f0000
+-	add   r7, r7, #0x000002
+-#endif
++  add   a1, a0, a1
++  mov   a2, #0
+ 
+ #if 0
+-	/* TWISTI: required on %s
>>> DIFF TRUNCATED @ 16K

More information about the Openembedded-commits mailing list