[oe-commits] org.oe.dev merge of '295685151d124dddda4263fcad5e205cd0c1e745'
pfalcon commit
openembedded-commits at lists.openembedded.org
Thu Jan 17 13:05:32 UTC 2008
merge of '295685151d124dddda4263fcad5e205cd0c1e745'
and '6c8738ab25503f1d21271ec5f6abc99991950ace'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: f7f0ddcdaf7ca93df00d48a93db3f02c7baaba31
ViewMTN: http://monotone.openembedded.org/revision/info/f7f0ddcdaf7ca93df00d48a93db3f02c7baaba31
Files:
1
conf/machine/include/collie-2.6.inc
conf/machine/include/poodle-2.6.inc
packages/linux/linux-ixp4xx/defconfig-2.6.23.12
packages/linux/linux-ixp4xx/defconfig-2.6.23.14
packages/linux/linux-ixp4xx_2.6.23.12.bb
packages/linux/linux-ixp4xx_2.6.23.14.bb
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git
packages/linux/linux-rp_2.6.23+2.6.24-rc0+git.bb
packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb
packages/tasks/task-toolchain-openmoko-sdk.bb
packages/tasks/task-openmoko-toolchain-target.bb
packages/base-files/base-files/openprotium
packages/freesmartphone
packages/linux/chumby-kernel
packages/monit
packages/monit/files
packages/monit/monit-4.10.1
packages/pwsafe
classes/concatenated-image.bbclass
conf/machine/chumby.conf
files/device_table-minimal-add-md.txt
packages/apmd/apmd-3.2.2/90-wifi-off
packages/base-files/base-files/openprotium/fstab
packages/freesmartphone/gsm0710muxd_svn.bb
packages/gcc/gcc-4.2.2/fortran-libs-rpath-to-staging-hack.patch
packages/gcc/gcc-4.2.2/gcc-4.0.2-e300c2c3.patch
packages/gsm/files/stdint.patch
packages/gsm/libgsmd-lips_svn.bb
packages/initscripts/initscripts-1.0/openprotium/mountall.sh
packages/initscripts/initscripts-1.0/openprotium/umountfs
packages/initscripts/initscripts-1.0/openprotium/umountinitrd.sh
packages/linux/chumby-kernel/defconfig
packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.23.14
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/hx2750_base-r31.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/pxa27x_overlay-r8.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/squashfs3.2-2.6.20-r0.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/versatile-armv6.patch
packages/linux/linux-storcenter/defconfig-2.6.15.7
packages/linux/linux-storcenter/kernel.patch-2.6.15.7
packages/linux/linux-storcenter_2.6.15.7.bb
packages/monit/files/init
packages/monit/monit-4.10.1/init
packages/monit/monit_4.10.1.bb
packages/openprotium-init/files/initscripts/zleds
packages/pwsafe/pwsafe_0.2.0.bb
packages/tasks/task-openmoko-toolchain-host.bb
packages/tasks/task-openprotium.bb
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/openprotium.conf
conf/machine/collie.conf
conf/machine/include/ixp4xx.inc
conf/machine/include/zaurus-2.6.inc
conf/machine/include/zaurus-clamshell.inc
conf/machine/nokia770.conf
conf/machine/nokia800.conf
conf/machine/storcenter.conf
packages/apmd/apmd_3.2.2.bb
packages/cacao/cacao_0.98+hg20071001.bb
packages/cacao/cacaoh-native.inc
packages/cacao/files/cacao-0.98+hg-attachthread.patch
packages/efl1/epdf_cvs.bb
packages/gcc/gcc-cross_4.2.2.bb
packages/gcc/gcc_4.2.2.bb
packages/gpephone/libmsgenabler2_svn.bb
packages/images/openprotium-image.bb
packages/initscripts/initscripts-1.0/openprotium/checkroot.sh
packages/initscripts/initscripts-openprotium_1.0.bb
packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-akita
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-c7x0
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-collie
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-poodle
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-spitz
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-tosa
packages/linux/linux-rp.inc
packages/linux/linux-rp_2.6.23.bb
packages/linux/linux-tornado-omap2/htctornado/defconfig
packages/linux/linux-tornado-omap2_2.6.16.16.bb
packages/linux/linux_2.6.23.bb
packages/meta/meta-toolchain-gpe-sbox.bb
packages/meta/meta-toolchain-gpe.bb
packages/meta/meta-toolchain-openmoko.bb
packages/meta/meta-toolchain-sbox.bb
packages/meta/meta-toolchain.bb
packages/meta/openprotium-packages.bb
packages/meta/slugos-packages.bb
packages/ncurses/ncurses.inc
packages/ncurses/ncurses_5.3.bb
packages/ncurses/ncurses_5.4.bb
packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
packages/openmoko2/openmoko-sample2_svn.bb
packages/openprotium-init/files/boot/disk
packages/openprotium-init/files/functions
packages/openprotium-init/openprotium-init_0.10.bb
packages/sccd/files/scc.h
packages/sccd/sccd_1.0.bb
packages/tasks/task-openmoko-debug.bb
packages/tasks/task-openmoko-feed.bb
mtn:execute
true
packages/supertux/files/gp2x.patch
packages/supertux/files/img-resize.sh
packages/supertux/files/supertux-smallsize-data.tar.bz2
packages/supertux/supertux-qvga_0.1.3.bb
packages/supertux/files/supertux.desktop
mtn:manual_merge
Diffs:
#
# mt diff -r295685151d124dddda4263fcad5e205cd0c1e745 -rf7f0ddcdaf7ca93df00d48a93db3f02c7baaba31
#
#
#
# delete "conf/machine/include/collie-2.6.inc"
#
# delete "conf/machine/include/poodle-2.6.inc"
#
# rename "packages/linux/linux-ixp4xx/defconfig-2.6.23.12"
# to "packages/linux/linux-ixp4xx/defconfig-2.6.23.14"
#
# rename "packages/linux/linux-ixp4xx_2.6.23.12.bb"
# to "packages/linux/linux-ixp4xx_2.6.23.14.bb"
#
# rename "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git"
# to "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git"
#
# rename "packages/linux/linux-rp_2.6.23+2.6.24-rc0+git.bb"
# to "packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb"
#
# rename "packages/tasks/task-toolchain-openmoko-sdk.bb"
# to "packages/tasks/task-openmoko-toolchain-target.bb"
#
# add_dir "packages/base-files/base-files/openprotium"
#
# add_dir "packages/freesmartphone"
#
# add_dir "packages/linux/chumby-kernel"
#
# add_dir "packages/monit"
#
# add_dir "packages/monit/files"
#
# add_dir "packages/monit/monit-4.10.1"
#
# add_dir "packages/pwsafe"
#
# add_file "classes/concatenated-image.bbclass"
# content [897fc5e2f0161e2487f2603b709e8d9ce91d85c7]
#
# add_file "conf/machine/chumby.conf"
# content [83ab431ac03a48b06b82de26db56cd04bf9a912a]
#
# add_file "files/device_table-minimal-add-md.txt"
# content [ae6bd8642d9e518aab41355d5c27bdec63bafc6c]
#
# add_file "packages/apmd/apmd-3.2.2/90-wifi-off"
# content [dd2b60322fc6d9136495d7c41f7c1f9e73ed8937]
#
# add_file "packages/base-files/base-files/openprotium/fstab"
# content [a3a9a408f7e276985ac09ed6e14bf3e672676856]
#
# add_file "packages/freesmartphone/gsm0710muxd_svn.bb"
# content [6e5e1fdfb04ba1e035eaf6f8c6f911ce99d8769c]
#
# add_file "packages/gcc/gcc-4.2.2/fortran-libs-rpath-to-staging-hack.patch"
# content [96ee0c885c5757fde97f61188ec0c799ae5c7b18]
#
# add_file "packages/gcc/gcc-4.2.2/gcc-4.0.2-e300c2c3.patch"
# content [84568712feddebdf1d7bf5b760367393b94cf58d]
#
# add_file "packages/gsm/files/stdint.patch"
# content [04cc8ef32d32ede1c69b0b07e61d2799a549ad51]
#
# add_file "packages/gsm/libgsmd-lips_svn.bb"
# content [9ce3eff62bdc12b8fdc3880b21d14c4ddca11602]
#
# add_file "packages/initscripts/initscripts-1.0/openprotium/mountall.sh"
# content [d53ec5b8db4e854e32ae7bc9a2c949e2bb0d38cc]
#
# add_file "packages/initscripts/initscripts-1.0/openprotium/umountfs"
# content [749892a0259d793808e7b662b57ea68b0f8fe9c6]
#
# add_file "packages/initscripts/initscripts-1.0/openprotium/umountinitrd.sh"
# content [a3fa7aecc33c8f0216c2504ac53f053501e30697]
#
# add_file "packages/linux/chumby-kernel/defconfig"
# content [28b9bde031eb6f049b7dda9cb1de9b4bb14eb228]
#
# add_file "packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb"
# content [58d54d89114cdd3627fb569c1523dfcfecdfcd86]
#
# add_file "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.23.14"
# content [fedacb0b5361d6ea9af44c234bb391c39aa55eeb]
#
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/hx2750_base-r31.patch"
# content [9d52a94da2bc5efdbef91b8e0c297a7d5e5c9cf3]
#
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/pxa27x_overlay-r8.patch"
# content [50400c7a806a9483d297bfadce35b7608d9a8919]
#
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/squashfs3.2-2.6.20-r0.patch"
# content [16a42047b8f2cb7836925cbc7aca3977e1bfddad]
#
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/versatile-armv6.patch"
# content [4741cf31febeef15c0b7646588b288c097a3d14c]
#
# add_file "packages/linux/linux-storcenter/defconfig-2.6.15.7"
# content [89163e2e88f8d563be3ba43ba5d8d97af99ac6b9]
#
# add_file "packages/linux/linux-storcenter/kernel.patch-2.6.15.7"
# content [2b5b2af2a03b3d264a60553caafa60c4e64e3ce8]
#
# add_file "packages/linux/linux-storcenter_2.6.15.7.bb"
# content [c8d13191b10ec42a45a1dac552bc747a241b24ad]
#
# add_file "packages/monit/files/init"
# content [0803d04f265b5e23401f6611b137dd47114def35]
#
# add_file "packages/monit/monit-4.10.1/init"
# content [0803d04f265b5e23401f6611b137dd47114def35]
#
# add_file "packages/monit/monit_4.10.1.bb"
# content [ce8f34274bb715666a2aceab80b44e5f4b8bcbec]
#
# add_file "packages/openprotium-init/files/initscripts/zleds"
# content [3d4888975ea9811709433fbce07f001e26d19d28]
#
# add_file "packages/pwsafe/pwsafe_0.2.0.bb"
# content [74b026623cf0a33873ea495d93977109766da810]
#
# add_file "packages/tasks/task-openmoko-toolchain-host.bb"
# content [b9a3d69c6fddd5412b4d45ac8d8190ff8c06fc9c]
#
# add_file "packages/tasks/task-openprotium.bb"
# content [7090386f8c1b7a38d12c4fdb13407565d809e031]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [2f7cb2290c8041be1845553e70a09af8c92e718d]
# to [1243c122ad661be1683a045938d93537f205ce15]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [d33fc51f1ead3210a0b39d7a0f31a26c904cd333]
# to [1dcbc89e2e936afc986ff0b9b2342ea57e980a70]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [7a99a2a6c43c4d8082370e9dcbe481855f365a4d]
# to [d560814623625b6b57fc9aad038a6e4e6b62f271]
#
# patch "conf/distro/openprotium.conf"
# from [d345e4ef53818feb39363427341b7abc8cfc6c1b]
# to [c91df50d1b1b24f6a52eba1264c1e195813952dd]
#
# patch "conf/machine/collie.conf"
# from [a0553e914a9461a2f8f27c4cf8972dcebb056d0d]
# to [7c673b43c50f37bbb2d12b14434564b0e9613ec3]
#
# patch "conf/machine/include/ixp4xx.inc"
# from [20b9033235fa7a2b9c96df8d4a1bb3e47d6f29e0]
# to [9c98fc2f74fc897a24220ae930e0950d7832deb0]
#
# patch "conf/machine/include/zaurus-2.6.inc"
# from [7d4d7255328d5d3f3d61e09ec7b527085533b4d6]
# to [0baab00ebcdca461a1c5f13d5bcba53c6099622a]
#
# patch "conf/machine/include/zaurus-clamshell.inc"
# from [460b6649ab7636b92a7031abd0f2850fcb6700f5]
# to [75189b78d2f98b4b5156904ea7515f88fcd23b77]
#
# patch "conf/machine/nokia770.conf"
# from [828d8946d7940a421a16941b49f4c1c5740fd755]
# to [b58eed429663f0f6aabcf2e4b041d266fdc463f3]
#
# patch "conf/machine/nokia800.conf"
# from [ede2d35668185c917664bdbafa710c61e835ac69]
# to [1e9e59dde23e9afccf1a426c1fb934923f8dd124]
#
# patch "conf/machine/storcenter.conf"
# from [622076dfe27a2f9b51f85d89b558236c937d2237]
# to [d6d0332b212ef555e874615f6b130151a4913bfc]
#
# patch "packages/apmd/apmd_3.2.2.bb"
# from [468e386d67d32dcf673ffd462940acdf206daeee]
# to [7e1be5e159f4f8ae062efeda347fda7056e83fc8]
#
# patch "packages/cacao/cacao_0.98+hg20071001.bb"
# from [d618915c42d4979c7f29cc99c5014d3bc2d99c50]
# to [ab5bff912c3f54f9c37573994562c9a793c71e6f]
#
# patch "packages/cacao/cacaoh-native.inc"
# from [b5ccb2775f6560095089e77316fc173dd4abc9c5]
# to [21cb933b74df6d2ac41c9593d5df8f193f74b51a]
#
# patch "packages/cacao/files/cacao-0.98+hg-attachthread.patch"
# from [8c2c1d3d004946d41425dd8ce6e7c4602fa41437]
# to [4aaacaa58d869f91cd245871bcad90a6ec0c72c1]
#
# patch "packages/efl1/epdf_cvs.bb"
# from [9efa1ebb461046746f606f717f62c2d06eeda613]
# to [cdfb0f4cc3ec86c5aac3d06e8fc109d3fd5c92c2]
#
# patch "packages/gcc/gcc-cross_4.2.2.bb"
# from [db2829fa431c6b82c542cae426ddc639e77aa4db]
# to [bd6eaf9021e129dcbd70794a3e80ac820d764246]
#
# patch "packages/gcc/gcc_4.2.2.bb"
# from [53244c4e795291ca862fb5b92fb62d5191081c67]
# to [6bcef9ceeb471bcf1d54c4ae08e78e9b80d6a44c]
#
# patch "packages/gpephone/libmsgenabler2_svn.bb"
# from [54a29d568f999ecbd83b1ce249da584fbcec85f3]
# to [98732dfed57aec57dd1b60c208b0540f3fc15122]
#
# patch "packages/images/openprotium-image.bb"
# from [738026dd8e8a9e3fe4c7be21ad6fad4da91da8a3]
# to [ab2373e1108751ee0b8e734687d6d4b87be44c6d]
#
# patch "packages/initscripts/initscripts-1.0/openprotium/checkroot.sh"
# from [be2c20e222501bc76ef7036e5fda2919945c459d]
# to [764ae12dffbfe2adf0892cb451a8bab8dd388bc9]
#
# patch "packages/initscripts/initscripts-openprotium_1.0.bb"
# from [f52645d9a73aa94d16e2d4624e3fbf409d7369c4]
# to [425b3202077871f3552305e98cd10aa8e644fa6f]
#
# patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
# from [fd3ecb56d2f926384dc852689d17e18430014b2e]
# to [9ec0920876981474a325a47766fa7d50bbb1cfd3]
#
# patch "packages/linux/linux-ixp4xx_2.6.23.14.bb"
# from [91f144590f8e37b3d4894d7feebebb9a022be434]
# to [38b3f331081f461ab9c8b5951f4f95b08687509d]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-akita"
# from [4560f10f9dd70ee7bc009c083ad859551b0c517a]
# to [828611f21dd3772a9db45569a4333a5e08e90a87]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-c7x0"
# from [94163c88c3af2445025f92864e982346295b7374]
# to [76de453dac80746ab730d22aaf3f526cd2a99f26]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-collie"
# from [f8c89cefc2aacd273421cdd6abb162f6197a7640]
# to [d04adf43f4133208ae5284b94bbd81d1d721a81e]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-poodle"
# from [48b1f25f947c9d614a87810486a63edbaaeec93b]
# to [17c355fed953e68652a97c9e41af957bfa52f4f2]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-spitz"
# from [60f2f3675a8045720aebad8b900d6c464040e0e3]
# to [a4c61e81d4db69a81a8ad36c0e7dc5aeafd0bc6a]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-tosa"
# from [db15e2aa6464fd82b3b9a756eff0884b88791d0d]
# to [46bd890ef0de9d01529d9491080643eeda533fd7]
#
# patch "packages/linux/linux-rp.inc"
# from [8510326c44fc879b7ce77ca7c20f62ab901eae48]
# to [909451ef86b7f046c9e21dd9cc93f456381c98fd]
#
# patch "packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb"
# from [0dad9c9f8cd8741095ce3f11996fb46de85e1c66]
# to [8bfa3c79994262c6e40c21497b08d5d69367ac4e]
#
# patch "packages/linux/linux-rp_2.6.23.bb"
# from [08d45cd12fcab8632fad9c0dd6c9a29f3e37ca2b]
# to [7ed3a000ed87924d72bda9c03a39fe938b38f7db]
#
# patch "packages/linux/linux-tornado-omap2/htctornado/defconfig"
# from [308cbe721749ba6fcf4f8b3909cc904bf3fad4d9]
# to [9b493e680180251433c7b19b9ab3e08f41158179]
#
# patch "packages/linux/linux-tornado-omap2_2.6.16.16.bb"
# from [03dda467990161bcb196927a1060decb35dd3bd2]
# to [a735d9e07c77baf8fa31bb48cda83957ab6af590]
#
# patch "packages/linux/linux_2.6.23.bb"
# from [f8ca05a376ad8770405546e8c39e711d2fcbb477]
# to [578a8f7bc99edbd97bba396a1766993c401990d2]
#
# patch "packages/meta/meta-toolchain-gpe-sbox.bb"
# from [cfdfc9f4b2bbdd1f3ad0ebd0cfa69553220548d7]
# to [8c13ffb0df097aec092934180a6187818aba7378]
#
# patch "packages/meta/meta-toolchain-gpe.bb"
# from [e4b3b787a0714a603a46e6d0423cfddb7bba3c58]
# to [96ae935de25684f8ec51be678ff8a2aedf946d99]
#
# patch "packages/meta/meta-toolchain-openmoko.bb"
# from [052ed3fc28dde371bd81be6bf9ffaa47c10deb57]
# to [76d692ed056a9397df52f5d27a16c97f29b032cd]
#
# patch "packages/meta/meta-toolchain-sbox.bb"
# from [00b9d0333251622f7df96dfb38a417c61e90a281]
# to [aa24669823d24a74c6fa299901b587d1432ba62a]
#
# patch "packages/meta/meta-toolchain.bb"
# from [3fe2673a61b591aed4f247f8201896a640d5ed35]
# to [d53849cfd4dc2f21fcd44b4cc0926382313fc1e9]
#
# patch "packages/meta/openprotium-packages.bb"
# from [8bb8ff3b1e2bf980e7c838dccfd08ab50c2aea53]
# to [950069360e5b3d79719a0f164a9ee2837f936142]
#
# patch "packages/meta/slugos-packages.bb"
# from [1a2ceb929514b8bcf127cdcde0a9622c8ac4a28a]
# to [9d6f880bd2880baef83e5822947f5771707add1a]
#
# patch "packages/ncurses/ncurses.inc"
# from [596e850f8a0d008dfb954fd473225fe0d33c8b81]
# to [2be0776267994e0ee952b0f848192aeb2bea1cd3]
#
# patch "packages/ncurses/ncurses_5.3.bb"
# from [14508c719340e8abe5ecf6248de70aeb7ac036b3]
# to [052fb93e19e1b24e9e78a03584a0bbb70ff3d822]
#
# patch "packages/ncurses/ncurses_5.4.bb"
# from [a2950eea2cdd28c32834e38f248e4bae8471d9c1]
# to [d7a699b05dcac9fa77a97c45d770d8d95b25c805]
#
# patch "packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb"
# from [e3fd4a716a5bcfff74dd72a3a454d8c2ce401e7d]
# to [d90b9e48b2570a1906b72dcb19d0a8764fe6c23b]
#
# patch "packages/openmoko2/openmoko-sample2_svn.bb"
# from [f81b348bfe4ffd0c3a27b9c3042e6e2945ea3971]
# to [90b2cf8a49d86bb43022f62052a46f47d57edcee]
#
# patch "packages/openprotium-init/files/boot/disk"
# from [9013d8fc4ac2debd474c52e9d86794b9d64cca74]
# to [83a37d36cafcd58705933a00ae01f29dc6ea504a]
#
# patch "packages/openprotium-init/files/functions"
# from [4b0704488f3f4dcbc4d79d07888c4d57870921e9]
# to [1fde4b0325e7b2ee523d41e8733c5c6176f0579c]
#
# patch "packages/openprotium-init/openprotium-init_0.10.bb"
# from [a82f9e20c41b709f3ffb67651d5ac9cb4951ea19]
# to [1aec976cda95b20c26da75d8c111432f03177fb1]
#
# patch "packages/sccd/files/scc.h"
# from [b3b2d52c3a3e0deb83006b5d638ee5f95f758460]
# to [c5a4e42c0bc8d7d35f7c65438f4a38807c58d512]
#
# patch "packages/sccd/sccd_1.0.bb"
# from [35d89f9c2cde0c60fbdc68234088261f3b976d5a]
# to [3942ef0f1578f30da141ac6e499613fb2d4f4930]
#
# patch "packages/tasks/task-openmoko-debug.bb"
# from [6f16b58858e9a8858a34530bccc7db757e1303ab]
# to [7f29d58704ca954c5e6e5ff766840cc0cff0eb5e]
#
# patch "packages/tasks/task-openmoko-feed.bb"
# from [02d92dbdbb6c58dd3e7f980dd5aeda1082357007]
# to [1d446b5d0ff09d916f1a0edd5acc3f1b3fbd6d21]
#
# patch "packages/tasks/task-openmoko-toolchain-target.bb"
# from [4526d09a7c1a87ae65eac1a78599062dad98e280]
# to [28005de19ec998c9abe5e7d383d158bf18bbfc14]
#
# set "packages/initscripts/initscripts-1.0/openprotium/umountfs"
# attr "mtn:execute"
# value "true"
#
============================================================
--- classes/concatenated-image.bbclass 897fc5e2f0161e2487f2603b709e8d9ce91d85c7
+++ classes/concatenated-image.bbclass 897fc5e2f0161e2487f2603b709e8d9ce91d85c7
@@ -0,0 +1,38 @@
+
+#
+# define the FLASH_KERNEL_SIZE and FLASH_ROOT_SIZE in your machine.conf,
+# and this class builds a simple, padded concatenated image of
+# <kernel><padding><rootfs> and performs error checking that either
+# kernel or rootfs isn't too large to fit.
+#
+concat_pack_image() {
+ # find latest kernel - is there a more general way to do this?
+ KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}* | tail -n 1`
+ if [ -z "$KERNEL" ]; then
+ oefatal "No kernel found in ${DEPLOY_DIR_IMAGE}. Was expecting a ${KERNEL_IMAGETYPE}\* file."
+ exit 1
+ fi
+ ROOTFS=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2
+ OUTPUT=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flash.img
+ PADFILE=${DEPLOY_DIR_IMAGE}/padfile.zzz
+ KERNEL_SIZE_MAX_DEC=`echo ${FLASH_KERNEL_SIZE} | awk --non-decimal-data '{printf "%d\n", $1}' `
+ ROOT_SIZE_MAX_DEC=`echo ${FLASH_ROOT_SIZE} | awk --non-decimal-data '{printf "%d\n", $1}' `
+ KERNEL_SIZE=`ls -l $KERNEL | awk '{print $5}'`
+ if [ $KERNEL_SIZE -gt $KERNEL_SIZE_MAX_DEC ]; then
+ oefatal "Kernel too large at $KERNEL_SIZE bytes. Max is $KERNEL_SIZE_MAX_DEC."
+ exit 1
+ fi
+ ROOT_SIZE=`ls -l $ROOTFS | awk '{print $5}'`
+ if [ $ROOT_SIZE -gt $ROOT_SIZE_MAX_DEC ]; then
+ oefatal "Rootfs is too large at $ROOT_SIZE bytes. Max is $ROOT_SIZE_MAX_DEC."
+ exit 1
+ fi
+ PAD_SIZE=`echo "$KERNEL_SIZE_MAX_DEC - $KERNEL_SIZE" | bc `
+ dd if=/dev/zero of=$PADFILE bs=$PAD_SIZE count=1 2>>/dev/null
+ cat $KERNEL $PADFILE $ROOTFS > $OUTPUT
+ rm -f $PADFILE
+ ls -l $OUTPUT
+}
+
+IMAGE_POSTPROCESS_COMMAND += "concat_pack_image; "
+
============================================================
--- conf/machine/chumby.conf 83ab431ac03a48b06b82de26db56cd04bf9a912a
+++ conf/machine/chumby.conf 83ab431ac03a48b06b82de26db56cd04bf9a912a
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@Name: Chumby
+#@DESCRIPTION: Machine configuration for the Chumby
+
+TARGET_ARCH = "arm"
+
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth ext2 vfat touchscreen usbhost usbgadget wifi"
+
+GUI_MACHINE_CLASS = "smallscreen"
+PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
+
+PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
+
+require conf/machine/include/tune-arm926ejs.inc
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "38400 ttyS0"
+
+# used by opie-collections.inc
+ROOT_FLASH_SIZE = "22"
============================================================
--- files/device_table-minimal-add-md.txt ae6bd8642d9e518aab41355d5c27bdec63bafc6c
+++ files/device_table-minimal-add-md.txt ae6bd8642d9e518aab41355d5c27bdec63bafc6c
@@ -0,0 +1,32 @@
+#<path> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
+#/dev/mem c 640 0 0 1 1 0 0 -
+#
+#type can be one of:
+# f A regular file
+# d Directory
+# c Character special device file
+# b Block special device file
+# p Fif%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r6c8738ab25503f1d21271ec5f6abc99991950ace -rf7f0ddcdaf7ca93df00d48a93db3f02c7baaba31
#
#
#
# add_file "packages/supertux/files/gp2x.patch"
# content [26a86f577e4742adc10c15df42c058f4cea5183a]
#
# add_file "packages/supertux/files/img-resize.sh"
# content [0179d1a7105160d62d20293a7513dd948a13cd3c]
#
# add_file "packages/supertux/files/supertux-smallsize-data.tar.bz2"
# content [982bfb74c80c28fa6574ec3ccd3facae4e943404]
#
# add_file "packages/supertux/supertux-qvga_0.1.3.bb"
# content [53598bc864a257e7201e4e07636d2e6c83095af2]
#
# patch "packages/supertux/files/supertux.desktop"
# from [ca0d07025948eea625b61a4c138657fd300ff7ac]
# to [f35df068437792660755385fb36d3287092c27ea]
#
# set "packages/supertux/files/supertux-smallsize-data.tar.bz2"
# attr "mtn:manual_merge"
# value "true"
#
============================================================
--- packages/supertux/files/gp2x.patch 26a86f577e4742adc10c15df42c058f4cea5183a
+++ packages/supertux/files/gp2x.patch 26a86f577e4742adc10c15df42c058f4cea5183a
@@ -0,0 +1,2614 @@
+Only in supertux-0.1.3: aclocal.m4
+diff -ur supertux-0.1.3/AUTHORS supertux-0.1.3-gp2x/AUTHORS
+--- supertux-0.1.3/AUTHORS 2005-07-02 14:37:30.000000000 +0300
++++ supertux-0.1.3-gp2x/AUTHORS 2006-04-13 06:11:02.000000000 +0300
+@@ -91,6 +91,12 @@
+
+ Royalty free CDROMs and FTP sites sounds
+
++Port to GP2X
++-----------
++ Ingo Arndt
++ scachi at gmx.de
++ http://www.bitmage.de
++
+ More information and contacts
+ =============================
+
+Only in supertux-0.1.3: autom4te.cache
+Only in supertux-0.1.3-gp2x: autoscan.log
+Only in supertux-0.1.3-gp2x: COMPILE4GP2X
+Only in supertux-0.1.3: config.guess
+Only in supertux-0.1.3: config.log
+Only in supertux-0.1.3: config.status
+Only in supertux-0.1.3: config.sub
+Only in supertux-0.1.3: configure
+diff -ur supertux-0.1.3/configure.ac supertux-0.1.3-gp2x/configure.ac
+--- supertux-0.1.3/configure.ac 2005-07-06 12:26:15.000000000 +0300
++++ supertux-0.1.3-gp2x/configure.ac 2006-04-19 22:29:05.000000000 +0300
+@@ -76,13 +76,33 @@
+ CFLAGS="$CFLAGS $SDL_CFLAGS"
+ LIBS="$LIBS $SDL_LIBS"
+
++AM_PATH_LIBMIKMOD(,
++ :,
++ AC_MSG_ERROR([*** mikmod not found!]))
++CXXFLAGS="$CXXFLAGS $LIBMIKMOD_CFLAGS"
++CFLAGS="$CFLAGS $LIBMIKMOD_CFLAGS"
++LIBS="$LIBS $LIBMIKMOD_LIBS"
++
+ dnl Checks for additional libraries.
++AC_CHECK_LIB(smpeg, SMPEG_status)
++
++AC_CHECK_LIB(mikmod, MikMod_Init)
++
+ AC_CHECK_LIB(SDL_mixer, Mix_OpenAudio,,
+ AC_MSG_ERROR([SDL_mixer library required]))
+
++AC_CHECK_LIB(jpeg,jpeg_abort)
++
++AC_CHECK_LIB(z,compress)
++
++AC_CHECK_LIB(png,png_free)
++
+ AC_CHECK_LIB(SDL_image, IMG_Load,,
+ AC_MSG_ERROR([SDL_image library required]))
+
++AC_CHECK_LIB(SDL_gfx, rotozoomSurface,,
++ AC_MSG_ERROR([SDL_gfx library required]))
++
+ if test "x${enable_opengl}" != "xno"; then
+ AX_CHECK_GL
+ fi
+@@ -95,7 +115,30 @@
+ LIBS="$LIBS $GL_LIBS"
+ fi
+
+-AC_CHECK_LIB(z, gzopen,, AC_MSG_ERROR([*** zlib is missing]))
++# compile for the testing the 320x240 resolution
++# compile for the gp2x
++AC_ARG_ENABLE(gp2x,
++[ --enable-gp2x Build the gp2x version [default=no]],
++ , enable_gp2x=no)
++if test x$enable_gp2x = xyes; then
++ CXXFLAGS="$CXXFLAGS -DGP2X"
++fi
++
++AC_ARG_ENABLE(320x240,
++[ --enable-320x240 Test the 320x240 resolution [default=no]],
++ , enable_320x240=no)
++if test x$enable_320x240 = xyes; then
++ CXXFLAGS="$CXXFLAGS -DRES320X240"
++fi
++
++# compile static
++AC_ARG_ENABLE(static,
++[ --enable-static Build the static version [default=no]],
++ , enable_static=no)
++if test x$enable_static = xyes; then
++ CXXFLAGS="$CXXFLAGS -static"
++fi
++
+
+ CXXFLAGS="$CXXFLAGS -DDATA_PREFIX='\"$datadir/supertux\"'"
+
+@@ -110,6 +153,9 @@
+ echo " Profile Mode: $enable_gprof"
+ echo " Debug Mode: $enable_debug"
+ echo " OpenGL Support: $enable_opengl"
++echo " 320x240 Resolution: $enable_320x240"
++echo " GP2X Build (+320x240): $enable_gp2x"
++echo " Static Build: $enable_static"
+ echo ""
+
+ # EOF #
+Only in supertux-0.1.3/data: CREDITS
+Only in supertux-0.1.3/data: extro-bonus2.txt
+Only in supertux-0.1.3/data: extro-bonus.txt
+Only in supertux-0.1.3/data: extro.txt
+Only in supertux-0.1.3/data: images
+Only in supertux-0.1.3/data: intro.txt
+Only in supertux-0.1.3/data: levels
+Only in supertux-0.1.3/data: Makefile
+Only in supertux-0.1.3/data: Makefile.in
+Only in supertux-0.1.3/data: music
+Only in supertux-0.1.3/data: sounds
+Only in supertux-0.1.3/data: supertux.strf
+Only in supertux-0.1.3: depcomp
+Only in supertux-0.1.3: install-sh
+Only in supertux-0.1.3: m4
+Only in supertux-0.1.3: Makefile
+Only in supertux-0.1.3: Makefile.in
+Only in supertux-0.1.3: missing
+Only in supertux-0.1.3: mkinstalldirs
+Only in supertux-0.1.3: patches
+diff -ur supertux-0.1.3/src/badguy.cpp supertux-0.1.3-gp2x/src/badguy.cpp
+--- supertux-0.1.3/src/badguy.cpp 2005-06-22 00:16:07.000000000 +0300
++++ supertux-0.1.3-gp2x/src/badguy.cpp 2006-04-20 21:32:23.000000000 +0300
+@@ -250,7 +250,11 @@
+ tux.kick_timer.start(KICKING_TIME);
+ set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right);
+ physic.set_velocity_x((dir == LEFT) ? -3.5 : 3.5);
++#ifndef GP2X
+ play_sound(sounds[SND_KICK],SOUND_CENTER_SPEAKER);
++#else
++ play_chunk(SND_KICK);
++#endif
+ }
+ }
+
+@@ -260,6 +264,7 @@
+ check_horizontal_bump();
+ if(mode == KICK && changed != dir)
+ {
++#ifndef GP2X
+ /* handle stereo sound (number 10 should be tweaked...)*/
+ if (base.x < scroll_x + screen->w/2 - 10)
+ play_sound(sounds[SND_RICOCHET], SOUND_LEFT_SPEAKER);
+@@ -267,6 +272,9 @@
+ play_sound(sounds[SND_RICOCHET], SOUND_RIGHT_SPEAKER);
+ else
+ play_sound(sounds[SND_RICOCHET], SOUND_CENTER_SPEAKER);
++#else
++ play_chunk(SND_RICOCHET);
++#endif
+ }
+ }
+
+@@ -455,11 +463,15 @@
+
+ /* play explosion sound */ // FIXME: is the stereo all right? maybe we should use player cordinates...
+ if (base.x < scroll_x + screen->w/2 - 10)
++#ifndef GP2X
+ play_sound(sounds[SND_EXPLODE], SOUND_LEFT_SPEAKER);
+ else if (base.x > scroll_x + screen->w/2 + 10)
+ play_sound(sounds[SND_EXPLODE], SOUND_RIGHT_SPEAKER);
+ else
+ play_sound(sounds[SND_EXPLODE], SOUND_CENTER_SPEAKER);
++#else
++ play_chunk(SND_EXPLODE);
++#endif
+
+ } else if(mode == BOMB_EXPLODE) {
+ remove_me();
+@@ -677,13 +689,21 @@
+ }
+
+ // BadGuy fall below the ground
++#ifndef RES320X240
+ if (base.y > screen->h) {
++#else
++ if (base.y > 640) {
++#endif
+ remove_me();
+ return;
+ }
+
+ // Once it's on screen, it's activated!
++#ifndef RES320X240
+ if (base.x <= scroll_x + screen->w + OFFSCREEN_DISTANCE)
++#else
++ if (base.x <= scroll_x + 640 + OFFSCREEN_DISTANCE)
++#endif
+ seen = true;
+
+ if(!seen)
+@@ -743,7 +763,11 @@
+ BadGuy::draw()
+ {
+ // Don't try to draw stuff that is outside of the screen
++#ifndef RES320X240
+ if(base.x <= scroll_x - base.width || base.x >= scroll_x + screen->w)
++#else
++ if(base.x <= scroll_x - base.width || base.x >= scroll_x + 640)
++#endif
+ return;
+
+ if(sprite_left == 0 || sprite_right == 0)
+@@ -811,7 +835,11 @@
+
+ World::current()->add_score(base.x - scroll_x,
+ base.y, 50 * player_status.score_multiplier);
++#ifndef GP2X
+ play_sound(sounds[SND_SQUISH], SOUND_CENTER_SPEAKER);
++#else
++ play_chunk(SND_SQUISH);
++#endif
+ player_status.score_multiplier++;
+
+ dying = DYING_SQUISHED;
+@@ -830,7 +858,11 @@
+
+ player->jump_of_badguy(this);
+ World::current()->add_score(base.x - scroll_x, base.y, 50 * player_status.score_multiplier);
++#ifndef GP2X
+ play_sound(sounds[SND_SQUISH], SOUND_CENTER_SPEAKER);
++#else
++ play_chunk(SND_SQUISH);
++#endif
+ player_status.score_multiplier++;
+ remove_me();
+ return;
+@@ -839,7 +871,11 @@
+ if (mode == NORMAL || mode == KICK)
+ {
+ /* Flatten! */
++#ifndef GP2X
+ play_sound(sounds[SND_STOMP], SOUND_CENTER_SPEAKER);
++#else
++ play_chunk(SND_STOMP);
++#endif
+ mode = FLAT;
+ set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right);
+ physic.set_velocity_x(0);
+@@ -847,7 +883,11 @@
+ timer.start(4000);
+ } else if (mode == FLAT) {
+ /* Kick! */
++#ifndef GP2X
+ play_sound(sounds[SND_KICK], SOUND_CENTER_SPEAKER);
++#else
++ play_chunk(SND_KICK);
++#endif
+
+ if (player->base.x < base.x + (base.width/2)) {
+ physic.set_velocity_x(5);
+@@ -925,7 +965,11 @@
+ score * player_status.score_multiplier);
+
+ /* Play death sound: */
++#ifndef GP2X
+ play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
++#else
++ play_chunk(SND_FALL);
++#endif
+ }
+
+ void BadGuy::explode(BadGuy *badguy)
+@@ -1053,7 +1097,11 @@
+ /* Get kicked if were flat */
+ if (mode == FLAT && !dying)
+ {
++#ifndef GP2X
+ play_sound(sounds[SND_KICK], SOUND_CENTER_SPEAKER);
++#else
++ play_chunk(SND_KICK);
++#endif
+
+ // Hit from left side
+ if (player->base.x < base.x) {
+diff -ur supertux-0.1.3/src/configfile.cpp supertux-0.1.3-gp2x/src/configfile.cpp
+--- supertux-0.1.3/src/configfile.cpp 2005-06-22 00:16:07.000000000 +0300
++++ supertux-0.1.3-gp2x/src/configfile.cpp 2006-04-10 13:32:19.000000000 +0300
+@@ -92,12 +92,22 @@
+ else
+ use_joystick = true;
+
++#ifndef GP2X
+ reader.read_int ("joystick-x", &joystick_keymap.x_axis);
+ reader.read_int ("joystick-y", &joystick_keymap.y_axis);
+ reader.read_int ("joystick-a", &joystick_keymap.a_button);
+ reader.read_int ("joystick-b", &joystick_keymap.b_button);
+ reader.read_int ("joystick-start", &joystick_keymap.start_button);
+ reader.read_int ("joystick-deadzone", &joystick_keymap.dead_zone);
++#else
++ reader.read_int ("joystick-up", &joystick_keymap.up_button);
++ reader.read_int ("joystick-down", &joystick_keymap.down_button);
++ reader.read_int ("joystick-right", &joystick_keymap.right_button);
++ reader.read_int ("joystick-left", &joystick_keymap.left_button);
++ reader.read_int ("joystick-a", &joystick_keymap.a_button);
++ reader.read_int ("joystick-b", &joystick_keymap.b_button);
++ reader.read_int ("joystick-start", &joystick_keymap.start_button);
++#endif
+
+ reader.read_int ("keyboard-jump", &keymap.jump);
+ reader.read_int ("keyboard-duck", &keymap.duck);
+@@ -130,12 +140,22 @@
+ fprintf(config, "\n\t;; joystick number (-1 means no joystick):\n");
+ fprintf(config, "\t(joystick %d)\n", use_joystick ? joystick_num : -1);
+
++#ifndef GP2X
+ fprintf(config, "\t(joystick-x %d)\n", joystick_keymap.x_axis);
+ fprintf(config, "\t(joystick-y %d)\n", joystick_keymap.y_axis);
+ fprintf(config, "\t(joystick-a %d)\n", joystick_keymap.a_button);
+ fprintf(config, "\t(joystick-b %d)\n", joystick_keymap.b_button);
+ fprintf(config, "\t(joystick-start %d)\n", joystick_keymap.start_button);
+ fprintf(config, "\t(joystick-deadzone %d)\n", joystick_keymap.dead_zone);
++#else
++ fprintf(config, "\t(joystick-up %d)\n", joystick_keymap.up_button);
++ fprintf(config, "\t(joystick-down %d)\n", joystick_keymap.down_button);
++ fprintf(config, "\t(joystick-right %d)\n", joystick_keymap.right_button);
++ fprintf(config, "\t(joystick-left %d)\n", joystick_keymap.left_button);
++ fprintf(config, "\t(joystick-a %d)\n", joystick_keymap.a_button);
++ fprintf(config, "\t(joystick-b %d)\n", joystick_keymap.b_button);
++ fprintf(config, "\t(joystick-start %d)\n", joystick_keymap.start_button);
++#endif
+
+ fprintf(config, "\t(keyboard-jump %d)\n", keymap.jump);
+ fprintf(config, "\t(keyboard-duck %d)\n", keymap.duck);
+diff -ur supertux-0.1.3/src/defines.h supertux-0.1.3-gp2x/src/defines.h
+--- supertux-0.1.3/src/defines.h 2005-07-07 02:05:03.000000000 +0300
++++ supertux-0.1.3-gp2x/src/defines.h 2006-04-11 22:02:05.000000000 +0300
+@@ -91,7 +91,11 @@
+
+ /* Scrolling text speed */
+
++#ifndef RES320X240
+ #define SCROLL_SPEED_CREDITS 1.2
++#else
++#define SCROLL_SPEED_CREDITS 2.4
++#endif
+ #define SCROLL_SPEED_MESSAGE 1.0
+
+ /* Debugging */
+Only in supertux-0.1.3/src: .deps
+diff -ur supertux-0.1.3/src/gameloop.cpp supertux-0.1.3-gp2x/src/gameloop.cpp
+--- supertux-0.1.3/src/gameloop.cpp 2005-07-02 15:16:08.000000000 +0300
++++ supertux-0.1.3-gp2x/src/gameloop.cpp 2006-05-05 23:22:58.000000000 +0300
+@@ -288,6 +288,7 @@
+
+ switch(event.type)
+ {
++#ifndef GP2X
+ case SDL_QUIT: /* Quit event - quit: */
+ st_abort("Received window close", "");
+ break;
+@@ -434,22 +435,60 @@
+ tux.input.down = UP;
+ }
+ break;
+-
++#endif
+ case SDL_JOYBUTTONDOWN:
++#ifndef GP2X
++ if (event.jbutton.button == joystick_keymap.a_button)
++ tux.input.up = DOWN;
++ else if (event.jbutton.button == joystick_keymap.b_button)
++ tux.input.fire = DOWN;
++ else if (event.jbutton.button == joystick_keymap.start_button)
++ on_escape_press();
++ break;
++#else
+ if (event.jbutton.button == joystick_keymap.a_button)
+ tux.input.up = DOWN;
+ else if (event.jbutton.button == joystick_keymap.b_button)
+ tux.input.fire = DOWN;
+ else if (event.jbutton.button == joystick_keymap.start_button)
+ on_escape_press();
++ else if (event.jbutton.button == joystick_keymap.up_button)
++ tux.input.up = DOWN;
++ else if (event.jbutton.button == joystick_keymap.down_button)
++ tux.input.down = DOWN;
++ else if (event.jbutton.button == joystick_keymap.right_button)
++ tux.input.right = DOWN;
++ else if (event.jbutton.button == joystick_keymap.left_button)
++ tux.input.left = DOWN;
++ else if (event.jbutton.button == joystick_keymap.voldown_button)
++ decreaseSoundVolume();
++ else if (event.jbutton.button == joystick_keymap.volup_button)
++ increaseSoundVolume();
+ break;
++#endif
++
+ case SDL_JOYBUTTONUP:
++#ifndef GP2X
+ if (event.jbutton.button == joystick_keymap.a_button)
+ tux.input.up = UP;
+ else if (event.jbutton.button == joystick_keymap.b_button)
+ tux.input.fire = UP;
+ break;
+-
++#else
++ if (event.jbutton.button == joystick_keymap.a_button)
++ tux.input.up = UP;
++ else if (event.jbutton.button == joystick_keymap.b_button)
++ tux.input.fire = UP;
++ else if (event.jbutton.button == joystick_keymap.up_button)
++ tux.input.up = UP;
++ else if (event.jbutton.button == joystick_keymap.down_button)
++ tux.input.down = UP;
++ else if (event.jbutton.button == joystick_keymap.right_button)
++ tux.input.right = UP;
++ else if (event.jbutton.button == joystick_keymap.left_button)
++ tux.input.left = UP;
++ break;
++#endif
+ default:
+ break;
+ } /* switch */
+@@ -464,7 +503,7 @@
+ Player* tux = world->get_tux();
+
+ /* End of level? */
+- int endpos = (World::current()->get_level()->width-5) * 32;
++ int endpos = (World::current()->get_level()->width-5) * (32);
+ Tile* endtile = collision_goal(tux->base);
+
+ // fallback in case the other endpositions don't trigger
+@@ -545,7 +584,7 @@
+ Menu::current()->draw();
+ mouse_cursor->draw();
+ }
+-
++ //updateSound();
+ updatescreen();
+ }
+
+@@ -599,6 +638,7 @@
+
+ while (exit_status == ES_NONE)
+ {
++ SDL_Delay(10);
+ /* Calculat%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list