[oe-commits] org.oe.dev merge of '28c74aa25680384c6f311fd8f4123ddb27c1ba65'

mickeyl commit oe at amethyst.openembedded.net
Fri Jun 27 16:12:20 UTC 2008 

merge of '28c74aa25680384c6f311fd8f4123ddb27c1ba65'
     and '77f81ea18669b5c79145faa5f0a96df1d7db3232'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 218274d3d618ee5de9be9d8d43abfc279f552139
ViewMTN: http://monotone.openembedded.org/revision/info/218274d3d618ee5de9be9d8d43abfc279f552139
Files:
1
packages/cacao/files/cacao-0.98+svn-libdir.diff
packages/cacao/files/cacao-hg20080519-classpath_var.patch
packages/cacao/files/cacao-hg20080519-libdir.patch
packages/midpath/files/shellscript.patch
packages/midpath/midpath-alsa_0.1.bb
packages/midpath/midpath-cldc-native_0.1.bb
packages/midpath/midpath-cldc-sdl_0.1.bb
packages/midpath/midpath-cldc-x11_0.1.bb
packages/midpath/midpath-cldc_0.1.bb
packages/midpath/midpath-gtk_0.1.bb
packages/midpath/midpath-pulseaudio_0.1.bb
packages/midpath/midpath-qt3x11_0.1.bb
packages/midpath/midpath-qte_0.1.bb
packages/midpath/midpath-test_0.1.bb
packages/midpath/midpath.inc
packages/midpath/midpath_0.1.bb
packages/obsolete/classpath
packages/obsolete/classpath/classpath-gtk_0.93.bb
packages/obsolete/classpath/classpath-gtk_cvs.bb
packages/obsolete/classpath/classpath-minimal-native_0.93.bb
packages/obsolete/classpath/classpath-minimal-native_0.95.bb
packages/obsolete/classpath/classpath-minimal_0.90.bb
packages/obsolete/classpath/classpath-minimal_0.95.bb
packages/obsolete/classpath/classpath.inc
packages/obsolete/classpath/classpath_0.14.bb
packages/obsolete/classpath/classpath_0.15.bb
packages/obsolete/classpath/classpath_0.17.bb
packages/obsolete/classpath/classpath_0.18.bb
packages/obsolete/classpath/classpath_0.19.bb
packages/obsolete/classpath/classpath_0.20.bb
packages/obsolete/classpath/classpath_cvs.bb
packages/obsolete/classpath/files
packages/obsolete/classpath/files/disable-automake-checks-v2.patch
packages/obsolete/classpath/files/disable-automake-checks.patch
packages/obsolete/classpath/files/fix-endian-arm-floats.patch
packages/obsolete/classpath/files/gconf_version.patch
packages/obsolete/jamvm
packages/obsolete/jamvm/files
packages/obsolete/jamvm/files/jamvm-1.3.1-size-defaults.patch
packages/obsolete/jamvm/jamvm-1.3.0
packages/obsolete/jamvm/jamvm-1.3.0/heap-size.patch
packages/obsolete/jamvm/jamvm_1.3.0.bb
packages/obsolete/jamvm/jamvm_1.3.1.bb
packages/obsolete/jamvm/jamvm_1.3.2.bb
packages/obsolete/jamvm/jamvm_1.4.1.bb
packages/linux/linux-ml403-slab-2.6.x
packages/linux/linux-xilinx-slab
packages/linux/linux-ml403-slab-2.6.x_git.bb
packages/linux/linux-xilinx-slab_git.bb
packages/olsr
packages/olsrd
packages/olsr/olsr_0.3-1.bb
packages/obsolete/olsr/olsr_0.3-1.bb
packages/olsr/olsrd
packages/olsrd/files
packages/olsr/olsrd/0.4.9-httpinfo-makefile.diff
packages/obsolete/olsr/files/0.4.9-httpinfo-makefile.diff
packages/olsr/olsrd/lib.diff
packages/obsolete/olsr/files/lib.diff
packages/olsr/olsrd_0.4.10.bb
packages/obsolete/olsr/olsrd_0.4.10.bb
packages/olsr/olsrd_0.4.8.bb
packages/obsolete/olsr/olsrd_0.4.8.bb
packages/olsr/olsrd_0.4.9.bb
packages/obsolete/olsr/olsrd_0.4.9.bb
packages/olsr/olsrd_cvs.bb
packages/obsolete/olsr/olsrd_cvs.bb
packages/obsolete/olsr
packages/obsolete/olsr/files
packages/cacao/cacao_0.99.1.bb
packages/cacao/cacaoh-native_0.99.1.bb
packages/cacao/files/cacao-0.98+hg20080519-build-java-runtime-library-classes.patch
packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch
packages/midpath/files/0.2+0.3rc1-fix-crlf.patch
packages/midpath/files/configuration_maemo.cfg
packages/midpath/files/configuration_openmoko.cfg
packages/midpath/files/midpath-launcher-j2se
packages/midpath/files/midpath-suitemanager
packages/midpath/files/midpath-suitemanager.desktop
packages/midpath/files/midpath.png
packages/midpath/midpath-backend-alsa_0.2+0.3rc1.bb
packages/midpath/midpath-backend-escher_0.2+0.3rc1.bb
packages/midpath/midpath-backend-esd_0.2+0.3rc1.bb
packages/midpath/midpath-backend-fb_0.2+0.3rc1.bb
packages/midpath/midpath-backend-gtk-hildon_0.2+0.3rc1.bb
packages/midpath/midpath-backend-gtk_0.2+0.3rc1.bb
packages/midpath/midpath-backend-pulseaudio_0.2+0.3rc1.bb
packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb
packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb
packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb
packages/midpath/midpath-backend-sdl_0.2+0.3rc1.bb
packages/midpath/midpath-cldc_0.2+0.3rc1.bb
packages/midpath/midpath-common.inc
packages/midpath/midpath-core_0.2+0.3rc1.bb
packages/midpath/midpath-demos_0.2+0.3rc1.bb
packages/midpath/midpath-jgl_0.2+0.3rc1.bb
packages/midpath/midpath-location_0.2+0.3rc1.bb
packages/midpath/midpath-m3g_0.2+0.3rc1.bb
packages/midpath/midpath-maemo_0.2+0.3rc1.bb
packages/midpath/midpath-messaging_0.2+0.3rc1.bb
packages/midpath/midpath-opengles_0.2+0.3rc1.bb
packages/midpath/midpath-openmoko_0.2+0.3rc1.bb
packages/midpath/midpath-svg_0.2+0.3rc1.bb
packages/midpath/midpath-webservices_0.2+0.3rc1.bb
packages/olsrd/files/olsrd-0.5.5-unbreak-makefile.patch
packages/olsrd/olsrd_0.5.5.bb
classes/cross.bbclass
classes/java.bbclass
conf/distro/chinook-compat.conf
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/slugos.inc
conf/distro/openmoko.conf
conf/machine/xilinx-ml403.conf
packages/cacao/cacao.inc
packages/cacao/cacao_0.98+hg20071001.bb
packages/cacao/cacao_0.98+hg20080519.bb
packages/cacao/cacaoh-native.inc
packages/cacao/cacaoh-native_0.98+hg20071001.bb
packages/cacao/cacaoh-native_0.98+hg20080519.bb
packages/jamvm/jamvm.inc
packages/jamvm/jamvm_1.4.5.bb
packages/jamvm/jamvm_1.5.0.bb
packages/jamvm/jamvm_1.5.1.bb
packages/linux/linux-omap2_git.bb
packages/olsrd/olsrd.inc
packages/olsrd/olsrd_0.5.3.bb
mtn:manual_merge
true
packages/freesmartphone/frameworkd_git.bb
Diffs:

#
# mt diff -r28c74aa25680384c6f311fd8f4123ddb27c1ba65 -r218274d3d618ee5de9be9d8d43abfc279f552139
#
#
#
# delete "packages/cacao/files/cacao-0.98+svn-libdir.diff"
# 
# delete "packages/cacao/files/cacao-hg20080519-classpath_var.patch"
# 
# delete "packages/cacao/files/cacao-hg20080519-libdir.patch"
# 
# delete "packages/midpath/files/shellscript.patch"
# 
# delete "packages/midpath/midpath-alsa_0.1.bb"
# 
# delete "packages/midpath/midpath-cldc-native_0.1.bb"
# 
# delete "packages/midpath/midpath-cldc-sdl_0.1.bb"
# 
# delete "packages/midpath/midpath-cldc-x11_0.1.bb"
# 
# delete "packages/midpath/midpath-cldc_0.1.bb"
# 
# delete "packages/midpath/midpath-gtk_0.1.bb"
# 
# delete "packages/midpath/midpath-pulseaudio_0.1.bb"
# 
# delete "packages/midpath/midpath-qt3x11_0.1.bb"
# 
# delete "packages/midpath/midpath-qte_0.1.bb"
# 
# delete "packages/midpath/midpath-test_0.1.bb"
# 
# delete "packages/midpath/midpath.inc"
# 
# delete "packages/midpath/midpath_0.1.bb"
# 
# delete "packages/obsolete/classpath"
# 
# delete "packages/obsolete/classpath/classpath-gtk_0.93.bb"
# 
# delete "packages/obsolete/classpath/classpath-gtk_cvs.bb"
# 
# delete "packages/obsolete/classpath/classpath-minimal-native_0.93.bb"
# 
# delete "packages/obsolete/classpath/classpath-minimal-native_0.95.bb"
# 
# delete "packages/obsolete/classpath/classpath-minimal_0.90.bb"
# 
# delete "packages/obsolete/classpath/classpath-minimal_0.95.bb"
# 
# delete "packages/obsolete/classpath/classpath.inc"
# 
# delete "packages/obsolete/classpath/classpath_0.14.bb"
# 
# delete "packages/obsolete/classpath/classpath_0.15.bb"
# 
# delete "packages/obsolete/classpath/classpath_0.17.bb"
# 
# delete "packages/obsolete/classpath/classpath_0.18.bb"
# 
# delete "packages/obsolete/classpath/classpath_0.19.bb"
# 
# delete "packages/obsolete/classpath/classpath_0.20.bb"
# 
# delete "packages/obsolete/classpath/classpath_cvs.bb"
# 
# delete "packages/obsolete/classpath/files"
# 
# delete "packages/obsolete/classpath/files/disable-automake-checks-v2.patch"
# 
# delete "packages/obsolete/classpath/files/disable-automake-checks.patch"
# 
# delete "packages/obsolete/classpath/files/fix-endian-arm-floats.patch"
# 
# delete "packages/obsolete/classpath/files/gconf_version.patch"
# 
# delete "packages/obsolete/jamvm"
# 
# delete "packages/obsolete/jamvm/files"
# 
# delete "packages/obsolete/jamvm/files/jamvm-1.3.1-size-defaults.patch"
# 
# delete "packages/obsolete/jamvm/jamvm-1.3.0"
# 
# delete "packages/obsolete/jamvm/jamvm-1.3.0/heap-size.patch"
# 
# delete "packages/obsolete/jamvm/jamvm_1.3.0.bb"
# 
# delete "packages/obsolete/jamvm/jamvm_1.3.1.bb"
# 
# delete "packages/obsolete/jamvm/jamvm_1.3.2.bb"
# 
# delete "packages/obsolete/jamvm/jamvm_1.4.1.bb"
# 
# rename "packages/linux/linux-ml403-slab-2.6.x"
#     to "packages/linux/linux-xilinx-slab"
# 
# rename "packages/linux/linux-ml403-slab-2.6.x_git.bb"
#     to "packages/linux/linux-xilinx-slab_git.bb"
# 
# rename "packages/olsr"
#     to "packages/olsrd"
# 
# rename "packages/olsr/olsr_0.3-1.bb"
#     to "packages/obsolete/olsr/olsr_0.3-1.bb"
# 
# rename "packages/olsr/olsrd"
#     to "packages/olsrd/files"
# 
# rename "packages/olsr/olsrd/0.4.9-httpinfo-makefile.diff"
#     to "packages/obsolete/olsr/files/0.4.9-httpinfo-makefile.diff"
# 
# rename "packages/olsr/olsrd/lib.diff"
#     to "packages/obsolete/olsr/files/lib.diff"
# 
# rename "packages/olsr/olsrd_0.4.10.bb"
#     to "packages/obsolete/olsr/olsrd_0.4.10.bb"
# 
# rename "packages/olsr/olsrd_0.4.8.bb"
#     to "packages/obsolete/olsr/olsrd_0.4.8.bb"
# 
# rename "packages/olsr/olsrd_0.4.9.bb"
#     to "packages/obsolete/olsr/olsrd_0.4.9.bb"
# 
# rename "packages/olsr/olsrd_cvs.bb"
#     to "packages/obsolete/olsr/olsrd_cvs.bb"
# 
# add_dir "packages/obsolete/olsr"
# 
# add_dir "packages/obsolete/olsr/files"
# 
# add_file "packages/cacao/cacao_0.99.1.bb"
#  content [77d2dd2b46672fce71c875cb18b3294166d240cd]
# 
# add_file "packages/cacao/cacaoh-native_0.99.1.bb"
#  content [735253ea956ccb78193fc733b23b31a5a1165186]
# 
# add_file "packages/cacao/files/cacao-0.98+hg20080519-build-java-runtime-library-classes.patch"
#  content [38f9accf44f56287f7683e372455f44dfe294539]
# 
# add_file "packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch"
#  content [d7fa1a4c3af270ef55ee848d341de3e72ac6956b]
# 
# add_file "packages/midpath/files/0.2+0.3rc1-fix-crlf.patch"
#  content [e2fe2e502fdf701edcf42736a566e89e25b18c26]
# 
# add_file "packages/midpath/files/configuration_maemo.cfg"
#  content [255b98514d5ab56d681926d661f9129563a9ae50]
# 
# add_file "packages/midpath/files/configuration_openmoko.cfg"
#  content [afb62e8c73f366d06bcec6427a22932f058f494f]
# 
# add_file "packages/midpath/files/midpath-launcher-j2se"
#  content [d54f49463d53bcd277bc4bc38ded3088dfd17731]
# 
# add_file "packages/midpath/files/midpath-suitemanager"
#  content [ab891efa0c529d05c57d60fcfa67680bd9c4827b]
# 
# add_file "packages/midpath/files/midpath-suitemanager.desktop"
#  content [b22a07ddc55a0312c755d39c550c7938559ba022]
# 
# add_file "packages/midpath/files/midpath.png"
#  content [0e0ca28c3b047cf534b502203a4f10935caa7f7c]
# 
# add_file "packages/midpath/midpath-backend-alsa_0.2+0.3rc1.bb"
#  content [5a9ac3fa796df9f8240f29326751cf442d8a2031]
# 
# add_file "packages/midpath/midpath-backend-escher_0.2+0.3rc1.bb"
#  content [97ddeb6db9f9df2b8ddd1aa3a423a6d65cc5d416]
# 
# add_file "packages/midpath/midpath-backend-esd_0.2+0.3rc1.bb"
#  content [1734f85e37c7d74f4907b51c0d26b25a9601adbb]
# 
# add_file "packages/midpath/midpath-backend-fb_0.2+0.3rc1.bb"
#  content [30fccb2caee78d9e6023b5ca9c0fb3ed94d89908]
# 
# add_file "packages/midpath/midpath-backend-gtk-hildon_0.2+0.3rc1.bb"
#  content [02a450559fc1f780d89deae54b136eebe340d09c]
# 
# add_file "packages/midpath/midpath-backend-gtk_0.2+0.3rc1.bb"
#  content [af1920bec51a14a738a6cb77afd27a92d3056d94]
# 
# add_file "packages/midpath/midpath-backend-pulseaudio_0.2+0.3rc1.bb"
#  content [4adbff5f9d74fdb7d507b14249d17a2324ffca9c]
# 
# add_file "packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb"
#  content [3973ded34b696092b34b03f4883501088965b583]
# 
# add_file "packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb"
#  content [b41941b0d420980c4211a1fa04fd53db33d07f92]
# 
# add_file "packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb"
#  content [966b5d88b9928c4b7654a06ca0c5250612b72485]
# 
# add_file "packages/midpath/midpath-backend-sdl_0.2+0.3rc1.bb"
#  content [908469b9d701fe9267ac78045224b2b610e16606]
# 
# add_file "packages/midpath/midpath-cldc_0.2+0.3rc1.bb"
#  content [59981382d678ee15db4475fe1e7e813dcdfdf08d]
# 
# add_file "packages/midpath/midpath-common.inc"
#  content [14a005fc4dd620923c12ac776ffe5f5699b4a99d]
# 
# add_file "packages/midpath/midpath-core_0.2+0.3rc1.bb"
#  content [09728d2f8f1a69e01b9d23a577ef242c50b1fa30]
# 
# add_file "packages/midpath/midpath-demos_0.2+0.3rc1.bb"
#  content [004604df0eff815bab65202dedd1ed65286194f4]
# 
# add_file "packages/midpath/midpath-jgl_0.2+0.3rc1.bb"
#  content [c7519cfdb835caa74390ab07c4cd56baed5f34ec]
# 
# add_file "packages/midpath/midpath-location_0.2+0.3rc1.bb"
#  content [fca557d175ddb8619e45f8c4b0ad185bd32fea19]
# 
# add_file "packages/midpath/midpath-m3g_0.2+0.3rc1.bb"
#  content [fef1bde51da84d602b679e27b624fa7fb6356104]
# 
# add_file "packages/midpath/midpath-maemo_0.2+0.3rc1.bb"
#  content [f5b98891467125cf75b57bac12ab48669df28abb]
# 
# add_file "packages/midpath/midpath-messaging_0.2+0.3rc1.bb"
#  content [442bcb43ab621f866b866e95d4391d60cac243e3]
# 
# add_file "packages/midpath/midpath-opengles_0.2+0.3rc1.bb"
#  content [c883bb3cc1bf4ab772a9bc67b4505c92d0704244]
# 
# add_file "packages/midpath/midpath-openmoko_0.2+0.3rc1.bb"
#  content [e1410520d2792c203276eda7e54f0aeb09022bb5]
# 
# add_file "packages/midpath/midpath-svg_0.2+0.3rc1.bb"
#  content [96d84d878cce8a3f1037710e462bfb2d5646fa93]
# 
# add_file "packages/midpath/midpath-webservices_0.2+0.3rc1.bb"
#  content [7c5673da8cfed80575a162800d7a8be50a1421a5]
# 
# add_file "packages/midpath/midpath.inc"
#  content [bbd8de795b0634df04f70c00fe1c7a521c748af9]
# 
# add_file "packages/olsrd/files/olsrd-0.5.5-unbreak-makefile.patch"
#  content [0c3306bd488eb3d0a568b958cd95d687ed861093]
# 
# add_file "packages/olsrd/olsrd_0.5.5.bb"
#  content [db0fac618a0ddb0c4919ccc4c25524f3d182915c]
# 
# patch "classes/cross.bbclass"
#  from [504bbe85b9aae389cdf483045310b7f26d7a5fb4]
#    to [bdd50d7b0204dc37533449d262a744351c880e4e]
# 
# patch "classes/java.bbclass"
#  from [1cbaed96d4ed2a16236caaec74121c841339d213]
#    to [b532379bffd3d641d6a9c12fac7bb67f1b08e4fc]
# 
# patch "conf/distro/chinook-compat.conf"
#  from [576a8c254f5676e6cb52f2b2a4b80e52a03f0c50]
#    to [82f061f680e83ac8f98ea7c468da6ace94ccba60]
# 
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [96e99822b9d459465b271b5dfd924834b9d2cbfc]
#    to [86c6deec69ab2484f030158e16522ad45e745bd8]
# 
# patch "conf/distro/include/slugos.inc"
#  from [e9937cb440d5d5eb38f1c6255cb3f69aa58b60cc]
#    to [00976339770c45e02a1ecc25cf9066a2c866eeea]
# 
# patch "conf/distro/openmoko.conf"
#  from [57d6f40fc1f078d76f0824c8db3fa6facd01e0cb]
#    to [56485e49938379e78da05fc595ef5d2edef9dd28]
# 
# patch "conf/machine/xilinx-ml403.conf"
#  from [6a5a1fcae1d1b17467cc67066deb5c97c1437fc8]
#    to [0e140654c8328017be93eae75e53f91d1209746f]
# 
# patch "packages/cacao/cacao.inc"
#  from [d1fb162242cfc59d0aecad7027643cdec90b4b4d]
#    to [44ce965971f392ff3be288e7b9b3f44fd01a5c69]
# 
# patch "packages/cacao/cacao_0.98+hg20071001.bb"
#  from [ac5e51b47c7d3446078d237ac95abd0fa9c668cc]
#    to [9bdf5633757ed3e83764bf8121e01f802736554c]
# 
# patch "packages/cacao/cacao_0.98+hg20080519.bb"
#  from [a332104661010fe20cb8578a21fb16b673c5c620]
#    to [5c4f74fc7111b80123ecb3ab8be61501ede860d3]
# 
# patch "packages/cacao/cacaoh-native.inc"
#  from [21cb933b74df6d2ac41c9593d5df8f193f74b51a]
#    to [06a21012229abcbca5aa890afb2b237bc77937e1]
# 
# patch "packages/cacao/cacaoh-native_0.98+hg20071001.bb"
#  from [3e9914f2a492d38de75e478cba4c16addca80a06]
#    to [e9242a3e16739aaaeb267e1ab74325bde03eb70c]
# 
# patch "packages/cacao/cacaoh-native_0.98+hg20080519.bb"
#  from [887b06266366e3ca536ec57e0200f64db2cf6e0f]
#    to [c0c91cc0955b5171cfbf9e995b61a14e9184a172]
# 
# patch "packages/jamvm/jamvm.inc"
#  from [1eb0be17dafb30f822a0fad779c2d82f62088d2a]
#    to [640f0c3f79be256ead95d73fcfc672b3fd0c38c1]
# 
# patch "packages/jamvm/jamvm_1.4.5.bb"
#  from [d778d272861de9bf5a6bc422f452f11f0e078df7]
#    to [2e7505c1c3fa6ab089373e42f05a3b599286adc3]
# 
# patch "packages/jamvm/jamvm_1.5.0.bb"
#  from [7f3f0abf4aff253a69554613cd74fe49da01168d]
#    to [b885a44f2addd426cddbfa4e5af582a53b25eb59]
# 
# patch "packages/jamvm/jamvm_1.5.1.bb"
#  from [34c70036ace803ee38b54d6bdf1596e7a3d6345d]
#    to [7f3f0abf4aff253a69554613cd74fe49da01168d]
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [c5bedfacc57570fe043dfe40dad87e1a42afba5f]
#    to [7fd2a3ff9f7cc0c8fb1e02633369915d8aa32c3e]
# 
# patch "packages/linux/linux-xilinx-slab_git.bb"
#  from [1dedc8ec0ccb14b25d9979db1e4af75c63668f9a]
#    to [b4322bd352236d2cf6ff13d326e765337da3772d]
# 
# patch "packages/olsrd/olsrd.inc"
#  from [78cbd7651bec0ee6e127917dad1568ddb2753ee0]
#    to [678b2932aeaa3f061646a45877c30c43f3d8730b]
# 
# patch "packages/olsrd/olsrd_0.5.3.bb"
#  from [f8e759edd3dec4ca996ca63d822d1e729d4153c0]
#    to [ffe35cfb201ec0dfb21115b29d402e4d43eefacc]
# 
#   set "packages/midpath/files/midpath.png"
#  attr "mtn:manual_merge"
# value "true"
#
============================================================
--- packages/cacao/cacao_0.99.1.bb	77d2dd2b46672fce71c875cb18b3294166d240cd
+++ packages/cacao/cacao_0.99.1.bb	77d2dd2b46672fce71c875cb18b3294166d240cd
@@ -0,0 +1,14 @@
+require cacao.inc
+
+PR = "r0"
+
+SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d \
+           file://cacao-${PV}-build-java-runtime-library-classes.patch;patch=1 \
+          "
+
+# Quirks for Nokia N800:
+# - with mfloat-abi=softfp the runtime fails to run anything
+# - without --enable-softfloat it cannot find files within Jars
+TARGET_CC_ARCH_nokia800 = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=soft"
+
+EXTRA_OECONF_append_nokia800 = "--enable-softfloat"
============================================================
--- packages/cacao/cacaoh-native_0.99.1.bb	735253ea956ccb78193fc733b23b31a5a1165186
+++ packages/cacao/cacaoh-native_0.99.1.bb	735253ea956ccb78193fc733b23b31a5a1165186
@@ -0,0 +1,5 @@
+require cacaoh-native.inc
+
+PR = "r0"
+
+SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d"
============================================================
--- packages/cacao/files/cacao-0.98+hg20080519-build-java-runtime-library-classes.patch	38f9accf44f56287f7683e372455f44dfe294539
+++ packages/cacao/files/cacao-0.98+hg20080519-build-java-runtime-library-classes.patch	38f9accf44f56287f7683e372455f44dfe294539
@@ -0,0 +1,53 @@
+Index: cacao/configure.ac
+===================================================================
+--- cacao.orig/configure.ac	2008-06-27 01:23:44.000000000 +0200
++++ cacao/configure.ac	2008-06-27 01:24:02.000000000 +0200
+@@ -772,6 +772,7 @@
+ 
+ AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_PREFIX
+ AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_CLASSES
++AC_CHECK_WITH_BUILD_JAVA_RUNTIME_LIBRARY_CLASSES
+ 
+ if test x"${ENABLE_JRE_LAYOUT}" = "xno"; then
+    AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR
+Index: cacao/m4/java-runtime-library.m4
+===================================================================
+--- cacao.orig/m4/java-runtime-library.m4	2008-06-27 01:23:44.000000000 +0200
++++ cacao/m4/java-runtime-library.m4	2008-06-27 01:24:02.000000000 +0200
+@@ -93,20 +93,32 @@
+ AC_DEFINE_UNQUOTED([JAVA_RUNTIME_LIBRARY_CLASSES], "${JAVA_RUNTIME_LIBRARY_CLASSES}", [Java runtime library classes])
+ AC_SUBST(JAVA_RUNTIME_LIBRARY_CLASSES)
+ 
++dnl where are Java core library classes located at compilation time
++
++AC_DEFUN([AC_CHECK_WITH_BUILD_JAVA_RUNTIME_LIBRARY_CLASSES],[
++AC_MSG_CHECKING(where Java core library classes are located at compile time)
++AC_ARG_WITH([build-java-runtime-library-classes],
++            [AS_HELP_STRING(--with-build-java-runtime-library-classes=<path>,path to Java core library classes (includes the name of the file and may be flat) [[default=${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip]])],
++            [BUILD_JAVA_RUNTIME_LIBRARY_CLASSES=${withval}],
++            [BUILD_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip])
++AC_MSG_RESULT(${BUILD_JAVA_RUNTIME_LIBRARY_CLASSES})
++AC_DEFINE_UNQUOTED([BUILD_JAVA_RUNTIME_LIBRARY_CLASSES], "${BUILD_JAVA_RUNTIME_LIBRARY_CLASSES}", [Java core library classes at compile time])
++AC_SUBST(BUILD_JAVA_RUNTIME_LIBRARY_CLASSES)
++])
++
+ dnl define BOOTCLASSPATH for Makefiles
+ case "${WITH_JAVA_RUNTIME_LIBRARY}" in
+     cldc1.1 | gnuclasspath)
+-        BOOTCLASSPATH="\$(top_builddir)/src/classes/classes:\$(JAVA_RUNTIME_LIBRARY_CLASSES)"
++        BOOTCLASSPATH="\$(top_builddir)/src/classes/classes:\$(BUILD_JAVA_RUNTIME_LIBRARY_CLASSES)"
+         ;;
+     *)
+-        BOOTCLASSPATH="\$(JAVA_RUNTIME_LIBRARY_CLASSES)"
++        BOOTCLASSPATH="\$(BUILD_JAVA_RUNTIME_LIBRARY_CLASSES)"
+         ;;
+ esac
+ AC_SUBST(BOOTCLASSPATH)
+ ])
+ 
+-
+-dnl where are Java runtime library native libraries installed
++dnl where are Java runtime library native libraries installed (at compilation time)
+ 
+ AC_DEFUN([AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR],[
+ AC_MSG_CHECKING(where Java runtime library native libraries are installed)
============================================================
--- packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch	d7fa1a4c3af270ef55ee848d341de3e72ac6956b
+++ packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch	d7fa1a4c3af270ef55ee848d341de3e72ac6956b
@@ -0,0 +1,51 @@
+diff -r 8484332b813c configure.ac
+--- a/configure.ac	Sun Jun 22 18:19:54 2008 +0200
++++ b/configure.ac	Mon Jun 23 08:53:17 2008 +0200
+@@ -550,6 +550,7 @@
+ 
+ AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_PREFIX
+ AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_CLASSES
++AC_CHECK_WITH_BUILD_JAVA_RUNTIME_LIBRARY_CLASSES
+ 
+ if test x"${ENABLE_JRE_LAYOUT}" = "xno"; then
+    AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR
+diff -r 8484332b813c m4/jav%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -r77f81ea18669b5c79145faa5f0a96df1d7db3232 -r218274d3d618ee5de9be9d8d43abfc279f552139
#
#
#
# patch "packages/freesmartphone/frameworkd_git.bb"
#  from [674c4ebb890b3779108c1a9fe1cd2caee70c1201]
#    to [9ee16ebd42adf0a37443b1d2dc9fc0638368597e]
#
============================================================
--- packages/freesmartphone/frameworkd_git.bb	674c4ebb890b3779108c1a9fe1cd2caee70c1201
+++ packages/freesmartphone/frameworkd_git.bb	9ee16ebd42adf0a37443b1d2dc9fc0638368597e
@@ -5,7 +5,7 @@ PV = "0.8.0+gitr${SRCREV}"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
 PV = "0.8.0+gitr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 inherit distutils update-rc.d
 
@@ -30,6 +30,7 @@ RDEPENDS_${PN} += "\
   python-pygobject \
   python-pyrtc \
   python-pyserial \
+  python-shell \
   python-syslog \
 "

More information about the Openembedded-commits mailing list