[oe-commits] org.oe.dev merge of 'be23a3d9c964660487451387d6318c3915ad5b51'

thebohemian commit oe at amethyst.openembedded.net
Fri May 23 14:55:57 UTC 2008 

merge of 'be23a3d9c964660487451387d6318c3915ad5b51'
     and 'd84d3829b2f6a4c1d1cb91496cd7ffa088ed323f'

Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: 12f1208ddddebc7934d98fcac3f803d022a1ba28
ViewMTN: http://monotone.openembedded.org/revision/info/12f1208ddddebc7934d98fcac3f803d022a1ba28
Files:
1
packages/glibmm/glibmm_2.14.2.bb
packages/glibmm/glibmm_2.12.10.bb
packages/glibmm/glibmm_2.16.2.bb
packages/mtools/mtools-native_3.9.9.bb
packages/mtools/mtools-native_3.9.11.bb
packages/mtools/mtools_3.9.9.bb
packages/mtools/mtools_3.9.11.bb
packages/rt-tests/rt-tests_0.19.bb
packages/rt-tests/rt-tests_0.21.bb
packages/syslinux/syslinux-native_3.36.bb
packages/syslinux/syslinux-native_3.63.bb
contrib/mtn-bisect.sh
packages/acpid/acpid_1.0.6.bb
packages/cacao/cacao_0.98+hg20080519.bb
packages/cacao/cacaoh-native_0.98+hg20080519.bb
packages/cacao/files/cacao-hg20080519-classpath_var.patch
packages/cacao/files/cacao-hg20080519-libdir.patch
packages/ctorrent/ctcs_1.4.1.bb
packages/ctorrent/ctorrent_3.3.1.bb
packages/linux/linux-omap2-git/beagleboard/00001-mcbsp-transform.patch
packages/linux/linux-omap2-git/beagleboard/00002-mcbsp-omap1.patch
packages/linux/linux-omap2-git/beagleboard/00003-mcbsp-omap3-clock.patch
packages/linux/linux-omap2-git/beagleboard/00004-omap2-mcbsp.patch
packages/linux/linux-omap2-git/beagleboard/0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch
packages/u-boot/files/sffsdr-u-boot.patch
packages/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch
classes/base.bbclass
classes/devshell.bbclass
classes/gtk-icon-cache.bbclass
classes/image.bbclass
classes/oestats-client.bbclass
conf/bitbake.conf
packages/ctorrent/ctorrent.inc
packages/dsplink/dsplink_1.50.bb
packages/efl1/ecore-native_cvs.bb
packages/efl1/ecore.inc
packages/efl1/ecore_cvs.bb
packages/efl1/edb_cvs.bb
packages/efl1/edbus_cvs.bb
packages/efl1/edje_cvs.bb
packages/efl1/eet_cvs.bb
packages/efl1/efreet_cvs.bb
packages/efl1/embryo_cvs.bb
packages/efl1/esmart_cvs.bb
packages/efl1/evas-native_cvs.bb
packages/efl1/evas.inc
packages/efl1/evas_cvs.bb
packages/glibc/eglibc_svn.bb
packages/glibc/glibc-package.bbclass
packages/glibc/glibc_2.2.5.bb
packages/glibc/glibc_2.3.2+cvs20040726.bb
packages/glibc/glibc_2.3.2.bb
packages/glibc/glibc_2.3.3+cvs20041128.bb
packages/glibc/glibc_2.3.3+cvs20050221.bb
packages/glibc/glibc_2.3.3+cvs20050420.bb
packages/glibc/glibc_2.3.3.bb
packages/glibc/glibc_2.3.5+cvs20050627.bb
packages/glibc/glibc_2.4.bb
packages/glibc/glibc_2.5.bb
packages/glibc/glibc_2.6.1.bb
packages/glibc/glibc_2.7.bb
packages/glibc/glibc_cvs.bb
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2_git.bb
packages/linux-libc-headers/linux-libc-headers.inc
packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb
packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb
packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
packages/mtd/mtd-utils_1.1.0.bb
packages/python/python-efl.inc
packages/python/python_2.5.2.bb
packages/samba/samba-essential_3.0.20.bb
packages/samba/samba.inc
packages/samba/samba_3.0.10.bb
packages/samba/samba_3.0.14a.bb
packages/samba/samba_3.0.20.bb
packages/samba/samba_3.0.23c.bb
packages/samba/samba_3.0.5.bb
packages/samba/samba_3.0.9.bb
packages/startup-notification/startup-notification_0.8.bb
packages/u-boot/u-boot_git.bb
packages/vnc/x11vnc_0.9.3.bb
packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
mtn:execute
true
conf/distro/chinook-compat.conf
Diffs:

#
# mt diff -rbe23a3d9c964660487451387d6318c3915ad5b51 -r12f1208ddddebc7934d98fcac3f803d022a1ba28
#
#
#
# delete "packages/glibmm/glibmm_2.14.2.bb"
# 
# rename "packages/glibmm/glibmm_2.12.10.bb"
#     to "packages/glibmm/glibmm_2.16.2.bb"
# 
# rename "packages/mtools/mtools-native_3.9.9.bb"
#     to "packages/mtools/mtools-native_3.9.11.bb"
# 
# rename "packages/mtools/mtools_3.9.9.bb"
#     to "packages/mtools/mtools_3.9.11.bb"
# 
# rename "packages/rt-tests/rt-tests_0.19.bb"
#     to "packages/rt-tests/rt-tests_0.21.bb"
# 
# rename "packages/syslinux/syslinux-native_3.36.bb"
#     to "packages/syslinux/syslinux-native_3.63.bb"
# 
# add_file "contrib/mtn-bisect.sh"
#  content [230e3a1f735e3f6f46b4f117657494175ee86928]
# 
# add_file "packages/acpid/acpid_1.0.6.bb"
#  content [c44a19e28b91e0ba71888ce49af8c2a1e1a36bf4]
# 
# add_file "packages/cacao/cacao_0.98+hg20080519.bb"
#  content [a332104661010fe20cb8578a21fb16b673c5c620]
# 
# add_file "packages/cacao/cacaoh-native_0.98+hg20080519.bb"
#  content [887b06266366e3ca536ec57e0200f64db2cf6e0f]
# 
# add_file "packages/cacao/files/cacao-hg20080519-classpath_var.patch"
#  content [62477b682d6cb20be67ab015423d22c6412ac5f8]
# 
# add_file "packages/cacao/files/cacao-hg20080519-libdir.patch"
#  content [7b12857a339294deb7df47da33c5e9db8290107a]
# 
# add_file "packages/ctorrent/ctcs_1.4.1.bb"
#  content [53b8c816f3d50399e26f9520a6b3f8d6a269fcc8]
# 
# add_file "packages/ctorrent/ctorrent_3.3.1.bb"
#  content [6914eee9fe703d58fb9628578497925236f73475]
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/00001-mcbsp-transform.patch"
#  content [f31603696f1a604d2fc6f2bd863fbda17bf1d04b]
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/00002-mcbsp-omap1.patch"
#  content [7a3f0e554d44ad43bee539b08f1553c6bd221ba4]
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/00003-mcbsp-omap3-clock.patch"
#  content [0535b86a1ff751f854c6f6b9a47caaae5987325c]
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/00004-omap2-mcbsp.patch"
#  content [125c19af3d820d497bf81db6c861752782cba591]
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch"
#  content [c8f4b8935cd2abedc7760cf9594494dc4faa445c]
# 
# add_file "packages/u-boot/files/sffsdr-u-boot.patch"
#  content [67e25c07eec4f1caf5f01ac25be7aee562717fc4]
# 
# add_file "packages/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch"
#  content [0a664afb7d51c2cd332153d72b4d8bd35559d350]
# 
# patch "classes/base.bbclass"
#  from [c242e6f11b981f8ccf61b3c389fc7514c69dd9bc]
#    to [d846aa59ec39d60c1f61a21e2b483cb0350bff34]
# 
# patch "classes/devshell.bbclass"
#  from [778ca888b6de0136d3c80ac91d2fdef0d979e664]
#    to [79c6ae3a2a7283eeb05ffe32a32256370272c15b]
# 
# patch "classes/gtk-icon-cache.bbclass"
#  from [75b805566ae03614fdfdd691b5b9542ed54bf96c]
#    to [328279a52c22c9296f097b015b4b3579453ab3c4]
# 
# patch "classes/image.bbclass"
#  from [4ce2b3c777b457b63352a87b70b325fc84e10644]
#    to [44279bf54f1b30ecbdb1a4c243b766c6d86cd800]
# 
# patch "classes/oestats-client.bbclass"
#  from [2b82de605ebfcc914f36652cbb9c49dce3cd2442]
#    to [9f4ff853acd1082675e4590ab2bfe012dc7e2fc3]
# 
# patch "conf/bitbake.conf"
#  from [0015241781b03dc2f3ac5f831d982fd4e9661b7f]
#    to [1ed88e1003b951952075fb58350fd8c3b2feec06]
# 
# patch "packages/ctorrent/ctorrent.inc"
#  from [4b8fc0a73230f74e56d7a4bff5fdcfd686b5034e]
#    to [bc2471ce8f2f52152c931e02994c6e907fa5287f]
# 
# patch "packages/dsplink/dsplink_1.50.bb"
#  from [a2dba60ef70a6be005343a5420ec39fe0d6b7126]
#    to [ba3fbbc36f80f856194516e3676c4be8ff95593f]
# 
# patch "packages/efl1/ecore-native_cvs.bb"
#  from [454bc7eb7c9a1579123625d9b419ea0982f3b381]
#    to [47c2a5e1692381f93bef6ef8180ff7daaf1a3760]
# 
# patch "packages/efl1/ecore.inc"
#  from [b736e8d906a16691f28e2de920bf7b69469cb020]
#    to [d132e5d100eb3a87ef5d6cb123c586e203ef5143]
# 
# patch "packages/efl1/ecore_cvs.bb"
#  from [8e141a68d3fb8691ee914a2ac970129fe14f8aed]
#    to [db9ceefb6209514dcc2b22c3b7d8e0816820f762]
# 
# patch "packages/efl1/edb_cvs.bb"
#  from [cfec22c11caa4150e22a2640ef1292b5fc9dd9df]
#    to [7d8fdec465a882e0ed9272e63c54cbdfd4aa19d2]
# 
# patch "packages/efl1/edbus_cvs.bb"
#  from [7f6f010883128a2dc595086674f08caa1bf29d74]
#    to [e051cb48a3921952f001b55f34a5f92b4234574a]
# 
# patch "packages/efl1/edje_cvs.bb"
#  from [c97e863a88bf2970d41f1107b5d64b248abf57e0]
#    to [62eea4a4a904f412cb2ae26142d346a3a70cd876]
# 
# patch "packages/efl1/eet_cvs.bb"
#  from [eada78b9148d3a22f1b46d69d3aabbdfe747410c]
#    to [9979a56ebf0921e6b1c374aaf525e1fbdce50a27]
# 
# patch "packages/efl1/efreet_cvs.bb"
#  from [4b80740afd5106d5bc474fa4921c6522ca473d30]
#    to [c7934aa1ab83cf5bde841da90247d731b5dff0de]
# 
# patch "packages/efl1/embryo_cvs.bb"
#  from [d1e3b9f6212724c6df80aec5468b565a407a77bb]
#    to [5e61b438e4ebdca460ac0b5b906d852025c76747]
# 
# patch "packages/efl1/esmart_cvs.bb"
#  from [6502bab7ea2f2d0380e49644e4204603a1395ff1]
#    to [ffe66023913a2de6c11a7669d205c89954fd43c7]
# 
# patch "packages/efl1/evas-native_cvs.bb"
#  from [6187f8e7ba476dd0db7fa8a5c523f6a000d9e5fa]
#    to [6d464a30990003574c9db7b5255cf707856408c4]
# 
# patch "packages/efl1/evas.inc"
#  from [9c61e64a2a646cac813a4701bd1a5c5a4ac16964]
#    to [3832fb27b48f99ab029bbdcd20863a3daa1a3009]
# 
# patch "packages/efl1/evas_cvs.bb"
#  from [82f126668ed700106fce2efb55f6d16c371b4bd1]
#    to [698aa57979dcff374e859909316b7b53c0a2b985]
# 
# patch "packages/glibc/eglibc_svn.bb"
#  from [c35e8bfcdde601cae0e1daac27f6eadc06d385d8]
#    to [693cfbc95cb7166e12ced9da2affddab022ac474]
# 
# patch "packages/glibc/glibc-package.bbclass"
#  from [ad5d2085797fa01b1f94d1ff231db24757badb90]
#    to [cc608cf169b73c5795935b63f2ff1bb56dd743d8]
# 
# patch "packages/glibc/glibc_2.2.5.bb"
#  from [34af38798fe6eb076ee1e44612cfb2e740abf174]
#    to [d3eb7489c6594b3f99cf2bc22dcb08f3ebea954d]
# 
# patch "packages/glibc/glibc_2.3.2+cvs20040726.bb"
#  from [808ed86ced75140a1d3fc3218b2496f9cc4bf940]
#    to [2796a2ca3f43cc68cb8dcab23c538f9d43671bfc]
# 
# patch "packages/glibc/glibc_2.3.2.bb"
#  from [c9271dd5bdf2fac00df5b90d4757176c5c7bb687]
#    to [6ce928a3a50aaa74484d58ca109097ecf56dfdf6]
# 
# patch "packages/glibc/glibc_2.3.3+cvs20041128.bb"
#  from [de5dc3446aa94c3abfdc1f8edff39f19084142f7]
#    to [c52302457e46cbf50f3c743a36911af5c5ef5249]
# 
# patch "packages/glibc/glibc_2.3.3+cvs20050221.bb"
#  from [cb07d9d3c55c4fcfc23ddfe1650281885b9ea5f6]
#    to [6fcb1be9e4e8d1a32a5f67f6c5d828934cc23bfa]
# 
# patch "packages/glibc/glibc_2.3.3+cvs20050420.bb"
#  from [07a49aaf94192d47ee2118328e09b13cf4c5aaa4]
#    to [f54bdcea04b98f19a0b0200969fc2346af827228]
# 
# patch "packages/glibc/glibc_2.3.3.bb"
#  from [94f418faf76e360cb344f13e886941c63faeaa1c]
#    to [a2b16ae14389f9b1f928da2651ce17295e946eb8]
# 
# patch "packages/glibc/glibc_2.3.5+cvs20050627.bb"
#  from [002681533641cc0727653c163caa2b89d9554585]
#    to [e767bb71ec3f4cc71f4c93cb973621df12f2ffa8]
# 
# patch "packages/glibc/glibc_2.4.bb"
#  from [90ea22d4701fd976ebf54996b4f0f0f75fcbcb15]
#    to [06f918a79a1f11a8d3ec0bb653752c014ce40e33]
# 
# patch "packages/glibc/glibc_2.5.bb"
#  from [0df9115aff23a65cf60cf318463e92afd9d4187d]
#    to [1e078613766f3dd8fc94f432bbe07c4e1f98e30f]
# 
# patch "packages/glibc/glibc_2.6.1.bb"
#  from [e44cc81d7e42c307cc3fa0165f19e3c2cc9c1dab]
#    to [157296447567bd27d06a4c65f01df9c9fb53b53d]
# 
# patch "packages/glibc/glibc_2.7.bb"
#  from [0315c4d0fd55ed746d83fbe2e7512ce1dfe46237]
#    to [bb41e38f1cd4eaa7b688b45abf9e3ba2b19d20c8]
# 
# patch "packages/glibc/glibc_cvs.bb"
#  from [65a43c48f600ea8305861ae2b9bc8d44ac65c8d6]
#    to [7822dea5a8190361462aaba3a5865a3f1a2c82d8]
# 
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
#  from [964a8dabe7c00485c6abaca8fd364eb631810716]
#    to [e416b8dd7c16fdaef29109914cf909b457592d00]
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [91d936879c9fac0d051b7c80b290a712b953d3e0]
#    to [2bf99a7eea2115a72cbcfa13926816fe88ac7e7d]
# 
# patch "packages/linux-libc-headers/linux-libc-headers.inc"
#  from [5c98632deeb64f09ea2d1409ebfb3f52ca329b18]
#    to [b2222f137bb2d5024aabdd95ce25e23a2b0a3b9e]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb"
#  from [a5e398b392cdf0d939f0d10034f2326567a46b5e]
#    to [47e4d26b80d13dc103a57f5405e696bb41fa6482]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb"
#  from [2462887f80c983eb3bd388e906229f9f58bc4aa7]
#    to [15a52afa51d66a10c4e65d8999d9150de03b1ecf]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.18.bb"
#  from [1591ece17925b88a031d76f96246cad5d04d3424]
#    to [315b1efcbbcf61f41ebcdd6ff78e4306089eb779]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.20.bb"
#  from [6ca5c4e670c6594210c1afa9d59511ab71dfe839]
#    to [bb5b016cdec7c47517f8a6f0f98bb2bf0553754b]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.22.bb"
#  from [66ed33603a1599bc68718e22c5e7fe1d81ff51cc]
#    to [9848fbf9a03e26527896520878c57d533bebc91e]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.23.bb"
#  from [9848fbf9a03e26527896520878c57d533bebc91e]
#    to [bf5ec08a1649841a180f829658d288158043c847]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb"
#  from [a9f62e9c41ff4489d4ce3097d04a44c1688c5b9b]
#    to [db7b347929e1b904058af4bf2e4aaa167edee882]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb"
#  from [d9d8521f857b98b5a68a1e131113d039c7fe6854]
#    to [007380e042cf950f943a583ba518965455d16b39]
# 
# patch "packages/mtd/mtd-utils_1.1.0.bb"
#  from [62670e998ad85120543b4c4d96eb8c4d85363ab3]
#    to [f1a35c998ce14edbfdea2856cdb5bbbd723506f6]
# 
# patch "packages/python/python-efl.inc"
#  from [7a1e1c981a4d514c24d0cf695b0c335614b36bbb]
#    to [6829bace05e4f24bbf9f5d577fddd3e53ee419e3]
# 
# patch "packages/python/python_2.5.2.bb"
#  from [3ca57f8a30e412707c0107dff460e0343840d9f1]
#    to [5b3625881116fda1abd1f83093917137935991c8]
# 
# patch "packages/rt-tests/rt-tests_0.21.bb"
#  from [c4e7bcc06c49edbbf421e8fd4e9f00cb7fb0fb44]
#    to [3c741dea0b7061921b630a313d6b8fb572d157ac]
# 
# patch "packages/samba/samba-essential_3.0.20.bb"
#  from [79344126cf7248cd03678738543aba6c774308ac]
#    to [afaf03a7a90f3fea3dc7443c848f4c11933f074d]
# 
# patch "packages/samba/samba.inc"
#  from [7d4adb1461ffec0246a42e66fb6a18b8ca48912d]
#    to [77999b13a6dc8e6af6540bfe9a51f2ac9c11d3b9]
# 
# patch "packages/samba/samba_3.0.10.bb"
#  from [91586326d34250a76373b8f0f463b1ce410ae6f7]
#    to [5e9cb486a1020218a3b2994775f129ecf8ca0573]
# 
# patch "packages/samba/samba_3.0.14a.bb"
#  from [f2cb1ee6a99a760ecfcaf60a33cbb3f886739058]
#    to [3c919ecb4b243466161f937e7f05033cf7465b09]
# 
# patch "packages/samba/samba_3.0.20.bb"
#  from [59ef4fedfcccc9793317fb4b36075d610e8de000]
#    to [7492c4a07d82301f50368aef36326ea0fc99fd1f]
# 
# patch "packages/samba/samba_3.0.23c.bb"
#  from [be528ec63ea7db2e3846a6b3b89327e1d3fb653d]
#    to [cbb50ee71590ebe4810837194adc5397eb68d774]
# 
# patch "packages/samba/samba_3.0.5.bb"
#  from [91586326d34250a76373b8f0f463b1ce410ae6f7]
#    to [5e9cb486a1020218a3b2994775f129ecf8ca0573]
# 
# patch "packages/samba/samba_3.0.9.bb"
#  from [91586326d34250a76373b8f0f463b1ce410ae6f7]
#    to [5e9cb486a1020218a3b2994775f129ecf8ca0573]
# 
# patch "packages/startup-notification/startup-notification_0.8.bb"
#  from [d98452e8ff11d1f979b2e846cae86aa0602c958f]
#    to [c1d63af980014d68a74b102dce2e49edfdcc9658]
# 
# patch "packages/u-boot/u-boot_git.bb"
#  from [251b297b563be3a80a6de08089c0d3f90828d595]
#    to [e9764f3c6c5b495e1807c9f07081a24094765740]
# 
# patch "packages/vnc/x11vnc_0.9.3.bb"
#  from [aa732c8e4a44358ecadf82dfb92bfb011ab2bd20]
#    to [bb849990fcab1874e7cac9f59f3fd7133c0df9ab]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.3.0.0.bb"
#  from [228af28a9592f1bb445ca5ffd4054533d0a5498e]
#    to [6474fcf082bf05c6ca166e3988f5b8aeb31a503d]
# 
#   set "contrib/mtn-bisect.sh"
#  attr "mtn:execute"
# value "true"
#
============================================================
--- contrib/mtn-bisect.sh	230e3a1f735e3f6f46b4f117657494175ee86928
+++ contrib/mtn-bisect.sh	230e3a1f735e3f6f46b4f117657494175ee86928
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# the revision that we noticed does not longer build
+LATEST_BAD_REV=$1
+
+# an older revision that is known to build
+LAST_KNOWN_GOOD_REV=$2
+
+# count the number of commits 
+COUNT=`mtn log --brief --no-merges --no-graph --to p:$LAST_KNOWN_GOOD_REV --from $LATEST_BAD_REV | tee /tmp/candidates.txt | wc -l`
+
+echo $COUNT commits
+
+# if COUNT == 1 stop
+
+# make binary sections
+COUNT=$(($(($COUNT + 1)) / 2))
+
+CANDIDATE_REV=`cat /tmp/candidates.txt | head -n $COUNT | tail -n 1 | sed -e 's@\([a-f0-9]*\) .*@\1@'`
+
+echo $CANDIDATE_REV
+
+echo mtn up -r $CANDIDATE_REV
+mtn up -r $CANDIDATE_REV
+
+
============================================================
--- packages/acpid/acpid_1.0.6.bb	c44a19e28b91e0ba71888ce49af8c2a1e1a36bf4
+++ packages/acpid/acpid_1.0.6.bb	c44a19e28b91e0ba71888ce49af8c2a1e1a36bf4
@@ -0,0 +1,4 @@
+require acpid.inc
+SRC_URI += "file://gcc40.patch;patch=1"
+PR = "r3"
+
============================================================
--- packages/cacao/cacao_0.98+hg20080519.bb	a332104661010fe20cb8578a21fb16b673c5c620
+++ packages/cacao/cacao_0.98+hg20080519.bb	a332104661010fe20cb8578a21fb16b673c5c620
@@ -0,0 +1,24 @@
+require cacao.inc
+
+PR = "r0"
+
+SRC_URI = "http://downloads.openmoko.org/sources/cacao-0.98+hg20080519.tar.gz;md5sum=1c6e0530be63ec8a4c0ab2935c2fdc8f \
+           file://cacao-hg20080519-classpath_var.patch;patch=1 \
+           file://cacao-hg20080519-libdir.patch;patch=1 \
+          "
+
+S = "${WORKDIR}/cacao"
+
+EXTRA_OECONF = "\
+        ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \
+        --enable-debug \
+        --with-vm-zip=${datadir}/cacao/vm.zip \
+        --with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh-${PV} \
+        --with-java-runtime-library-classes=${STAGING_DATADIR}/classpath/glibj.zip \
+        --with-target-java-runtime-library-classes=${datadir}/classpath/glibj.zip \
+        --with-java-runtime-library-libdir=${libdir} \
+        --with-jni_md_h=${STAGING_INCDIR}/classpath \
+        --with-jni_h=${STAGING_INCDIR}/classpath \
+        "
+
+DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/cacao/cacaoh-native_0.98+hg20080519.bb	887b06266366e3ca536ec57e0200f64db2cf6e0f
+++ packages/cacao/cacaoh-native_0.98+hg20080519.bb	887b06266366e3ca536ec57e0200f64db2cf6e0f
@@ -0,0 +1,15 @@
+require cacaoh-native.inc
+
+PR = "r0"
+
+SRC_URI = "http://downloads.openmoko.org/sources/cacao-0.98+hg20080519.tar.gz;md5sum=1c6e0530be63ec8a4c0ab2935c2fdc8f"
+
+S = "${WORKDIR}/cacao"
+
+EXTRA_OECONF = " \
+        --with-java-runtime-library-classes=${STAGING_DATADIR}/classpath/glibj.zip \
+        --with-jni_md_h=${STAGING_INCDIR}/classpath \
+        --with-jni_h=${STAGING_INCDIR}/classpath \
+    "
+
+DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/cacao/files/cacao-hg20080519-classpath_var.patch	62477b682d6cb20be67ab015423d22c6412ac5f8
+++ packages/cacao/files/cacao-hg20080519-classpath_var.patch	62477b682d6cb20be67ab015423d22c6412ac5f8
@@ -0,0 +1,67 @@
+Index: cacao/configure.ac
+===================================================================
+--- cacao.orig/configure.ac	2008-05-21 14:16:33.000000000 +0800
++++ cacao/configure.ac	2008-05-21 15:57:42.000000000 +0800
+@@ -772,6 +772,7 @@
+ 
+ AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_PREFIX
+ AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_CLASSES
++AC_CHECK_WITH_TARGET_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-05-21 14:16:34.000000000 +0800
++++ cacao/m4/java-runtime-library.m4	2008-05-21 16:18:23.000000000 +0800
+@@ -106,6 +106,29 @@
+ ])
+ 
+ 
++dnl where are Java runtime library classes installed on the target
++
++AC_DEFUN([AC_CHECK_WITH_TARGET_JAVA_RUNTIME_LIBRARY_CLASSES],[
++AC_MSG_CHECKING(where Java runtime library classes are installed on the target)
++AC_ARG_WITH([target-java-runtime-library-classes],
++            [AS_HELP_STRING(--with-target-java-runtime-library-classes=<path>,path to Java runtime%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rd84d3829b2f6a4c1d1cb91496cd7ffa088ed323f -r12f1208ddddebc7934d98fcac3f803d022a1ba28
#
#
#
# patch "conf/distro/chinook-compat.conf"
#  from [c5844f900694f22660695c8b7f810b0ff9eb235c]
#    to [6f4774c59d5c8589f1b8d21db8f3fed3f209e847]
#
============================================================
--- conf/distro/chinook-compat.conf	c5844f900694f22660695c8b7f810b0ff9eb235c
+++ conf/distro/chinook-compat.conf	6f4774c59d5c8589f1b8d21db8f3fed3f209e847
@@ -163,8 +163,10 @@ PREFERRED_VERSION_osso-gnome-vfs2 = "2.1
 PREFERRED_VERSION_osso-gnome-vfs2 = "2.16.3"
 
 # Java stuff 
+PREFERRED_PROVIDER_midpath = "midpath-maemo"
+PREFERRED_PROVIDER_midpath-backend-gtk = "midpath-backend-gtk-hildon"
 
-PREFERRED_PROVIDER_virtual/javac-native	  = "ecj-bootstrap-native"
+PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
 
 PREFERRED_PROVIDER_classpath = "classpath"
 PREFERRED_VERSION_classpath = "0.97.1"
@@ -197,6 +199,8 @@ PKG_libsdl-directfb = "libsdl1.2"
 
 PKG_libsdl-image = "libsdl-image1.2"
 PKG_libsdl-directfb = "libsdl1.2"
+PKG_libsdl-ttf = "libsdl-ttf2.0-0"
+PKG_libsdl-gfx = "libsdl-gfx1.2-4"
 
 PKG_bluez-libs = "libbluetooth2"

More information about the Openembedded-commits mailing list