org.openembedded.dev: b5af291fa9dc074af84727684ddae1efa9c1be0d

oe at monotone.openmoko.org oe at monotone.openmoko.org
Fri May 2 21:03:46 CEST 2008


revision:            b5af291fa9dc074af84727684ddae1efa9c1be0d
date:                2008-04-28T13:11:24
author:              koen at openembedded.org
branch:              org.openembedded.dev
changelog:
merge of '02c853aa8cfa6c38e9af2ee305306c04ac0a03fa'
     and 'e04d9a23468c5cecc2307c456ca0b4b98ad65d50'

manifest:
format_version "1"

new_manifest [bfa73e7d9aefeb8f59cfa6cb13dfad17e9aff82c]

old_revision [02c853aa8cfa6c38e9af2ee305306c04ac0a03fa]

delete "conf/distro/include/preferred-om-2008-versions.inc"

delete "packages/gnash/gnash.inc"

delete "packages/gnash/gnash_0.8.1.bb"

delete "packages/gpsdrive/gpsdrive-2.10pre4"

delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch"

delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch"

delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch"

delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop"

delete "packages/gpsdrive/gpsdrive_2.10pre4.bb"

delete "packages/ipkg/files/ipkg_bugfix.patch"

delete "packages/multitap-pad"

delete "packages/multitap-pad/files"

delete "packages/multitap-pad/files/80multitappad"

delete "packages/multitap-pad/multitap-pad_svn.bb"

delete "packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb"

delete "packages/perl/libwww-perl-native_5.808.bb"

delete "packages/perl/libwww-perl_5.808.bb"

delete "packages/wpa-supplicant/wpa-supplicant"

delete "packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch"

delete "packages/wpa-supplicant/wpa-supplicant-0.5.inc"

delete "packages/wpa-supplicant/wpa-supplicant-nossl"

delete "packages/wpa-supplicant/wpa-supplicant-nossl/wpa-defconfig"

delete "packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb"

delete "packages/wpa-supplicant/wpa-supplicant-ssl"

delete "packages/wpa-supplicant/wpa-supplicant-ssl/wpa-defconfig"

delete "packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb"

delete "packages/wpa-supplicant/wpa-supplicant_0.2.6.inc"

delete "packages/wpa-supplicant/wpa-supplicant_0.3.6.bb"

delete "packages/wpa-supplicant/wpa-supplicant_0.3.8.bb"

delete "packages/wpa-supplicant/wpa-supplicant_0.5.5.bb"

delete "packages/wpa-supplicant/wpa-supplicant_0.5.7.bb"

delete "packages/wpa-supplicant/wpa-supplicant_cvs.bb"

add_dir "packages/gpsdrive/gpsdrive-2.10pre4"

add_dir "packages/multitap-pad"

add_dir "packages/multitap-pad/files"

add_dir "packages/openmoko2/openmoko-dialer2/fic-gta01"

add_dir "packages/openmoko2/openmoko-dialer2/fic-gta02"

add_dir "packages/qtopia-phone"

add_dir "packages/qtopia-phone/files"

add_dir "packages/qtopia-phone/files/fic-gta01"

add_dir "packages/qtopia-phone/files/fic-gta02"

add_dir "packages/qtopia-phone/qtopia-phone-x11"

add_dir "packages/qtopia-phone/qtopia-phone-x11/fic-gta02"

add_dir "packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d"

add_file "conf/distro/include/preferred-om-2008-versions.inc"
 content [0741783d8c451adac5e47265611069ee7296c2d7]

add_file "conf/machine/htckaiser.conf"
 content [8ecec3cc2692888e23f7f4ac09f4cb55c7234e4b]

add_file "packages/gnash/gnash.inc"
 content [66c805eb5cfd0e18a89770e022d4420ee9013566]

add_file "packages/gnash/gnash_0.8.1.bb"
 content [50014de2c3904a6950c775be0eda4815399cb573]

add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch"
 content [f7d05fac53703548b59b528f752366847140744e]

add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch"
 content [47e014d89d9957ea970e01aced2dc553d3722236]

add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch"
 content [b9c3b9e051b269ab097c36a70c58b6d218e0d55d]

add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop"
 content [6ef8f7d5db97dd3541a0bfe44325bd07296baf1b]

add_file "packages/gpsdrive/gpsdrive_2.10pre4.bb"
 content [9e4cea32b63aa093d54c9b1039cfa8dd87790322]

add_file "packages/images/openmoko-qtopia-image.bb"
 content [85858c01bf04fa98f230120b45029c9ffc41a05c]

add_file "packages/images/openmoko-qtopia-x11-image.bb"
 content [fd1679f4eb35ac9f3302c6a11f82e975921a169f]

add_file "packages/linux/linux-kaiser_2.6.24+git.bb"
 content [f35b44d6d3ebfde341c328a3b1e8362f8dec89de]

add_file "packages/multitap-pad/files/80multitappad"
 content [b613cc7c89d800c205b89dd7013c4b3ba309b319]

add_file "packages/multitap-pad/multitap-pad_svn.bb"
 content [8f2b626f58690dd52e509cacab5977c5f52270e2]

add_file "packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb"
 content [4e424e0c74d42282c80ac2738e417b8dc7014e80]

add_file "packages/openmoko-tools/pty-forward-native.bb"
 content [17c7e0ad0fe30607be9326cec651ccf4ee86b4b8]

add_file "packages/openmoko-tools/serial-forward.bb"
 content [32434a87a886be4c262ea2f13af0375bae297e48]

add_file "packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch"
 content [43b8c9925bee93d59e2aefd4c7eec71d0b796197]

add_file "packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch"
 content [d1c708f7f915fa250e20a84fa9d4512440442a4f]

add_file "packages/perl/libwww-perl-native_5.808.bb"
 content [66723b8808de2c5758435a88b9640bc8777d89be]

add_file "packages/perl/libwww-perl_5.808.bb"
 content [c76a162b7e6844022d4b9826386bfeed71c6328e]

add_file "packages/qtopia-phone/files/fic-gta01/device-conf"
 content [33f77c8d4d680c25796f493f054c0e6581439476]

add_file "packages/qtopia-phone/files/fic-gta01/device-conf.old"
 content [7cf2ef99b35315048f286f7f0027ed5c6d609862]

add_file "packages/qtopia-phone/files/fic-gta01/qplatformdefs.h"
 content [4548b7c6203d64cb5ba410f46ff363427f46e675]

add_file "packages/qtopia-phone/files/fic-gta02/device-conf"
 content [33f77c8d4d680c25796f493f054c0e6581439476]

add_file "packages/qtopia-phone/files/fic-gta02/device-conf.old"
 content [7cf2ef99b35315048f286f7f0027ed5c6d609862]

add_file "packages/qtopia-phone/files/fic-gta02/qplatformdefs.h"
 content [4548b7c6203d64cb5ba410f46ff363427f46e675]

add_file "packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia"
 content [54bf1406f00aebb9f05186ae64e99cd38f45ef0b]

add_file "packages/qtopia-phone/qtopia-phone-x11/qtopia.sh"
 content [14600d791e31540ce23ce74084b05c424a136b7f]

add_file "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
 content [8d6511f3785b690662798bf6a7814f77ef203bca]

add_file "packages/qtopia-phone/qtopia-phone.inc"
 content [3a88780f98fdd8af1ad280d0c3e688bf14e81001]

add_file "packages/qtopia-phone/qtopia-phone_4.3.0.bb"
 content [6a8d100cd18fb90e6f4dfc83f85e4588a049db4c]

add_file "packages/qtopia-phone/qtopia-phone_4.3.1.bb"
 content [6a8d100cd18fb90e6f4dfc83f85e4588a049db4c]

add_file "packages/qtopia-phone/qtopia-phone_arch.inc"
 content [15641411049adbe933692115529c6bac3f43cfef]

add_file "packages/tasks/task-openmoko-qtopia-x11.bb"
 content [38da0e6335542addd488373f6e8cee974a877a58]

add_file "packages/tasks/task-openmoko-qtopia.bb"
 content [4367872d7b461db04275d0f119b597e45eb0811b]

add_file "packages/wpa-supplicant/wpa-supplicant_0.5.10.bb"
 content [96f91121be0d1a9fb9a7bbe2872fa7da5b580c83]

patch "classes/kernel.bbclass"
 from [0e7bc22f0cbc8ab0efe1c7ffb69e9171f99a8b21]
   to [8d92c5a7b6420490dd6b3115e8146b3fc0a0f854]

patch "classes/sourcepkg.bbclass"
 from [4d9f8a49273051e27cb3e914d97f9ea3ebcdaba3]
   to [e4c6fac480eaea68ccd24d95a5878b9f5e41b464]

patch "conf/distro/include/sane-srcrevs.inc"
 from [521cedb389bc68d1f7ab5ea2240153394d425295]
   to [7314e35801b572c3e3928395538ae79453852b2f]

patch "conf/machine/at32stk1000.conf"
 from [3d5142529536576aea6056c6d761540974caa5ac]
   to [163fd78fdfe07eb3befe4b759102820ed434730b]

patch "conf/machine/om-gta02.conf"
 from [bb34d745d24d709bd9a6fe113c95e816ba6c788a]
   to [8a81b5b7224a98d62de1611265a26386dc77b5f2]

patch "packages/alsa/alsa-state.bb"
 from [fa1e4194e6ae098938b0dfb04b2a91debdf76cd9]
   to [f5ed106d3dce9fc8b495243ae43e56a3127b312e]

patch "packages/images/unslung-image.bb"
 from [e4cf81045fb8a8e211e464905d1b307c49987663]
   to [738ce981801bef8a0c76499a9524887eeb1547ff]

patch "packages/meta/slugos-packages.bb"
 from [a8de050f9b9bde46ec2fe91cdf9d93c69da445cb]
   to [46c8ac8a7503c5e222ee23a677a92db2e2ea9dcb]

patch "packages/openocd/openocd_svn.bb"
 from [ff4b08ed923a74c3efa4730980288907a11baeb7]
   to [5863de22800841c9bcd0fe5b4014ef3d911f91a2]

patch "packages/rsync/rsync.inc"
 from [7c3e306cf41e043732b6fedbc8c41ebc491fedaf]
   to [1d1f2cbe00f4779bdc3dc7f9689611d817e90259]

patch "packages/rsync/rsync_2.6.9.bb"
 from [46d56c1ae65397da35a2b8871cfecde62e0a382e]
   to [1b1f42efd8d5dc944a9638cd0678259c995c08dd]

patch "packages/rsync/rsync_3.0.0.bb"
 from [265d3e5b7ec96ad6b092880621ccd67844dd9dc7]
   to [dd9114bcedbdbe8b612946916a35fe4a662cd34c]

old_revision [e04d9a23468c5cecc2307c456ca0b4b98ad65d50]

patch "packages/gnuradio/gnuradio.inc"
 from [f3784a8b6e3c9fcbccabd3014638b35285a1adba]
   to [2b1aa21c076bc1d46a68628c02898068873279c0]

patch "packages/gnuradio/gnuradio_3.0.4.bb"
 from [e935ec6d343e8fdb415db8992f198c118b3780af]
   to [9f16e9d9d4673c6cb75c8bb01e3dfea2cb2da338]

patch "packages/gnuradio/gnuradio_3.1.2.bb"
 from [e935ec6d343e8fdb415db8992f198c118b3780af]
   to [9f16e9d9d4673c6cb75c8bb01e3dfea2cb2da338]

patch "packages/gnuradio/gnuradio_svn.bb"
 from [c208d7c99e0267f8380bd0efe7d3d2bffdfb6247]
   to [351ac3dd01f04c457e29330a4098d8cf3271cb1e]
-------------- next part --------------
#
#
# delete "conf/distro/include/preferred-om-2008-versions.inc"
# 
# delete "packages/gnash/gnash.inc"
# 
# delete "packages/gnash/gnash_0.8.1.bb"
# 
# delete "packages/gpsdrive/gpsdrive-2.10pre4"
# 
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch"
# 
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch"
# 
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch"
# 
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop"
# 
# delete "packages/gpsdrive/gpsdrive_2.10pre4.bb"
# 
# delete "packages/ipkg/files/ipkg_bugfix.patch"
# 
# delete "packages/multitap-pad"
# 
# delete "packages/multitap-pad/files"
# 
# delete "packages/multitap-pad/files/80multitappad"
# 
# delete "packages/multitap-pad/multitap-pad_svn.bb"
# 
# delete "packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb"
# 
# delete "packages/perl/libwww-perl-native_5.808.bb"
# 
# delete "packages/perl/libwww-perl_5.808.bb"
# 
# delete "packages/wpa-supplicant/wpa-supplicant"
# 
# delete "packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch"
# 
# delete "packages/wpa-supplicant/wpa-supplicant-0.5.inc"
# 
# delete "packages/wpa-supplicant/wpa-supplicant-nossl"
# 
# delete "packages/wpa-supplicant/wpa-supplicant-nossl/wpa-defconfig"
# 
# delete "packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb"
# 
# delete "packages/wpa-supplicant/wpa-supplicant-ssl"
# 
# delete "packages/wpa-supplicant/wpa-supplicant-ssl/wpa-defconfig"
# 
# delete "packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb"
# 
# delete "packages/wpa-supplicant/wpa-supplicant_0.2.6.inc"
# 
# delete "packages/wpa-supplicant/wpa-supplicant_0.3.6.bb"
# 
# delete "packages/wpa-supplicant/wpa-supplicant_0.3.8.bb"
# 
# delete "packages/wpa-supplicant/wpa-supplicant_0.5.5.bb"
# 
# delete "packages/wpa-supplicant/wpa-supplicant_0.5.7.bb"
# 
# delete "packages/wpa-supplicant/wpa-supplicant_cvs.bb"
# 
# add_dir "packages/gpsdrive/gpsdrive-2.10pre4"
# 
# add_dir "packages/multitap-pad"
# 
# add_dir "packages/multitap-pad/files"
# 
# add_dir "packages/openmoko2/openmoko-dialer2/fic-gta01"
# 
# add_dir "packages/openmoko2/openmoko-dialer2/fic-gta02"
# 
# add_dir "packages/qtopia-phone"
# 
# add_dir "packages/qtopia-phone/files"
# 
# add_dir "packages/qtopia-phone/files/fic-gta01"
# 
# add_dir "packages/qtopia-phone/files/fic-gta02"
# 
# add_dir "packages/qtopia-phone/qtopia-phone-x11"
# 
# add_dir "packages/qtopia-phone/qtopia-phone-x11/fic-gta02"
# 
# add_dir "packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d"
# 
# add_file "conf/distro/include/preferred-om-2008-versions.inc"
#  content [0741783d8c451adac5e47265611069ee7296c2d7]
# 
# add_file "conf/machine/htckaiser.conf"
#  content [8ecec3cc2692888e23f7f4ac09f4cb55c7234e4b]
# 
# add_file "packages/gnash/gnash.inc"
#  content [66c805eb5cfd0e18a89770e022d4420ee9013566]
# 
# add_file "packages/gnash/gnash_0.8.1.bb"
#  content [50014de2c3904a6950c775be0eda4815399cb573]
# 
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch"
#  content [f7d05fac53703548b59b528f752366847140744e]
# 
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch"
#  content [47e014d89d9957ea970e01aced2dc553d3722236]
# 
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch"
#  content [b9c3b9e051b269ab097c36a70c58b6d218e0d55d]
# 
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop"
#  content [6ef8f7d5db97dd3541a0bfe44325bd07296baf1b]
# 
# add_file "packages/gpsdrive/gpsdrive_2.10pre4.bb"
#  content [9e4cea32b63aa093d54c9b1039cfa8dd87790322]
# 
# add_file "packages/images/openmoko-qtopia-image.bb"
#  content [85858c01bf04fa98f230120b45029c9ffc41a05c]
# 
# add_file "packages/images/openmoko-qtopia-x11-image.bb"
#  content [fd1679f4eb35ac9f3302c6a11f82e975921a169f]
# 
# add_file "packages/linux/linux-kaiser_2.6.24+git.bb"
#  content [f35b44d6d3ebfde341c328a3b1e8362f8dec89de]
# 
# add_file "packages/multitap-pad/files/80multitappad"
#  content [b613cc7c89d800c205b89dd7013c4b3ba309b319]
# 
# add_file "packages/multitap-pad/multitap-pad_svn.bb"
#  content [8f2b626f58690dd52e509cacab5977c5f52270e2]
# 
# add_file "packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb"
#  content [4e424e0c74d42282c80ac2738e417b8dc7014e80]
# 
# add_file "packages/openmoko-tools/pty-forward-native.bb"
#  content [17c7e0ad0fe30607be9326cec651ccf4ee86b4b8]
# 
# add_file "packages/openmoko-tools/serial-forward.bb"
#  content [32434a87a886be4c262ea2f13af0375bae297e48]
# 
# add_file "packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch"
#  content [43b8c9925bee93d59e2aefd4c7eec71d0b796197]
# 
# add_file "packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch"
#  content [d1c708f7f915fa250e20a84fa9d4512440442a4f]
# 
# add_file "packages/perl/libwww-perl-native_5.808.bb"
#  content [66723b8808de2c5758435a88b9640bc8777d89be]
# 
# add_file "packages/perl/libwww-perl_5.808.bb"
#  content [c76a162b7e6844022d4b9826386bfeed71c6328e]
# 
# add_file "packages/qtopia-phone/files/fic-gta01/device-conf"
#  content [33f77c8d4d680c25796f493f054c0e6581439476]
# 
# add_file "packages/qtopia-phone/files/fic-gta01/device-conf.old"
#  content [7cf2ef99b35315048f286f7f0027ed5c6d609862]
# 
# add_file "packages/qtopia-phone/files/fic-gta01/qplatformdefs.h"
#  content [4548b7c6203d64cb5ba410f46ff363427f46e675]
# 
# add_file "packages/qtopia-phone/files/fic-gta02/device-conf"
#  content [33f77c8d4d680c25796f493f054c0e6581439476]
# 
# add_file "packages/qtopia-phone/files/fic-gta02/device-conf.old"
#  content [7cf2ef99b35315048f286f7f0027ed5c6d609862]
# 
# add_file "packages/qtopia-phone/files/fic-gta02/qplatformdefs.h"
#  content [4548b7c6203d64cb5ba410f46ff363427f46e675]
# 
# add_file "packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia"
#  content [54bf1406f00aebb9f05186ae64e99cd38f45ef0b]
# 
# add_file "packages/qtopia-phone/qtopia-phone-x11/qtopia.sh"
#  content [14600d791e31540ce23ce74084b05c424a136b7f]
# 
# add_file "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
#  content [8d6511f3785b690662798bf6a7814f77ef203bca]
# 
# add_file "packages/qtopia-phone/qtopia-phone.inc"
#  content [3a88780f98fdd8af1ad280d0c3e688bf14e81001]
# 
# add_file "packages/qtopia-phone/qtopia-phone_4.3.0.bb"
#  content [6a8d100cd18fb90e6f4dfc83f85e4588a049db4c]
# 
# add_file "packages/qtopia-phone/qtopia-phone_4.3.1.bb"
#  content [6a8d100cd18fb90e6f4dfc83f85e4588a049db4c]
# 
# add_file "packages/qtopia-phone/qtopia-phone_arch.inc"
#  content [15641411049adbe933692115529c6bac3f43cfef]
# 
# add_file "packages/tasks/task-openmoko-qtopia-x11.bb"
#  content [38da0e6335542addd488373f6e8cee974a877a58]
# 
# add_file "packages/tasks/task-openmoko-qtopia.bb"
#  content [4367872d7b461db04275d0f119b597e45eb0811b]
# 
# add_file "packages/wpa-supplicant/wpa-supplicant_0.5.10.bb"
#  content [96f91121be0d1a9fb9a7bbe2872fa7da5b580c83]
# 
# patch "classes/kernel.bbclass"
#  from [0e7bc22f0cbc8ab0efe1c7ffb69e9171f99a8b21]
#    to [8d92c5a7b6420490dd6b3115e8146b3fc0a0f854]
# 
# patch "classes/sourcepkg.bbclass"
#  from [4d9f8a49273051e27cb3e914d97f9ea3ebcdaba3]
#    to [e4c6fac480eaea68ccd24d95a5878b9f5e41b464]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [521cedb389bc68d1f7ab5ea2240153394d425295]
#    to [7314e35801b572c3e3928395538ae79453852b2f]
# 
# patch "conf/machine/at32stk1000.conf"
#  from [3d5142529536576aea6056c6d761540974caa5ac]
#    to [163fd78fdfe07eb3befe4b759102820ed434730b]
# 
# patch "conf/machine/om-gta02.conf"
#  from [bb34d745d24d709bd9a6fe113c95e816ba6c788a]
#    to [8a81b5b7224a98d62de1611265a26386dc77b5f2]
# 
# patch "packages/alsa/alsa-state.bb"
#  from [fa1e4194e6ae098938b0dfb04b2a91debdf76cd9]
#    to [f5ed106d3dce9fc8b495243ae43e56a3127b312e]
# 
# patch "packages/images/unslung-image.bb"
#  from [e4cf81045fb8a8e211e464905d1b307c49987663]
#    to [738ce981801bef8a0c76499a9524887eeb1547ff]
# 
# patch "packages/meta/slugos-packages.bb"
#  from [a8de050f9b9bde46ec2fe91cdf9d93c69da445cb]
#    to [46c8ac8a7503c5e222ee23a677a92db2e2ea9dcb]
# 
# patch "packages/openocd/openocd_svn.bb"
#  from [ff4b08ed923a74c3efa4730980288907a11baeb7]
#    to [5863de22800841c9bcd0fe5b4014ef3d911f91a2]
# 
# patch "packages/rsync/rsync.inc"
#  from [7c3e306cf41e043732b6fedbc8c41ebc491fedaf]
#    to [1d1f2cbe00f4779bdc3dc7f9689611d817e90259]
# 
# patch "packages/rsync/rsync_2.6.9.bb"
#  from [46d56c1ae65397da35a2b8871cfecde62e0a382e]
#    to [1b1f42efd8d5dc944a9638cd0678259c995c08dd]
# 
# patch "packages/rsync/rsync_3.0.0.bb"
#  from [265d3e5b7ec96ad6b092880621ccd67844dd9dc7]
#    to [dd9114bcedbdbe8b612946916a35fe4a662cd34c]
#
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc	0741783d8c451adac5e47265611069ee7296c2d7
+++ conf/distro/include/preferred-om-2008-versions.inc	0741783d8c451adac5e47265611069ee7296c2d7
@@ -0,0 +1,15 @@
+PREFERRED_VERSION_asterisk = "1.4.17"
+PREFERRED_VERSION_busybox = "1.9.1"
+PREFERRED_VERSION_dbus = "1.2.1"
+PREFERRED_VERSION_dbus-glib = "0.74"
+PREFERRED_VERSION_glib-2.0 = "2.16.1"
+PREFERRED_VERSION_gnash = "0.8.2"
+PREFERRED_VERSION_gpsdrive = "2.10pre4"
+PREFERRED_VERSION_gst-pulse = "0.9.7"
+PREFERRED_VERSION_intltool = "0.35.5"
+PREFERRED_VERSION_intltool-native = "0.35.5"
+PREFERRED_VERSION_libtool = "1.5.24"
+PREFERRED_VERSION_midori = "0.0.17"
+PREFERRED_VERSION_pulseaudio = "0.9.9"
+PREFERRED_VERSION_udev = "118"
+PREFERRED_VERSION_vte = "0.16.9"
============================================================
--- conf/machine/htckaiser.conf	8ecec3cc2692888e23f7f4ac09f4cb55c7234e4b
+++ conf/machine/htckaiser.conf	8ecec3cc2692888e23f7f4ac09f4cb55c7234e4b
@@ -0,0 +1,25 @@
+#@TYPE: Machine
+#@NAME: HTC Kaiser phone
+#@DESCRIPTION: Machine configuration for HTC Kaiser phone
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6"
+ 
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+ 
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+ 
+TARGET_FPU = "soft"
+TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s"
+FEED_ARCH = "armv6"
+PACKAGE_ARCH = "armv6"
+ 
+
+IMAGE_FSTYPES ?= "tar.gz cpio.gz"
+ 
+PREFERRED_PROVIDER_virtual/kernel = "linux-kaiser"
+ 
+MACHINE_FEATURES = "kernel26 touchscreen screen keyboard"
+
============================================================
--- packages/gnash/gnash.inc	66c805eb5cfd0e18a89770e022d4420ee9013566
+++ packages/gnash/gnash.inc	66c805eb5cfd0e18a89770e022d4420ee9013566
@@ -0,0 +1,38 @@
+DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
+HOMEPAGE = "http://www.gnu.org/software/gnash"
+LICENSE = "GPL-2"
+DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \
+          "
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-gui=gtk \
+                --enable-renderer=cairo \
+                --enable-media=none \
+                --disable-klash \
+                --enable-z \
+                --enable-jpeg \
+                --disable-glext \
+                --enable-Xft \
+                --enable-expat \
+                --enable-mad \
+                --enable-cairo \
+                --disable-plugin \
+                --disable-cygnal \
+                --with-top-level=${STAGING_DIR_HOST}/usr \
+                "
+
+PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver "
+
+FILES_libgnashamf = "${libdir}/libgnashamf-${PV}.so"
+FILES_libgnashbackend = "${libdir}/libgnashbackend-${PV}.so"
+FILES_libgnashbase = "${libdir}/libgnashbase-${PV}.so"
+FILES_libgnashgeo = "${libdir}/libgnashgeo-${PV}.so"
+FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so"
+FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so"
+FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so"
+
+PARALLEL_MAKE = ""
============================================================
--- packages/gnash/gnash_0.8.1.bb	50014de2c3904a6950c775be0eda4815399cb573
+++ packages/gnash/gnash_0.8.1.bb	50014de2c3904a6950c775be0eda4815399cb573
@@ -0,0 +1 @@
+require gnash.inc
============================================================
--- packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch	f7d05fac53703548b59b528f752366847140744e
+++ packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch	f7d05fac53703548b59b528f752366847140744e
@@ -0,0 +1,128 @@
+diff -ur gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl gpsdrive-2.10pre4/scripts/gpsfetchmap.pl
+--- gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl	2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/scripts/gpsfetchmap.pl	2008-01-04 19:01:35.000000000 +0100
+@@ -35,6 +35,7 @@
+ modified (Jul 2005) by Jaroslaw Zachwieja <grok\@filippa.org.uk>
+ modified (Dec 2005) by David Pollard <david dot pollard\@optusnet.com.au>
+ modified (Jul 2007) by Maciek Kaliszewski <mkalkal\@interia.pl>
++modified (Jan 2008) by Gernot Hillier <gernot\@hillier.de> (added Openstreetmap support)
+ Version svn-$Version
+ ";
+ 
+@@ -176,6 +177,25 @@
+       15812 => 3 ,
+       7906  => 2,
+       3953 => 1
++    },
++    openstreetmap_tah => {
++      256*576000 =>  1,
++      128*576000 =>  2,
++       64*576000 =>  3,
++       32*576000 =>  4,
++       16*576000 =>  5,
++        8*576000 =>  6,
++        4*576000 =>  7,
++        2*576000 =>  8,
++          576000 =>  9,
++          288000 => 10,
++          144000 => 11,
++           72000 => 12,
++           36000 => 13,
++           18000 => 14,
++           9000  => 15,
++            4500 => 16,
++            2250 => 17
+     }
+ };
+ 
+@@ -331,7 +351,6 @@
+     exit();
+ }
+ 
+-
+ # Verify that we have the options that we need 
+ pod2usage(1) if (&error_check);
+ 
+@@ -417,6 +436,13 @@
+     print "+-----------------------------------------------------------+\n";
+     print "| Landsat Maps are Copyright, .....   |\n";
+     print "| They are free for non commercial use.                     |\n";
++}elsif ( $mapserver eq 'openstreetmap_tah' ){
++    print "+-----------------------------------------------------------+\n";
++    print "| OpenStreetmap Maps are Copyright by the OpenStreetmap     |\n";
++    print "| project.                                                  |\n";
++    print "| They are free for use under the terms of the              |\n";
++    print "| Creative Commons \"Attribution-Share Alike 2.0 Generic\"    |\n";
++    print "| license. See http://www.openstreetmap.org for details.    |\n";
+ } elsif ( ! $force) {
+     print "You are violating the map servers copyright!\n";
+     print "Are you sure you want to continue? [y|n] ";
+@@ -700,6 +726,11 @@
+     {
+ 	($url,$mapscale)=googlemap_url($lati,$long,$scale);
+     } 
++    elsif ( $mapserver eq 'openstreetmap_tah') 
++    {	
++	$filename=~s/\.gif/.png/;
++	($url,$mapscale)=openstreetmap_tah_url($lati,$long,$scale);
++    } 
+     else 
+     {
+ 	print "Unknown map sever :", $mapserver, "\n"; 
+@@ -935,6 +966,37 @@
+     return ($url,$mapscale);
+ }
+ 
++#############################################################################
++sub openstreetmap_tah_url($$$){
++    my $lati = shift;
++    my $long = shift;
++    my $scale = shift;
++
++    my $mapscale = $scale;
++    my $zoom = undef;
++    for my $s ( sort keys %{$Scale2Zoom->{openstreetmap_tah}} ) {
++	next unless $s == $scale;
++	$zoom = $Scale2Zoom->{openstreetmap_tah}->{$s};
++	$mapscale = $s;
++	last;
++    }
++
++    unless ( $zoom ) {
++	print "Error calculating Zoomlevel for Scale: $scale\n";
++	return (undef,undef);
++    }
++
++    if ($debug) {
++	print "\n";
++	print "Using openstreetmap_tah zoom ", $zoom, " for requested scale ", $scale, ":1 actual scale ", $mapscale, ":1\n";
++	print "lat: $lati\n";
++	print "lon: $long\n";
++    }
++
++    my $url = "http://tah.openstreetmap.org/MapOf/?lat=$lati&long=$long&z=$zoom&w=1280&h=1024&format=png";
++#   print "$url\n";
++    return ($url,$mapscale);
++}
+ 
+ #############################################################################
+ sub eniro_url($$$){
+@@ -2284,7 +2346,7 @@
+ =item B<--mapserver <MAPSERVER>>
+ 
+ Mapserver to download from. Default: 'expedia'.
+-Currently can use: landsat or expedia.
++Currently usable: landsat, expedia or openstreetmap_tah.
+ 
+ geoscience, gov_au, incrementp, googlesat, googlemap and eniro have download stubs, 
+ but they are !!!NOT!!!! in the right scale.
+@@ -2294,6 +2356,9 @@
+ 
+ landsat covers the whole world with satelite Photos
+ 
++openstreetmap_tah: Free maps from the OpenStreetmap Tiles at Home project, see 
++		   http://www.openstreetmap.org and http://tah.openstreetmap.org.
++
+ gov_au is for Australia
+ 
+ incrementp for japanese Maps
============================================================
--- packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch	47e014d89d9957ea970e01aced2dc553d3722236
+++ packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch	47e014d89d9957ea970e01aced2dc553d3722236
@@ -0,0 +1,18 @@
+Index: src/map_handler.c
+===================================================================
+--- aa/src/map_handler.c	(Revision 1699)
++++ aa/src/map_handler.c	(Revision 1700)
+@@ -660,9 +660,12 @@
+   if (maploaded)
+     gdk_pixbuf_unref (image);
+ 
++#ifdef MAPNIK
+   if ( !strcmp (filename,"mapnik") ) {
+ 	  limage = gdk_pixbuf_new_from_data(get_mapnik_imagedata(), GDK_COLORSPACE_RGB, FALSE, 8, 1280, 1024, 1280 * 3, NULL, NULL);
+-  } else {
++  } else 
++#endif
++  {
+ 	  limage = gdk_pixbuf_new_from_file (filename, NULL);
+ 	  if (limage == NULL)
+ 	    {
============================================================
--- packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch	b9c3b9e051b269ab097c36a70c58b6d218e0d55d
+++ packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch	b9c3b9e051b269ab097c36a70c58b6d218e0d55d
@@ -0,0 +1,96 @@
+diff -ur gpsdrive-2.10pre4.orig/src/Makefile.am gpsdrive-2.10pre4/src/Makefile.am
+--- gpsdrive-2.10pre4.orig/src/Makefile.am	2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/src/Makefile.am	2007-12-28 18:50:29.000000000 +0100
+@@ -14,14 +14,14 @@
+ 	-DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" \
+ 	-DLIBDIR=\"${libdir}\" \
+ 	-DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" \
+-	${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}\
+-	-I/usr/include/ \
+-	-I/usr/local/include \
+-	-I/opt/boost_1_35/include/boost-1_35 \
+-	-I/usr/local/include/freetype2 \
+-	-I/usr/include/freetype2 \
++	${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}
++#	-I/usr/include/ \
++#	-I/usr/local/include \
++#	-I/opt/boost_1_35/include/boost-1_35 \
++#	-I/usr/local/include/freetype2 \
++#	-I/usr/include/freetype2 \
+ 	-I. \
+-	-L/usr/local/lib
++#	-L/usr/local/lib
+ 
+ #	-I/usr/include/dbus-1.0/ 
+ 
+diff -ur gpsdrive-2.10pre4.orig/configure gpsdrive-2.10pre4/configure
+--- gpsdrive-2.10pre4.orig/configure	2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/configure	2008-01-06 14:49:11.000000000 +0100
+@@ -35950,10 +35950,13 @@
+ #  Yep, its ebil, but I does not know better...
+ #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"`
+ # default on debian should be: /usr/share/perl5/
+-PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
++#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
+ #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"`
+-PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
++#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
+ 
++# hard code path for OpenEmbedded environment as I don't know a way
++# to detect it automatically
++PERL_PACKAGE_DIR="/usr/share/perl5"
+ 
+ ac_perl_modules="File::Basename "
+ # Make sure we have perl
+@@ -37840,11 +37843,11 @@
+ #    AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore')
+ #fi
+ 
+-if test -f /usr/include/mysql/mysql.h; then
+- CFLAGS="$CFLAGS -I/usr/include/mysql"
+-else
+- CFLAGS="$CFLAGS -Imysql"
+-fi
++#if test -f /usr/include/mysql/mysql.h; then
++# CFLAGS="$CFLAGS -I/usr/include/mysql"
++#else
++# CFLAGS="$CFLAGS -Imysql"
++#fi
+ 
+ CFLAGS="$CFLAGS $OPT_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $OPT_CFLAGS"
+diff -ur gpsdrive-2.10pre4.orig/configure.ac gpsdrive-2.10pre4/configure.ac
+--- gpsdrive-2.10pre4.orig/configure.ac	2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/configure.ac	2008-01-06 14:48:50.000000000 +0100
+@@ -662,9 +662,12 @@
+ #  Yep, its ebil, but I does not know better...
+ #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"`
+ # default on debian should be: /usr/share/perl5/
+-PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
++#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
+ #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"`
+-PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
++#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
++# hard code path for OpenEmbedded environment as I don't know a way
++# to detect it automatically
++PERL_PACKAGE_DIR="/usr/share/perl5"
+ AC_SUBST(PERL_PACKAGE_DIR)
+ 
+ AC_PROG_PERL_MODULES(File::Basename , ,  AC_MSG_ERROR(Need Perl module File::Basename))
+@@ -719,11 +722,11 @@
+ #    AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore') 
+ #fi
+ 
+-if test -f /usr/include/mysql/mysql.h; then
+- CFLAGS="$CFLAGS -I/usr/include/mysql"
+-else
+- CFLAGS="$CFLAGS -Imysql"
+-fi
++#if test -f /usr/include/mysql/mysql.h; then
++# CFLAGS="$CFLAGS -I/usr/include/mysql"
++#else
++# CFLAGS="$CFLAGS -Imysql"
++#fi
+ 
+ CFLAGS="$CFLAGS $OPT_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $OPT_CFLAGS"
============================================================
--- packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop	6ef8f7d5db97dd3541a0bfe44325bd07296baf1b
+++ packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop	6ef8f7d5db97dd3541a0bfe44325bd07296baf1b
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=GPSDrive
+Comment=GPS map software
+Exec=gpsdrive -M pda -1
+Icon=gpsicon
+Terminal=false
+Type=Application
+Categories=Graphics;Network;Geography;Application;Other
+StartupNotify=true
============================================================
--- packages/gpsdrive/gpsdrive_2.10pre4.bb	9e4cea32b63aa093d54c9b1039cfa8dd87790322
+++ packages/gpsdrive/gpsdrive_2.10pre4.bb	9e4cea32b63aa093d54c9b1039cfa8dd87790322
@@ -0,0 +1,33 @@
+require gpsdrive.inc
+
+DEPENDS += "libwww-perl-native libart-lgpl libxml2 cairo mysql"
+RDEPENDS_${PN} += "libwww-perl"
+
+PR = "r2"
+
+SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
+           file://gpsdrive_2.10pre4.desktop \
+           file://gpsdrive-remove-hardcoded-paths.patch;patch=1 \
+           file://gpsdrive-ifdef-mapnik.patch;patch=1 \
+           file://gpsdrive-2.10pre4-openstreetmap-download.patch;patch=1"
+
+do_install_append () {
+        mkdir -p  ${D}${datadir}/applications
+        install -m 0644 ${WORKDIR}/gpsdrive_2.10pre4.desktop ${D}${datadir}/applications/gpsdrive.desktop
+	mkdir -p ${D}${datadir}/pixmaps
+	cp ${D}${datadir}/${PN}/pixmaps/gpsicon.png ${D}${datadir}/pixmaps
+        # remove stuff we don't want to package
+        rm ${D}${datadir}/${PN}/gpsdrive.desktop # we have our own one
+        rm -rf ${D}${datadir}/${PN}/DSL # for Damn Small Linux
+        rm -rf ${D}${datadir}/${PN}/gentoo # for Gentoo
+}
+
+PACKAGES += "gpsdrive-maps gpsdrive-map-icons-classic gpsdrive-map-icons-other gpsdrive-addons"
+
+FILES_${PN} = "${bindir}/gpsdrive ${datadir}/applications ${datadir}/map-icons/icons.xml"
+FILES_${PN} += "${datadir}/pixmaps ${datadir}/${PN}/pixmaps ${datadir}/${PN}/poi"
+FILES_${PN}-addons = "${bindir}/*.pl ${bindir}/friendsd2 ${bindir}/geo* ${bindir}/*.sh ${bindir}/*.py ${bindir}/gpsreplay ${bindir}/gpssmswatch ${bindir}/wp* ${datadir}/mapnik ${datadir}/perl*/Geo ${datadir}/perl*/Utils"
+FILES_${PN}-map-icons-classic = "${datadir}/map-icons/classic.small"
+FILES_${PN}-map-icons-other = "${datadir}/map-icons/classic.big ${datadir}/map-icons/japan ${datadir}/map-icons/nickw ${datadir}/map-icons/square.big ${datadir}/map-icons/square.small ${datadir}/map-icons/svg"
+FILES_${PN}-maps = "${datadir}/${PN}/maps ${datadir}/${PN}/map_koord.txt"
+FILES_${PN}-doc = "${datadir}/man ${datadir}/${PN}/Documentation"
============================================================
--- packages/images/openmoko-qtopia-image.bb	85858c01bf04fa98f230120b45029c9ffc41a05c
+++ packages/images/openmoko-qtopia-image.bb	85858c01bf04fa98f230120b45029c9ffc41a05c
@@ -0,0 +1,22 @@
+#------------------------------------------------------
+# OpenMoko Qtopia Image Recipe
+#------------------------------------------------------
+
+require openmoko-minimal-image.bb
+
+export IMAGE_BASENAME = "${PN}"
+
+IMAGE_INSTALL += "\
+  alsa-state \
+  bluez-hcidump \
+  bluez-utils \
+  task-openmoko-qtopia \
+"
+
+DEPENDS += "\
+  task-openmoko-qtopia \
+"
+
+RDEPENDS = "${PACKAGE_INSTALL}"
+
+LICENSE = MIT
============================================================
--- packages/images/openmoko-qtopia-x11-image.bb	fd1679f4eb35ac9f3302c6a11f82e975921a169f
+++ packages/images/openmoko-qtopia-x11-image.bb	fd1679f4eb35ac9f3302c6a11f82e975921a169f
@@ -0,0 +1,7 @@
+#------------------------------------------------------
+# OpenMoko Qtopia/X11 Image Recipe
+#------------------------------------------------------
+
+require openmoko-minimal-image.bb
+
+IMAGE_INSTALL += "task-openmoko-qtopia-x11"
============================================================
--- packages/linux/linux-kaiser_2.6.24+git.bb	f35b44d6d3ebfde341c328a3b1e8362f8dec89de
+++ packages/linux/linux-kaiser_2.6.24+git.bb	f35b44d6d3ebfde341c328a3b1e8362f8dec89de
@@ -0,0 +1,15 @@
+require linux.inc
+
+PV = "2.6.24+git${SRCREV}"
+
+COMPATIBLE_MACHINE = "htckaiser"
+
+SRC_URI = "git://git.android.com/kernel.git;branch=android-msm;protocol=git \
+           http://baliniak.pl/android/kernel.diff;patch=1"
+
+S = "${WORKDIR}/git"
+
+do_configure_prepend() {
+	cp .config ../defconfig
+}
+
============================================================
--- packages/multitap-pad/files/80multitappad	b613cc7c89d800c205b89dd7013c4b3ba309b319
+++ packages/multitap-pad/files/80multitappad	b613cc7c89d800c205b89dd7013c4b3ba309b319
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+CMD=""
+
+if [ "$DISPLAY_CAN_ROTATE" = "1" ]; then
+    if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then
+        CMD="multitap-pad -d -o landscape"
+    elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then
+        CMD="multitap-pad -d -o portrait"
+    fi
+else
+    CMD="multitap-pad -d"
+fi
+
+
+# Delay to make sure the window manager is active
+
+if [ "$CMD" ]; then
+    (sleep 2 && $CMD) &
+fi
============================================================
--- packages/multitap-pad/multitap-pad_svn.bb	8f2b626f58690dd52e509cacab5977c5f52270e2
+++ packages/multitap-pad/multitap-pad_svn.bb	8f2b626f58690dd52e509cacab5977c5f52270e2
@@ -0,0 +1,47 @@
+DESCRIPTION = "Multi-tap input method for GTK"
+LICENSE = "GPL"
+DEPENDS = "libfakekey gtk+ matchbox-panel-2"
+RCONFLICTS = matchbox-keyboard-inputmethod
+SECTION = "x11"
+PV = "0.0+svnr${SRCREV}"
+
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http \
+	file://80multitappad"
+
+inherit autotools pkgconfig
+
+S = "${WORKDIR}/${PN}"
+
+FILES_${PN} = "${bindir}/* \
+               ${libdir} \
+	       ${sysconfdir} \
+	       ${datadir}"
+
+FILES_${PN}-dbg += " ${libdir}/gtk-2.0/2.10.0/immodules/.debug \
+                     ${libdir}/matchbox-panel/.debug"
+
+FILES_${PN}-dev += " ${libdir}/gtk-2.0/2.10.0/immodules/*.a \
+                     ${libdir}/gtk-2.0/2.10.0/immodules/*.la \
+		     ${libdir}/matchbox-panel/*.a \
+		     ${libdir}/matchbox-panel/*.la"
+
+do_install_append () {
+	install -d ${D}/${sysconfdir}/X11/Xsession.d/
+	install -m 755 ${WORKDIR}/80multitappad ${D}/${sysconfdir}/X11/Xsession.d/
+}
+
+pkg_postinst_multitap-pad () {
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
+
+pkg_postrm_multitap-pad () {
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
============================================================
--- packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb	4e424e0c74d42282c80ac2738e417b8dc7014e80
+++ packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb	4e424e0c74d42282c80ac2738e417b8dc7014e80
@@ -0,0 +1,7 @@
+DESCRIPTION = "Shows an out-of-memory warning in the OpenMoko panel"
+DEPENDS = "libnotify"
+RDEPENDS = "openmoko-dialer2"
+PV = "0.0.0+svn${SVNREV}"
+PR = "r0"
+
+inherit openmoko-panel-plugin
============================================================
--- packages/openmoko-tools/pty-forward-native.bb	17c7e0ad0fe30607be9326cec651ccf4ee86b4b8
+++ packages/openmoko-tools/pty-forward-native.bb	17c7e0ad0fe30607be9326cec651ccf4ee86b4b8
@@ -0,0 +1,24 @@
+LICENSE="GPL"
+SUMMARY="Receive a forwarded serial from serial-forward and provide a PTY"
+
+SRC_URI="svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http"
+S = "${WORKDIR}/serial_forward"
+
+inherit native
+
+do_compile() {
+    cd ${S}
+    oe_runmake
+}
+
+do_stage() {
+    :
+}
+
+do_deploy() {
+    install -d ${DEPLOY_DIR_IMAGE}
+    install -m 0755 ${S}/pty_forward ${DEPLOY_DIR_IMAGE}/pty-forward
+}
+
+addtask deploy before do_package after do_install
+
============================================================
--- packages/openmoko-tools/serial-forward.bb	32434a87a886be4c262ea2f13af0375bae297e48
+++ packages/openmoko-tools/serial-forward.bb	32434a87a886be4c262ea2f13af0375bae297e48
@@ -0,0 +1,15 @@
+LICENSE="GPL"
+SUMMARY="Forward a serial using TCP/IP"
+
+SRC_URI="svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http"
+S="${WORKDIR}/serial_forward"
+
+do_compile() {
+    cd ${S}
+    oe_runmake
+}
+
+do_install() {
+    install -d ${D}/${bindir}
+    install -m 0755 ${S}/forward ${D}/${bindir}/${PN}
+}
============================================================
--- packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch	43b8c9925bee93d59e2aefd4c7eec71d0b796197
+++ packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch	43b8c9925bee93d59e2aefd4c7eec71d0b796197
@@ -0,0 +1,13 @@
+Index: openmoko-dialer2/src/phone-kit/moko-notify.c
+===================================================================
+--- openmoko-dialer2/src/phone-kit/moko-notify.c.orig	2008-02-14 17:47:23.000000000 +0800
++++ openmoko-dialer2/src/phone-kit/moko-notify.c	2008-02-14 17:48:19.000000000 +0800
+@@ -38,7 +38,7 @@
+ 
+ #define DEFAULT_RINGTONE "/default_ringtone.ogg"
+ #define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl"
+-#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator"
++#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator"
+ 
+ struct _MokoNotifyPrivate
+ {
============================================================
--- packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch	d1c708f7f915fa250e20a84fa9d4512440442a4f
+++ packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch	d1c708f7f915fa250e20a84fa9d4512440442a4f
@@ -0,0 +1,15 @@
+Index: openmoko-dialer2/src/phone-kit/moko-notify.c
+===================================================================
+--- openmoko-dialer2/src/phone-kit/moko-notify.c	(revision 4051)
++++ openmoko-dialer2/src/phone-kit/moko-notify.c	(working copy)
+@@ -37,8 +37,8 @@
+         MOKO_TYPE_NOTIFY, MokoNotifyPrivate))
+ 
+ #define DEFAULT_RINGTONE "/default_ringtone.ogg"
+-#define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl"
+-#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator"
++#define SYS_BRIGHTNESS "/sys/class/backlight/pcf50633-bl"
++#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator"
+ 
+ struct _MokoNotifyPrivate
+ {
============================================================
--- packages/perl/libwww-perl-native_5.808.bb	66723b8808de2c5758435a88b9640bc8777d89be
+++ packages/perl/libwww-perl-native_5.808.bb	66723b8808de2c5758435a88b9640bc8777d89be
@@ -0,0 +1,5 @@
+SECTION = "libs"
+
+inherit native
+
+require libwww-perl_${PV}.bb
============================================================
--- packages/perl/libwww-perl_5.808.bb	c76a162b7e6844022d4b9826386bfeed71c6328e
+++ packages/perl/libwww-perl_5.808.bb	c76a162b7e6844022d4b9826386bfeed71c6328e
@@ -0,0 +1,12 @@
+DESCRIPTION = "libwww-perl provides a simple and consistent API to the World Wide Web"
+SECTION = "libs"
+LICENSE = "Artistic"
+DEPENDS = "liburi-perl-native"
+RDEPENDS = "liburi-perl"
+PR = "r1"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-${PV}.tar.gz"
+
+S = "${WORKDIR}/libwww-perl-${PV}"
+
+inherit cpan
============================================================
--- packages/qtopia-phone/files/fic-gta01/device-conf	33f77c8d4d680c25796f493f054c0e6581439476
+++ packages/qtopia-phone/files/fic-gta01/device-conf	33f77c8d4d680c25796f493f054c0e6581439476
@@ -0,0 +1,46 @@
+-arch OE_QT_ARCH
+-xplatform OE_QT_XPLATFORM
+-verbose
+-qtopiamedia
+-mediaengines gstreamer
+-extra-qtopiacore-config "-qt-mouse-linuxtp"
+-extra-qtopiacore-config "-depths 16"
+-no-infrared
+-dbus
+-dbuspath OE_QT_DBUSPATH
+-iconsize 22
+-displaysize 480x640
+-extra-qtopiacore-config "-D QT_QWS_SCREENCORDS" 
+-extra-qtopiacore-config "-D QT_QWS_SCREEN_COORDINATES"
+-extra-qtopiacore-config "-fast" 
+-extra-qtopiacore-config "-no-accessibility" 
+-extra-qtopiacore-config "-no-cups"
+-extra-qtopiacore-config "-no-freetype" 
+-extra-qtopiacore-config "-nomake demos" 
+-extra-qtopiacore-config "-nomake examples"
+-extra-qtopiacore-config "-qt-gfx-linuxfb" 
+-extra-qtopiacore-config "-qt-libjpeg" 
+-extra-qtopiacore-config "-qt-libmng" 
+-extra-qtopiacore-config "-qt-libpng" 
+-extra-qtopiacore-config "-qt-mouse-tslib" 
+-extra-qtopiacore-config "-qt-zlib" 
+-extra-qtopiacore-config "-release" 
+-extra-qtopiacore-config "OE_QT_ENDIAN"
+-extra-qt-config "-nomake examples" 
+-extra-qt-config "-nomake demos" 
+-font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75
+-image OE_QT_RPREFIX
+-launch-method quicklaunch
+-force-quicklaunch
+-no-clean 
+-no-drm
+-no-qvfb
+-no-vpn
+-no-sxe
+-no-silent
+-prefix OE_QT_RPREFIX
+-reduce-exports=yes
+-release
+-confirm-license
+OE_QT_EXTRACONFIG
+
============================================================
--- packages/qtopia-phone/files/fic-gta01/device-conf.old	7cf2ef99b35315048f286f7f0027ed5c6d609862
+++ packages/qtopia-phone/files/fic-gta01/device-conf.old	7cf2ef99b35315048f286f7f0027ed5c6d609862
@@ -0,0 +1,48 @@
+-arch OE_QT_ARCH
+-xplatform OE_QT_XPLATFORM
+-verbose
+-qtopiamedia
+-mediaengines gstreamer
+-extra-qtopiacore-config "-qt-mouse-linuxtp"
+-extra-qtopiacore-config "-depths OE_QT_DEPTHS"
+-no-infrared
+-dbus
+-dbuspath OE_QT_DBUSPATH
+-iconsize OT_QT_ICONSIZE
+-displaysize OE_QT_DISPLAYSIZE
+-extra-qtopiacore-config "-D QT_QWS_SCREENCORDS" 
+-extra-qtopiacore-config "-D QT_QWS_SCREEN_COORDINATES"
+-extra-qtopiacore-config "-fast" 
+-extra-qtopiacore-config "-no-accessibility" 
+-extra-qtopiacore-config "-no-cups"
+-extra-qtopiacore-config "-no-freetype" 
+-extra-qtopiacore-config "-nomake demos" 
+-extra-qtopiacore-config "-nomake examples"
+-extra-qtopiacore-config "-qt-gfx-linuxfb" 
+-extra-qtopiacore-config "-qt-libjpeg" 
+-extra-qtopiacore-config "-qt-libmng" 
+-extra-qtopiacore-config "-qt-libpng" 
+-extra-qtopiacore-config "-qt-mouse-tslib" 
+-extra-qtopiacore-config "-qt-zlib" 
+-extra-qtopiacore-config "-release" 
+#-extra-qtopiacore-config "-LOE_QT_LIBDIR" 
+#-extra-qtopiacore-config "-IOE_QT_INCDIR" 
+-extra-qtopiacore-config "OE_QT_ENDIAN"
+-extra-qt-config "-nomake examples" 
+-extra-qt-config "-nomake demos" 
+-font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75
+-image OE_QT_RPREFEX
+-launch-method quicklaunch
+-force-quicklaunch
+-no-clean 
+-no-drm
+-no-qvfb
+-no-vpn
+-no-sxe
+-no-silent
+-prefix OE_QT_RPREFIX
+-reduce-exports=yes
+-release
+-confirm-license
+OE_QT_EXTRACONFIG
+
============================================================
--- packages/qtopia-phone/files/fic-gta01/qplatformdefs.h	4548b7c6203d64cb5ba410f46ff363427f46e675
+++ packages/qtopia-phone/files/fic-gta01/qplatformdefs.h	4548b7c6203d64cb5ba410f46ff363427f46e675
@@ -0,0 +1,146 @@
+/****************************************************************************
+**
+** Copyright (C) 2000-2007 TROLLTECH ASA. All rights reserved.
+**
+** This file is part of the Opensource Edition of the Qtopia Toolkit.
+**
+** This software is licensed under the terms of the GNU General Public
+** License (GPL) version 2.
+**
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info at trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#ifndef QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
+
+// Get Qt defines/settings
+
+#include "qglobal.h"
+
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
+#endif
+
+#include <unistd.h>
+
+
+// We are hot - unistd.h should have turned on the specific APIs we requested
+
+#include <features.h>
+#include <pthread.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <signal.h>
+#include <dlfcn.h>
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/ipc.h>
+#include <sys/time.h>
+#include <sys/shm.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <netinet/in.h>
+#ifndef QT_NO_IPV6IFNAME
+#include <net/if.h>
+#endif
+
+#ifdef QT_LARGEFILE_SUPPORT
+#define QT_STATBUF              struct stat64
+#define QT_STATBUF4TSTAT        struct stat64
+#define QT_STAT                 ::stat64
+#define QT_FSTAT                ::fstat64
+#define QT_LSTAT                ::lstat64
+#define QT_OPEN                 ::open64
+#define QT_TRUNCATE             ::truncate64
+#define QT_FTRUNCATE            ::ftruncate64
+#define QT_LSEEK                ::lseek64
+#else
+#define QT_STATBUF              struct stat
+#define QT_STATBUF4TSTAT        struct stat
+#define QT_STAT                 ::stat
+#define QT_FSTAT                ::fstat
+#define QT_LSTAT                ::lstat
+#define QT_OPEN                 ::open
+#define QT_TRUNCATE             ::truncate
+#define QT_FTRUNCATE            ::ftruncate
+#define QT_LSEEK                ::lseek
+#endif
+
+#ifdef QT_LARGEFILE_SUPPORT
+#define QT_FOPEN                ::fopen64
+#define QT_FSEEK                ::fseeko64
+#define QT_FTELL                ::ftello64
+#define QT_FGETPOS              ::fgetpos64
+#define QT_FSETPOS              ::fsetpos64
+#define QT_FPOS_T               fpos64_t
+#define QT_OFF_T                off64_t
+#else
+#define QT_FOPEN                ::fopen
+#define QT_FSEEK                ::fseek
+#define QT_FTELL                ::ftell
+#define QT_FGETPOS              ::fgetpos
+#define QT_FSETPOS              ::fsetpos
+#define QT_FPOS_T               fpos_t
+#define QT_OFF_T                long
+#endif
+
+#define QT_STAT_REG		S_IFREG
+#define QT_STAT_DIR		S_IFDIR
+#define QT_STAT_MASK		S_IFMT
+#define QT_STAT_LNK		S_IFLNK
+#define QT_SOCKET_CONNECT	::connect
+#define QT_SOCKET_BIND		::bind
+#define QT_SOCKET_BIND		::bind
+#define QT_FILENO		fileno
+#define QT_CLOSE		::close
+#define QT_READ			::read
+#define QT_WRITE		::write
+#define QT_ACCESS		::access
+#define QT_GETCWD		::getcwd
+#define QT_CHDIR		::chdir
+#define QT_MKDIR		::mkdir
+#define QT_RMDIR		::rmdir
+#define QT_OPEN_LARGEFILE       O_LARGEFILE
+#define QT_OPEN_RDONLY		O_RDONLY
+#define QT_OPEN_WRONLY		O_WRONLY
+#define QT_OPEN_RDWR		O_RDWR
+#define QT_OPEN_CREAT		O_CREAT
+#define QT_OPEN_TRUNC		O_TRUNC
+#define QT_OPEN_APPEND		O_APPEND
+
+#define QT_SIGNAL_RETTYPE	void
+#define QT_SIGNAL_ARGS		int
+#define QT_SIGNAL_IGNORE	SIG_IGN
+
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+#define QT_SOCKLEN_T		socklen_t
+#else
+#define QT_SOCKLEN_T		int
+#endif
+
+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+#define QT_SNPRINTF		::snprintf
+#define QT_VSNPRINTF		::vsnprintf
+#endif
+
+#define QT_QLOCALE_USES_FCVT
+
+#endif // QPLATFORMDEFS_H
============================================================
--- packages/qtopia-phone/files/fic-gta02/device-conf	33f77c8d4d680c25796f493f054c0e6581439476
+++ packages/qtopia-phone/files/fic-gta02/device-conf	33f77c8d4d680c25796f493f054c0e6581439476
@@ -0,0 +1,46 @@
+-arch OE_QT_ARCH
+-xplatform OE_QT_XPLATFORM
+-verbose
+-qtopiamedia
+-mediaengines gstreamer
+-extra-qtopiacore-config "-qt-mouse-linuxtp"
+-extra-qtopiacore-config "-depths 16"
+-no-infrared
+-dbus
+-dbuspath OE_QT_DBUSPATH
+-iconsize 22
+-displaysize 480x640
+-extra-qtopiacore-config "-D QT_QWS_SCREENCORDS" 
+-extra-qtopiacore-config "-D QT_QWS_SCREEN_COORDINATES"
+-extra-qtopiacore-config "-fast" 
+-extra-qtopiacore-config "-no-accessibility" 
+-extra-qtopiacore-config "-no-cups"
+-extra-qtopiacore-config "-no-freetype" 
+-extra-qtopiacore-config "-nomake demos" 
+-extra-qtopiacore-config "-nomake examples"
+-extra-qtopiacore-config "-qt-gfx-linuxfb" 
+-extra-qtopiacore-config "-qt-libjpeg" 
+-extra-qtopiacore-config "-qt-libmng" 
+-extra-qtopiacore-config "-qt-libpng" 
+-extra-qtopiacore-config "-qt-mouse-tslib" 
+-extra-qtopiacore-config "-qt-zlib" 
+-extra-qtopiacore-config "-release" 
+-extra-qtopiacore-config "OE_QT_ENDIAN"
+-extra-qt-config "-nomake examples" 
+-extra-qt-config "-nomake demos" 
+-font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75
+-image OE_QT_RPREFIX
+-launch-method quicklaunch
+-force-quicklaunch
+-no-clean 
+-no-drm
+-no-qvfb
+-no-vpn
+-no-sxe
+-no-silent
+-prefix OE_QT_RPREFIX
+-reduce-exports=yes
+-release
+-confirm-license
+OE_QT_EXTRACONFIG
+
============================================================
--- packages/qtopia-phone/files/fic-gta02/device-conf.old	7cf2ef99b35315048f286f7f0027ed5c6d609862
+++ packages/qtopia-phone/files/fic-gta02/device-conf.old	7cf2ef99b35315048f286f7f0027ed5c6d609862
@@ -0,0 +1,48 @@
+-arch OE_QT_ARCH
+-xplatform OE_QT_XPLATFORM
+-verbose
+-qtopiamedia
+-mediaengines gstreamer
+-extra-qtopiacore-config "-qt-mouse-linuxtp"
+-extra-qtopiacore-config "-depths OE_QT_DEPTHS"
+-no-infrared
+-dbus
+-dbuspath OE_QT_DBUSPATH
+-iconsize OT_QT_ICONSIZE
+-displaysize OE_QT_DISPLAYSIZE
+-extra-qtopiacore-config "-D QT_QWS_SCREENCORDS" 
+-extra-qtopiacore-config "-D QT_QWS_SCREEN_COORDINATES"
+-extra-qtopiacore-config "-fast" 
+-extra-qtopiacore-config "-no-accessibility" 
+-extra-qtopiacore-config "-no-cups"
+-extra-qtopiacore-config "-no-freetype" 
+-extra-qtopiacore-config "-nomake demos" 
+-extra-qtopiacore-config "-nomake examples"
+-extra-qtopiacore-config "-qt-gfx-linuxfb" 
+-extra-qtopiacore-config "-qt-libjpeg" 
+-extra-qtopiacore-config "-qt-libmng" 
+-extra-qtopiacore-config "-qt-libpng" 
+-extra-qtopiacore-config "-qt-mouse-tslib" 
+-extra-qtopiacore-config "-qt-zlib" 
+-extra-qtopiacore-config "-release" 
+#-extra-qtopiacore-config "-LOE_QT_LIBDIR" 
+#-extra-qtopiacore-config "-IOE_QT_INCDIR" 
+-extra-qtopiacore-config "OE_QT_ENDIAN"
+-extra-qt-config "-nomake examples" 
+-extra-qt-config "-nomake demos" 
+-font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75
+-image OE_QT_RPREFEX
+-launch-method quicklaunch
+-force-quicklaunch
+-no-clean 
+-no-drm
+-no-qvfb
+-no-vpn
+-no-sxe
+-no-silent
+-prefix OE_QT_RPREFIX
+-reduce-exports=yes
+-release
+-confirm-license
+OE_QT_EXTRACONFIG
+
============================================================
--- packages/qtopia-phone/files/fic-gta02/qplatformdefs.h	4548b7c6203d64cb5ba410f46ff363427f46e675
+++ packages/qtopia-phone/files/fic-gta02/qplatformdefs.h	4548b7c6203d64cb5ba410f46ff363427f46e675
@@ -0,0 +1,146 @@
+/****************************************************************************
+**
+** Copyright (C) 2000-2007 TROLLTECH ASA. All rights reserved.
+**
+** This file is part of the Opensource Edition of the Qtopia Toolkit.
+**
+** This software is licensed under the terms of the GNU General Public
+** License (GPL) version 2.
+**
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info at trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#ifndef QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
+
+// Get Qt defines/settings
+
+#include "qglobal.h"
+
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
+#endif
+
+#include <unistd.h>
+
+
+// We are hot - unistd.h should have turned on the specific APIs we requested
+
+#include <features.h>
+#include <pthread.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <signal.h>
+#include <dlfcn.h>
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/ipc.h>
+#include <sys/time.h>
+#include <sys/shm.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <netinet/in.h>
+#ifndef QT_NO_IPV6IFNAME
+#include <net/if.h>
+#endif
+
+#ifdef QT_LARGEFILE_SUPPORT
+#define QT_STATBUF              struct stat64
+#define QT_STATBUF4TSTAT        struct stat64
+#define QT_STAT                 ::stat64
+#define QT_FSTAT                ::fstat64
+#define QT_LSTAT                ::lstat64
+#define QT_OPEN                 ::open64
+#define QT_TRUNCATE             ::truncate64
+#define QT_FTRUNCATE            ::ftruncate64
+#define QT_LSEEK                ::lseek64
+#else
+#define QT_STATBUF              struct stat
+#define QT_STATBUF4TSTAT        struct stat
+#define QT_STAT                 ::stat
+#define QT_FSTAT                ::fstat
+#define QT_LSTAT                ::lstat
+#define QT_OPEN                 ::open
+#define QT_TRUNCATE             ::truncate
+#define QT_FTRUNCATE            ::ftruncate
+#define QT_LSEEK                ::lseek
+#endif
+
+#ifdef QT_LARGEFILE_SUPPORT
+#define QT_FOPEN                ::fopen64
+#define QT_FSEEK                ::fseeko64
+#define QT_FTELL                ::ftello64
+#define QT_FGETPOS              ::fgetpos64
+#define QT_FSETPOS              ::fsetpos64
+#define QT_FPOS_T               fpos64_t
+#define QT_OFF_T                off64_t
+#else
+#define QT_FOPEN                ::fopen
+#define QT_FSEEK                ::fseek
+#define QT_FTELL                ::ftell
+#define QT_FGETPOS              ::fgetpos
+#define QT_FSETPOS              ::fsetpos
+#define QT_FPOS_T               fpos_t
+#define QT_OFF_T                long
+#endif
+
+#define QT_STAT_REG		S_IFREG
+#define QT_STAT_DIR		S_IFDIR
+#define QT_STAT_MASK		S_IFMT
+#define QT_STAT_LNK		S_IFLNK
+#define QT_SOCKET_CONNECT	::connect
+#define QT_SOCKET_BIND		::bind
+#define QT_SOCKET_BIND		::bind
+#define QT_FILENO		fileno
+#define QT_CLOSE		::close
+#define QT_READ			::read
+#define QT_WRITE		::write
+#define QT_ACCESS		::access
+#define QT_GETCWD		::getcwd
+#define QT_CHDIR		::chdir
+#define QT_MKDIR		::mkdir
+#define QT_RMDIR		::rmdir
+#define QT_OPEN_LARGEFILE       O_LARGEFILE
+#define QT_OPEN_RDONLY		O_RDONLY
+#define QT_OPEN_WRONLY		O_WRONLY
+#define QT_OPEN_RDWR		O_RDWR
+#define QT_OPEN_CREAT		O_CREAT
+#define QT_OPEN_TRUNC		O_TRUNC
+#define QT_OPEN_APPEND		O_APPEND
+
+#define QT_SIGNAL_RETTYPE	void
+#define QT_SIGNAL_ARGS		int
+#define QT_SIGNAL_IGNORE	SIG_IGN
+
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+#define QT_SOCKLEN_T		socklen_t
+#else
+#define QT_SOCKLEN_T		int
+#endif
+
+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+#define QT_SNPRINTF		::snprintf
+#define QT_VSNPRINTF		::vsnprintf
+#endif
+
+#define QT_QLOCALE_USES_FCVT
+
+#endif // QPLATFORMDEFS_H
============================================================
--- packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia	54bf1406f00aebb9f05186ae64e99cd38f45ef0b
+++ packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia	54bf1406f00aebb9f05186ae64e99cd38f45ef0b
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# xmodmap to allow the soft-menu to work
+xmodmap -e "keycode 180 = 0x11000601"
+xmodmap -e "keycode 181 = 0x11000602"
+xmodmap -e "keycode 182 = 0x11000603"
+xmodmap -e "keycode 183 = 0x11000604"
+xmodmap -e "keycode 184 = 0x11000605"
+xmodmap -e "keycode 185 = 0x11000606"
+xmodmap -e "keycode 186 = 0x11000607"
+xmodmap -e "keycode 187 = 0x11000608"
+xmodmap -e "keycode 188 = 0x11000609"
+xmodmap -e "keycode 189 = 0x1100060A"
+xmodmap -e "keycode 190 = 0x1100060B"
+xmodmap -e "keycode 191 = 0x1100060B"
+xmodmap -e "keycode 192 = 0x1100060A"
+xmodmap -e "keycode 193 = 0x1100060C"
+xmodmap -e "keycode 194 = 0x1100060D"
+xmodmap -e "keycode 195 = 0x1100060E"
+xmodmap -e "keycode 196 = 0x1100060F"
+xmodmap -e "keycode 197 = 0x11000610"
+xmodmap -e "keycode 198 = 0x1008ff26"
+
+# path setup
+export QPEDIR=/opt/Qtopia
+export PATH=$QPEDIR/bin:$PATH
+export LD_LIBRARY_PATH=$QPEDIR/lib:$LD_LIBRARY_PATH
+
+#tell Qtopia how to inform illume on incoming phone calls
+#export ILLUME_PHONE_CALL=
+export QTOPIA_PHONE_VENDOR=ficgta01
+export QTOPIA_PHONE_MUX=ficgta01
+
+
+# Now start Qtopia
+qpe &
============================================================
--- packages/qtopia-phone/qtopia-phone-x11/qtopia.sh	14600d791e31540ce23ce74084b05c424a136b7f
+++ packages/qtopia-phone/qtopia-phone-x11/qtopia.sh	14600d791e31540ce23ce74084b05c424a136b7f
@@ -0,0 +1,4 @@
+#!/bin/sh
+export QPEDIR=/opt/Qtopia
+export PATH=$PATH:$QPEDIR/bin
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$QPEDIR/lib
============================================================
--- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb	8d6511f3785b690662798bf6a7814f77ef203bca
+++ packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb	8d6511f3785b690662798bf6a7814f77ef203bca
@@ -0,0 +1,123 @@
+# This is qtopia-phone recipe heavilly based off the one in the qtopia-phone
+# distribution.
+#
+# Please DO NOT merge this file into OE, it is not suitable for that yet as
+# it compiles both native and target binaries. This requires stuff to be
+# installed on the host which is against the aim of OE.
+
+DESCRIPTION = "Qtopia OpenSource"
+SECTION = "qtopia-phone"
+LICENSE = "GPL"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.trolltech.com"
+DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst"
+RDEPENDS = "atd tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific"
+PROVIDES = "qtopia-phone"
+PR = "r8"
+SRCREV = "${AUTOREV}"
+SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \
+           file://Xsession.d/89qtopia \
+           file://qtopia.sh"
+
+S = "${WORKDIR}/git"
+
+inherit pkgconfig
+
+TARGET-DEVICE="${@base_contains('MACHINE', 'nokia770', ' nokia770', '',d)}"
+TARGET-DEVICE="${@base_contains('MACHINE', 'nokia800', ' nokia770', '',d)}"
+TARGET-DEVICE="${@base_contains('MACHINE', 'spitz', ' c3200', '',d)}"
+TARGET-DEVICE="${@base_contains('MACHINE', 'tosa', ' c3200', '',d)}"
+TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta01', 'ficgta01', '',d)}"
+TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta02', 'ficgta01', '',d)}"
+
+require qtopia-phone_arch.inc
+
+QT_ARCH = "${@qtopia_arch(d)}"
+QT_ENDIAN = "${@qtopia_endian(d)}"
+PLATFORM = "${BUILD_OS}-g++"
+BUILDDIR = "${WORKDIR}/build"
+OE_QT_PREFIX = "/opt/Qtopia"
+
+export OE_QMAKE_CC="${CC}"
+export OE_QMAKE_CFLAGS="${CFLAGS}"
+export OE_QMAKE_CXX="${CXX}"
+export OE_QMAKE_LDFLAGS="${LDFLAGS}"
+export OE_QMAKE_AR="${AR}"
+export OE_QMAKE_STRIP="echo"
+export OE_QMAKE_RPATH="-Wl,-rpath-link,"
+
+do_configure() {
+
+# This qmake some how does not honor env var, let us fix it by sed force
+sed -i s%$\(OE_QMAKE_CC\)%"${CC}"%g               ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
+sed -i s%$\(OE_QMAKE_CFLAGS\)%"${CFLAGS}"%g       ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
+sed -i s%$\(OE_QMAKE_CXX\)%"${CXX}"%g             ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
+sed -i s%$\(OE_QMAKE_CXXFLAGS\)%"${CXXFLAGS}"%g   ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
+sed -i s%$\(OE_QMAKE_LINK\)%"${CXX}"%g            ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
+sed -i s%$\(OE_QMAKE_LDFLAGS\)%"${LDFLAGS}"%g     ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
+sed -i s%$\(OE_QMAKE_AR\)%"${AR}"%g               ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
+sed -i s%$\(OE_QMAKE_STRIP\)%"echo"%g             ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
+
+
+unset CC
+unset CXX
+unset CFLAGS
+unset CXXFLAGS
+unset LDFLAGS
+
+
+mkdir -p ${BUILDDIR}
+cd ${BUILDDIR}
+echo yes | ${S}/configure -xplatform linux-oe-g++ -arch ${QT_ARCH} ${QT_ENDIAN} -prefix ${OE_QT_PREFIX} -device ${TARGET-DEVICE} -verbose \
+                          -no-drm -no-sxe -displaysize 480x640 -dbus -debug -extra-qtopiacore-config "-qt-libjpeg -qt-zlib -qt-libpng -no-iconv -no-sm -fontconfig -xrender -xrandr" \
+                           -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/fontconfig -I${STAGING_INCDIR}/dbus-1.0
+
+}
+
+do_compile() {
+    cd ${BUILDDIR}
+    oe_runmake
+}
+
+do_stage() {
+}
+
+
+do_install() {
+   cd ${BUILDDIR}
+   oe_runmake install INSTALL_ROOT=${D}${OE_QT_PREFIX} IMAGE=${D}${OE_QT_PREFIX}
+
+   # Install freedesktop.org .desktop files for enlightenment
+   install -d ${D}${datadir}/applications
+   for app in "${S}/apps-fdo/"*; do
+     for file in "$app"/*.desktop; do
+        install -m 0644 $file ${D}${datadir}/applications/
+     done
+   done 
+
+   # Install good icons for the desktop files
+
+   # Make sure qpe gets launched by X
+   install -d ${D}/${sysconfdir}/X11/Xsession.d
+   install -m 0755 ${WORKDIR}/Xsession.d/89qtopia ${D}${sysconfdir}/X11/Xsession.d/
+
+   # Install some scripts
+   install -d ${D}${bindir}
+   install -m 0755 ${S}/bin/qcop-x11-launch ${D}${bindir}
+
+   install -d ${D}${sysconfdir}/profile.d/
+   install -m 0755 ${WORKDIR}/qtopia.sh ${D}${sysconfdir}/profile.d/
+}
+
+FILES_${PN} += "${OE_QT_PREFIX}/bin ${OE_QT_PREFIX}/help  \
+                ${OE_QT_PREFIX}/lib/*.so.* ${OE_QT_PREFIX}/plugins/*/*.so \
+                ${OE_QT_PREFIX}/qtopia_db.sqlite ${OE_QT_PREFIX}/sounds \
+                ${OE_QT_PREFIX}/etc ${OE_QT_PREFIX}/i18n \
+                ${OE_QT_PREFIX}/pics ${OE_QT_PREFIX}/qt_plugins/*/*.so \
+                ${OE_QT_PREFIX}/services"
+
+FILES_${PN}-dbg += "${OE_QT_PREFIX}/lib/.debug/ ${OE_QT_PREFIX}/bin/.debug/ \
+                    ${OE_QT_PREFIX}/plugins/*/.debug/ ${OE_QT_PREFIX}/qt_plugins/*/.debug/ "
+
+FILES_${PN}-dev += "${OE_QT_PREFIX}/lib/*.so"
+
============================================================
--- packages/qtopia-phone/qtopia-phone.inc	3a88780f98fdd8af1ad280d0c3e688bf14e81001
+++ packages/qtopia-phone/qtopia-phone.inc	3a88780f98fdd8af1ad280d0c3e688bf14e81001
@@ -0,0 +1,114 @@
+# This is qtopia-phone recipe heavilly based off the one in the qtopia-phone
+# distribution.
+#
+# Please DO NOT merge this file into OE, it is not suitable for that yet as
+# it compiles both native and target binaries. This requires stuff to be
+# installed on the host which is against the aim of OE.
+
+DESCRIPTION = "Qtopia OpenSource"
+SECTION = "qtopia-phone"
+LICENSE = "GPL"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.trolltech.com"
+DEPENDS = "glib-2.0 dbus tslib gstreamer"
+PROVIDES = "qtopia-phone"
+PR = "r1"
+SRC_URI = "ftp://ftp.trolltech.com/qtopia/source/qtopia-opensource-src-${PV}.tar.gz \
+           file://device-conf \
+           file://qplatformdefs.h"
+
+S = "${WORKDIR}/qtopia-opensource-${PV}"
+
+inherit pkgconfig update-rc.d
+
+TARGET-DEVICE="${@base_contains('MACHINE', 'nokia770', ' nokia770', '',d)}"
+TARGET-DEVICE="${@base_contains('MACHINE', 'nokia800', ' nokia770', '',d)}"
+TARGET-DEVICE="${@base_contains('MACHINE', 'spitz', ' c3200', '',d)}"
+TARGET-DEVICE="${@base_contains('MACHINE', 'tosa', ' c3200', '',d)}"
+TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta01', 'ficgta01', '',d)}"
+
+INITSCRIPT_NAME = "qpe"
+INITSCRIPT_PARAMS = "defaults 98"
+
+export QTOPIA_DEPOT_PATH = "${S}"
+
+require qtopia-phone_arch.inc
+
+QT_ARCH = "${@qtopia_arch(d)}"
+QT_ENDIAN = "${@qtopia_endian(d)}"
+PLATFORM = "${BUILD_OS}-g++"
+XPLATFORM = "linux-oe-g++"
+BUILDDIR = "${WORKDIR}/build"
+
+OE_QT_DBUSPATH = "${STAGING_DIR_HOST}"
+OE_QT_ARCH = "${QT_ARCH}"
+OE_QT_XPLATFORM = "${XPLATFORM}"
+OE_QT_LIBDIR = "${STAGING_LIBDIR}"
+OE_QT_INCDIR = "${STAGING_INCDIR}"
+OE_QT_RPREFIX = "/opt/Qtopia"
+OE_QT_ENDIAN = "${QT_ENDIAN}"
+OE_QT_EXTRACONFIG = "-I${STAGING_INCDIR}/dbus-1.0"
+
+do_configure() {
+
+unset CC
+unset CXX
+unset CFLAGS
+unset CXXFLAGS
+unset LDFLAGS
+
+mkdir -p ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}
+install -m 644 ${S}/qtopiacore/qt/mkspecs/qws/linux-arm-g++/qmake.conf \
+    ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}
+install -m 644 ${WORKDIR}/qplatformdefs.h \
+    ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}
+sed -i -e "s at arm-linux-@${TARGET_SYS}-@" ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}/qmake.conf
+sed -i -e "s|QMAKE_RPATH.*|QMAKE_RPATH =|" ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}/qmake.conf
+
+# sed the dynamic config into the file
+sed -i -e "s|OE_QT_DBUSPATH|${OE_QT_DBUSPATH}|" ${WORKDIR}/device-conf
+sed -i -e "s|OE_QT_ARCH|${OE_QT_ARCH}|" ${WORKDIR}/device-conf
+sed -i -e "s|OE_QT_XPLATFORM|${OE_QT_XPLATFORM}|" ${WORKDIR}/device-conf
+sed -i -e "s|OE_QT_LIBDIR|${OE_QT_LIBDIR}|" ${WORKDIR}/device-conf
+sed -i -e "s|OE_QT_INCDIR|${OE_QT_INCDIR}|" ${WORKDIR}/device-conf
+sed -i -e "s|OE_QT_RPREFIX|${OE_QT_RPREFIX}|" ${WORKDIR}/device-conf
+sed -i -e "s|OE_QT_ENDIAN|${OE_QT_ENDIAN}|" ${WORKDIR}/device-conf
+sed -i -e "s|OE_QT_EXTRACONFIG|${OE_QT_EXTRACONFIG}|" ${WORKDIR}/device-conf
+
+rm -f ${S}/devices/${TARGET-DEVICE}/configure
+cp ${WORKDIR}/device-conf ${S}/devices/${TARGET-DEVICE}/configure
+rm -f ${S}/devices/${TARGET-DEVICE}/environment
+echo "" > ${S}/devices/${TARGET-DEVICE}/environment
+
+mkdir -p ${BUILDDIR}
+cd ${BUILDDIR}
+echo yes | ${S}/configure -device ${TARGET-DEVICE} -xplatform ${XPLATFORM}
+
+}
+
+do_compile() {
+    cd ${BUILDDIR}
+    oe_runmake
+}
+
+do_stage() {
+}
+
+
+do_install() {
+   cd ${BUILDDIR}
+   oe_runmake install INSTALL_ROOT=${D}${OE_QT_RPREFIX} IMAGE=${D}${OE_QT_RPREFIX}
+   install -d ${D}${sysconfdir}/init.d
+   install -m 0755 ${S}/devices/${TARGET-DEVICE}/src/devtools/startup/qpe.sh ${D}${sysconfdir}/init.d/qpe
+
+}
+
+FILES_${PN} += "${OE_QT_RPREFIX}/bin ${OE_QT_RPREFIX}/help  \
+                ${OE_QT_RPREFIX}/lib/*.so.* ${OE_QT_RPREFIX}/plugins \
+                ${OE_QT_RPREFIX}/qtopia_db.sqlite ${OE_QT_RPREFIX}/sounds \
+                ${OE_QT_RPREFIX}/etc ${OE_QT_RPREFIX}/i18n \
+                ${OE_QT_RPREFIX}/pics ${OE_QT_RPREFIX}/qt_plugins \
+                ${OE_QT_RPREFIX}/services ${OE_QT_RPREFIX}/lib/fonts"
+
+FILES_${PN}-dev += "${OE_QT_RPREFIX}/lib/*.so"
+
============================================================
--- packages/qtopia-phone/qtopia-phone_4.3.0.bb	6a8d100cd18fb90e6f4dfc83f85e4588a049db4c
+++ packages/qtopia-phone/qtopia-phone_4.3.0.bb	6a8d100cd18fb90e6f4dfc83f85e4588a049db4c
@@ -0,0 +1 @@
+require qtopia-phone.inc
============================================================
--- packages/qtopia-phone/qtopia-phone_4.3.1.bb	6a8d100cd18fb90e6f4dfc83f85e4588a049db4c
+++ packages/qtopia-phone/qtopia-phone_4.3.1.bb	6a8d100cd18fb90e6f4dfc83f85e4588a049db4c
@@ -0,0 +1 @@
+require qtopia-phone.inc
============================================================
--- packages/qtopia-phone/qtopia-phone_arch.inc	15641411049adbe933692115529c6bac3f43cfef
+++ packages/qtopia-phone/qtopia-phone_arch.inc	15641411049adbe933692115529c6bac3f43cfef
@@ -0,0 +1,23 @@
+inherit siteinfo
+
+def qtopia_arch(d):
+    import bb, re
+    arch = bb.data.getVar('TARGET_ARCH', d, 1)
+    if re.match("^i.86$", arch):
+        arch = "i386"
+    elif re.match("^arm.*", arch):
+        arch = "arm"
+    elif arch == "x86_64":
+        arch = "x86"
+    elif arch == "mipsel":
+        arch = "mips"
+    return arch
+
+def qtopia_endian(d):
+    import bb
+    if bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "le":
+        return "-little-endian"
+    elif bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "be":
+        return "-big-endian"
+    else:
+        assert False
============================================================
--- packages/tasks/task-openmoko-qtopia-x11.bb	38da0e6335542addd488373f6e8cee974a877a58
+++ packages/tasks/task-openmoko-qtopia-x11.bb	38da0e6335542addd488373f6e8cee974a877a58
@@ -0,0 +1,35 @@
+DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+ALLOW_EMPTY = "1"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+LICENSE = "MIT"
+PR = "r46"
+
+inherit task
+
+XSERVER ?= "xserver-kdrive-fbdev"
+
+PACKAGES = "task-openmoko-qtopia-x11"
+
+#
+# task-openmoko-qtopia-x11
+#
+DESCRIPTION_task-openmoko-qtopia-x11 = "OpenMoko: The Qtopia/X11 based User Interface"
+RDEPENDS_task-openmoko-qtopia-x11 = "\
+  alsa-state \
+  bluez-hcidump \
+  readline \
+  qtopia-phone-x11 \
+  e-wm \
+  illume \
+  ${XSERVER} \
+  xserver-kdrive-common \
+  xserver-nodm-init \
+  xauth \
+  xhost \
+  xset \
+  xrandr \
+  neod \
+  libnotify \
+"
+
============================================================
--- packages/tasks/task-openmoko-qtopia.bb	4367872d7b461db04275d0f119b597e45eb0811b
+++ packages/tasks/task-openmoko-qtopia.bb	4367872d7b461db04275d0f119b597e45eb0811b
@@ -0,0 +1,22 @@
+DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+ALLOW_EMPTY = "1"
+PACKAGE_ARCH = "all"
+LICENSE = "MIT"
+PR = "r45"
+
+PACKAGES = "task-openmoko-qtopia"
+
+#
+# task-openmoko-qtopia
+#
+DESCRIPTION_task-openmoko-qtopia = "OpenMoko: The Qtopia based native User Interface"
+RDEPENDS_task-openmoko-qtopia = "\
+  alsa-state \
+  bluez-hcidump \
+  readline \
+  gstreamer \
+  bootchart \
+  qtopia-phone \
+"
+
============================================================
--- packages/wpa-supplicant/wpa-supplicant_0.5.10.bb	96f91121be0d1a9fb9a7bbe2872fa7da5b580c83
+++ packages/wpa-supplicant/wpa-supplicant_0.5.10.bb	96f91121be0d1a9fb9a7bbe2872fa7da5b580c83
@@ -0,0 +1,61 @@
+DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)."
+SECTION = "network"
+LICENSE = "GPL"
+HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
+DEPENDS = "gnutls ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}"
+
+#we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds
+MY_ARCH := "${PACKAGE_ARCH}"
+PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}', d)}"
+
+SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
+	file://defconfig-gnutls \
+	file://ifupdown.sh \
+	file://functions.sh"
+
+S = "${WORKDIR}/wpa_supplicant-${PV}"
+
+PACKAGES_prepend = "wpa-supplicant-passphrase "
+FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase"
+
+RREPLACES = "wpa-supplicant-cli"
+
+RRECOMMENDS_${PN} = "wpa-supplicant-passphrase"
+
+export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}"
+
+do_configure () {
+        install -m 0755 ${WORKDIR}/defconfig-gnutls  .config
+
+        if [ "x$HAS_PCI" == "x1" ] ; then
+                echo "CONFIG_DRIVER_MADWIFI=y" >> .config
+                echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config
+        fi
+}
+
+do_compile () {
+	make
+}
+
+do_install () {
+	install -d ${D}${sbindir}
+	install -m 755 wpa_supplicant ${D}${sbindir}
+	install -m 755 wpa_passphrase ${D}${sbindir}
+	install -m 755 wpa_cli        ${D}${sbindir}
+
+	install -d ${D}${localstatedir}/run/wpa_supplicant
+
+	install -d ${D}${docdir}/wpa_supplicant
+	install -m 644 README ${D}${docdir}/wpa_supplicant
+
+	install -d ${D}${sysconfdir}/network/if-pre-up.d/
+	install -d ${D}${sysconfdir}/network/if-post-down.d/
+	install -d ${D}${sysconfdir}/network/if-down.d/
+
+	install -d ${D}${sysconfdir}/wpa_supplicant
+	install -m 755 ${WORKDIR}/ifupdown.sh ${D}${sysconfdir}/wpa_supplicant/
+	install -m 755 ${WORKDIR}/functions.sh ${D}${sysconfdir}/wpa_supplicant
+	
+	ln -s /etc/wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-pre-up.d/wpasupplicant
+	ln -s /etc/wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-post-down.d/wpasupplicant
+}
============================================================
--- classes/kernel.bbclass	0e7bc22f0cbc8ab0efe1c7ffb69e9171f99a8b21
+++ classes/kernel.bbclass	8d92c5a7b6420490dd6b3115e8146b3fc0a0f854
@@ -470,7 +470,10 @@ do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}
 	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
 	package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
+
+	if [ -d "${D}lib" ]; then
 	tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz -C ${D} lib
+	fi
 
 	if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
 		if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
============================================================
--- classes/sourcepkg.bbclass	4d9f8a49273051e27cb3e914d97f9ea3ebcdaba3
+++ classes/sourcepkg.bbclass	e4c6fac480eaea68ccd24d95a5878b9f5e41b464
@@ -18,14 +18,20 @@ def get_src_tree(d):
 		bb.error("S not defined, unable to find source tree.")
 		return
 
-	s_tree_raw = s.split('/')[1]
+	try:
+		s_tree_raw = s.split('/')[1]
+	except IndexError:
+		return
+
 	s_tree = bb.data.expand(s_tree_raw, d)
 
 	src_tree_path = os.path.join(workdir, s_tree)
 	try:
 		os.listdir(src_tree_path)
 	except OSError:
-		bb.fatal("Expected to find source tree in '%s' which doesn't exist." % src_tree_path)
+		bb.error("Expected to find source tree in '%s' which doesn't exist." % src_tree_path, s)
+		return
+
 	bb.debug("Assuming source tree is '%s'" % src_tree_path)
 
 	return s_tree
@@ -39,11 +45,14 @@ sourcepkg_do_create_orig_tgz(){
 	done
 
 	src_tree=${@get_src_tree(d)}
-	
-	echo $src_tree
+	if test x${src_tree} = x; then
+		oenote "Skipping empty source tree"
+		return
+	fi
+
 	oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz"
 	tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree
-	cp -pPR $src_tree $src_tree.orig
+	cp -av $src_tree $src_tree.orig
 }
 
 sourcepkg_do_archive_bb() {
@@ -74,7 +83,14 @@ python sourcepkg_do_dumpdata() {
 	bb.note("Dumping metadata into '%s'" % dumpfile)
 	f = open(dumpfile, "w")
 	# emit variables and shell functions
-        bb.data.emit_env(f, d, True)
+
+	# FIXME: if we emit all, bitbake will get error while
+	# evaluating AUTOREV since we have AUTOREV =
+	# "${@bb.fetch.get_srcrev(d)}" in bitbake.conf, but get_srcrev
+	# without a valid SRC_URI will cause problem.
+
+	bb.data.emit_env(f, d, True)
+
 	# emit the metadata which isnt valid shell
 	for e in d.keys():
 		if bb.data.getVarFlag(e, 'python', d):
@@ -89,8 +105,11 @@ sourcepkg_do_create_diff_gz(){
 		echo $i >> temp/exclude-from-file
 	done
 
-
 	src_tree=${@get_src_tree(d)}
+	if test x${src_tree} = x; then
+		oenote "Skipping empty source tree"
+		return
+	fi
 
 	for i in `find . -maxdepth 1 -type f`; do
 		mkdir -p $src_tree/${DISTRO}/files
@@ -102,10 +121,10 @@ sourcepkg_do_create_diff_gz(){
 	rm -rf $src_tree.orig
 }
 
-EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz
+#EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz
+EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_create_diff_gz
 
 addtask create_orig_tgz after do_unpack before do_patch
+addtask archive_bb after do_patch before do_configure
+#addtask dumpdata after do_archive_bb before do_configure
+addtask create_diff_gz after do_archive_bb before do_configure
-addtask archive_bb after do_patch before do_dumpdata
-addtask dumpdata after do_archive_bb before do_create_diff_gz
-addtask create_diff_gz after do_dump_data before do_configure
-
============================================================
--- conf/distro/include/sane-srcrevs.inc	521cedb389bc68d1f7ab5ea2240153394d425295
+++ conf/distro/include/sane-srcrevs.inc	7314e35801b572c3e3928395538ae79453852b2f
@@ -37,7 +37,7 @@ SRCREV_pn-gpe-contacts ?= "9312"
 SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "6377"
 SRCREV_pn-gpe-contacts ?= "9312"
-SRCREV_pn-gsm0710muxd ?= "193"
+SRCREV_pn-gsm0710muxd ?= "263"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
@@ -152,6 +152,7 @@ SRCREV_pn-psplash ?= "249"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-packagekit ?= "432046796fa420f57ab6c71081f7ba14e9a92574"
 SRCREV_pn-psplash ?= "249"
+SRCREV_pn-pty-forward-native ?= "4214"
 SRCREV_pn-py-odeviced ?= "190"
 SRCREV_pn-pylgrim ?= "20"
 SRCREV_pn-pyneod ?= "88"
@@ -162,7 +163,10 @@ SRCREV_pn-settings-daemon ?= "2006"
 SRCREV_pn-python-pyrtc = "152"
 SRCREV_pn-s3c24xx-gpio ?= "4130"
 SRCREV_pn-settings-daemon ?= "2006"
+SRCREV_pn-serial-forward ?= "4214"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
+SRCREV_pn-settings-daemon ?= "1755"
+SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "45"
 SRCREV_pn-tmut ?= "60"
 SRCREV_pn-u-boot-openmoko ?= "4297"
============================================================
--- conf/machine/at32stk1000.conf	3d5142529536576aea6056c6d761540974caa5ac
+++ conf/machine/at32stk1000.conf	163fd78fdfe07eb3befe4b759102820ed434730b
@@ -22,8 +22,9 @@ KERNEL_IMAGETYPE = "uImage"
 EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
 
 KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "1.1.4"
+PREFERRED_VERSION_u-boot = "1.3.2"
 
+UBOOT_MACHINE = "atstk1002_config"
 UBOOT_ENTRYPOINT = "0x90000000"
 UBOOT_LOADADDRESS = "0x10000000"
 
============================================================
--- conf/machine/om-gta02.conf	bb34d745d24d709bd9a6fe113c95e816ba6c788a
+++ conf/machine/om-gta02.conf	8a81b5b7224a98d62de1611265a26386dc77b5f2
@@ -34,6 +34,7 @@ ROOT_FLASH_SIZE = "256"
 ROOT_FLASH_SIZE = "256"
 
 # extra jffs2 tweaks
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
   --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
   --littleendian --pad \
@@ -45,7 +46,3 @@ include conf/machine/include/tune-arm920
 
 # tune for S3C24x0
 include conf/machine/include/tune-arm920t.inc
-
-# build YAFFS2
-IMAGE_FSTYPES ?= "jffs2 yaffs2"
-
============================================================
--- packages/alsa/alsa-state.bb	fa1e4194e6ae098938b0dfb04b2a91debdf76cd9
+++ packages/alsa/alsa-state.bb	f5ed106d3dce9fc8b495243ae43e56a3127b312e
@@ -9,7 +9,7 @@ PV = "0.1.0"
 RRECOMMENDS_alsa-state = "alsa-states"
 RRECOMMENDS_${PN}_openmoko = "openmoko-alsa-scenarios"
 PV = "0.1.0"
-PR = "r12"
+PR = "r15"
 
 SRC_URI = " \
   file://asoundrc \
============================================================
--- packages/images/unslung-image.bb	e4cf81045fb8a8e211e464905d1b307c49987663
+++ packages/images/unslung-image.bb	738ce981801bef8a0c76499a9524887eeb1547ff
@@ -100,4 +100,12 @@ nslu2_pack_image () {
 		-m ${STAGING_FIRMWARE_DIR}/NPE-B \
 		-t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \
 		-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2.bin
+	slugimage -F -p \
+		-b ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \
+		-s ${STAGING_LIBDIR}/nslu2-binaries/SysConf \
+		-k ${DEPLOY_DIR_IMAGE}/zImage-${MACHINE}.bin \
+		-r Ramdisk:1,Flashdisk:${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+		-m ${STAGING_FIRMWARE_DIR}/NPE-B \
+		-t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \
+		-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2-16mb.bin
 }
============================================================
--- packages/meta/slugos-packages.bb	a8de050f9b9bde46ec2fe91cdf9d93c69da445cb
+++ packages/meta/slugos-packages.bb	46c8ac8a7503c5e222ee23a677a92db2e2ea9dcb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r50"
+PR = "r51"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2|ixp4xx"
@@ -176,6 +176,7 @@ SLUGOS_PACKAGES = "\
 	openobex-apps \
 	openntpd \
 	openobex \
+	openocd \
 	openssh \
 	openvpn \
 	patch \
@@ -216,6 +217,7 @@ SLUGOS_PACKAGES = "\
 	sudo \
 	sysfsutils \
 	tar \
+	task-mokogateway-everything \
 	tcpdump \
 	thttpd \
 	tiff \
@@ -262,7 +264,6 @@ SLUGOS_BROKEN_PACKAGES = "\
 	pwc \
 	qc-usb-messenger \
 	syslog-ng \
-	openocd task-mokogateway-everything \
 	task-native-sdk \
 	unionfs-modules unionfs-utils \
 	wview-sim-mysql wview-wxt510-mysql wview-vpro-mysql \
============================================================
--- packages/openocd/openocd_svn.bb	ff4b08ed923a74c3efa4730980288907a11baeb7
+++ packages/openocd/openocd_svn.bb	5863de22800841c9bcd0fe5b4014ef3d911f91a2
@@ -2,7 +2,7 @@ PV = "0.0+r${SRCREV}"
 HOMEPAGE = "http://openocd.berlios.de/"
 LICENSE = "GPL"
 PV = "0.0+r${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 inherit autotools
 
@@ -10,4 +10,5 @@ S = "${WORKDIR}/trunk"
            file://openocd-link-static.patch;patch=1"
 S = "${WORKDIR}/trunk"
 
+DEPENDS = "libftdi"
 EXTRA_OECONF = " --enable-ft2232_libftdi --disable-ftdi2232 --disable-ftd2xx"  
============================================================
--- packages/rsync/rsync.inc	7c3e306cf41e043732b6fedbc8c41ebc491fedaf
+++ packages/rsync/rsync.inc	1d1f2cbe00f4779bdc3dc7f9689611d817e90259
@@ -7,6 +7,8 @@ inherit autotools
 
 inherit autotools
 
+SRC_URI = "http://rsync.samba.org/ftp/rsync/old-versions/rsync-${PV}.tar.gz"
+
 EXTRA_OEMAKE='STRIP=""'
 
 do_install_append() {
============================================================
--- packages/rsync/rsync_2.6.9.bb	46d56c1ae65397da35a2b8871cfecde62e0a382e
+++ packages/rsync/rsync_2.6.9.bb	1b1f42efd8d5dc944a9638cd0678259c995c08dd
@@ -2,5 +2,4 @@ PR = "r2"
 
 PR = "r2"
 
+SRC_URI += "file://rsyncd.conf"
-SRC_URI = "http://rsync.samba.org/ftp/rsync/old-versions/rsync-${PV}.tar.gz \
-           file://rsyncd.conf"
============================================================
--- packages/rsync/rsync_3.0.0.bb	265d3e5b7ec96ad6b092880621ccd67844dd9dc7
+++ packages/rsync/rsync_3.0.0.bb	dd9114bcedbdbe8b612946916a35fe4a662cd34c
@@ -2,9 +2,10 @@ PR = "r0"
 
 PR = "r0"
 
-SRC_URI = "http://rsync.samba.org/ftp/rsync/rsync-${PV}.tar.gz \
-           file://m4.patch;patch=1 \
-           file://rsyncd.conf"
+SRC_URI += "\
+  file://m4.patch;patch=1 \
+  file://rsyncd.conf \
+"
 
 do_compile_prepend() {
         sed -i "s/conf_stop make_stop//" Makefile
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080502/dda48dda/attachment.htm 
-------------- next part --------------
#
#
# patch "packages/gnuradio/gnuradio.inc"
#  from [f3784a8b6e3c9fcbccabd3014638b35285a1adba]
#    to [2b1aa21c076bc1d46a68628c02898068873279c0]
# 
# patch "packages/gnuradio/gnuradio_3.0.4.bb"
#  from [e935ec6d343e8fdb415db8992f198c118b3780af]
#    to [9f16e9d9d4673c6cb75c8bb01e3dfea2cb2da338]
# 
# patch "packages/gnuradio/gnuradio_3.1.2.bb"
#  from [e935ec6d343e8fdb415db8992f198c118b3780af]
#    to [9f16e9d9d4673c6cb75c8bb01e3dfea2cb2da338]
# 
# patch "packages/gnuradio/gnuradio_svn.bb"
#  from [c208d7c99e0267f8380bd0efe7d3d2bffdfb6247]
#    to [351ac3dd01f04c457e29330a4098d8cf3271cb1e]
#
============================================================
--- packages/gnuradio/gnuradio.inc	f3784a8b6e3c9fcbccabd3014638b35285a1adba
+++ packages/gnuradio/gnuradio.inc	2b1aa21c076bc1d46a68628c02898068873279c0
@@ -4,7 +4,7 @@ DEPENDS = " guile-native fftwf python li
 LICENSE = "GPL"
 DEPENDS = " guile-native fftwf python libusb virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native"
 
-RDEPENDS_${PN} = "python-core python-audio python-codecs python-lang python-textutils"
+RDEPENDS_${PN} = "python-core python-audio python-threading python-codecs python-lang python-textutils"
 RDEPENDS_gnuradio-usrp = "python-core"
 
 inherit autotools pkgconfig
============================================================
--- packages/gnuradio/gnuradio_3.0.4.bb	e935ec6d343e8fdb415db8992f198c118b3780af
+++ packages/gnuradio/gnuradio_3.0.4.bb	9f16e9d9d4673c6cb75c8bb01e3dfea2cb2da338
@@ -1,6 +1,6 @@ require gnuradio.inc
 require gnuradio.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \
 	   file://no-trellis-doc.patch;patch=1 \
============================================================
--- packages/gnuradio/gnuradio_3.1.2.bb	e935ec6d343e8fdb415db8992f198c118b3780af
+++ packages/gnuradio/gnuradio_3.1.2.bb	9f16e9d9d4673c6cb75c8bb01e3dfea2cb2da338
@@ -1,6 +1,6 @@ require gnuradio.inc
 require gnuradio.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \
 	   file://no-trellis-doc.patch;patch=1 \
============================================================
--- packages/gnuradio/gnuradio_svn.bb	c208d7c99e0267f8380bd0efe7d3d2bffdfb6247
+++ packages/gnuradio/gnuradio_svn.bb	351ac3dd01f04c457e29330a4098d8cf3271cb1e
@@ -3,7 +3,7 @@ PV = "3.0.4+svnr${SRCREV}"
 DEFAULT_PREFERENCE = "-1"
 
 PV = "3.0.4+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http \
 	   file://no-trellis-doc.patch;patch=1 \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080502/dda48dda/attachment-0001.htm 


More information about the commitlog mailing list