[oe-commits] org.oe.dev merge of '1c81965a2b4441230dcc780cb75b714800217cf4'

mickeyl commit oe at amethyst.openembedded.net
Mon May 5 15:28:28 UTC 2008


merge of '1c81965a2b4441230dcc780cb75b714800217cf4'
     and 'd61da5b80e9dd6d9c4abeb4bdba7558079f3ccdf'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 361c98706e4194c1d6c7c0cf3cb978f758df4151
ViewMTN: http://monotone.openembedded.org/revision/info/361c98706e4194c1d6c7c0cf3cb978f758df4151
Files:
1
packages/gtk+/gtk+-2.10.14/gtklabel-resize-patch
packages/gtk+/gtk+-2.10.14/xsettings.patch
packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch
packages/gtk+/gtk+-2.12.0/xsettings.patch
packages/gtk+/gtk+-2.6.10/gtklabel-resize-patch
packages/gtk+/gtk+-2.6.10/xsettings.patch
packages/gtk+/gtk+-2.8.16/gtklabel-resize-patch
packages/gtk+/gtk+-2.8.16/xsettings.patch
packages/gtk+/gtk+-2.8.9/gtklabel-resize-patch
packages/gtk+/gtk+-2.8.9/xsettings.patch
packages/gtk+/gtk+-2.12.3/gtklabel-resize-patch
packages/gtk+/files/gtklabel-resize-patch
packages/gtk+/gtk+-2.12.3/xsettings.patch
packages/gtk+/files/xsettings.patch
packages/geany
packages/linux/linux-2.6.25/sequoia
packages/uclibc/uclibc-0.9.29/dht-walnut
packages/uclibc/uclibc-0.9.29/kilauea
packages/uclibc/uclibc-0.9.29/sequoia
conf/distro/jlime-henchman.conf
conf/distro/jlime-mongo.conf
conf/machine/mp900c.conf
packages/geany/geany_0.14.bb
packages/keymaps/files/jornada6xx/keymap-620lx-660lx.map
packages/keymaps/files/jornada6xx/keymap-br.map
packages/linux/linux-2.6.25/sequoia/defconfig
packages/uclibc/uclibc-0.9.29/dht-walnut/uClibc.machine
packages/uclibc/uclibc-0.9.29/kilauea/uClibc.machine
packages/uclibc/uclibc-0.9.29/sequoia/uClibc.machine
classes/seppuku.bbclass
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom-2007-for-openmoko.inc
conf/distro/include/angstrom-eglibc.inc
conf/distro/include/angstrom-glibc.inc
conf/distro/include/angstrom.inc
conf/distro/include/oplinux.inc
conf/distro/jlime-donkey.conf
conf/documentation.conf
conf/machine/beagleboard.conf
conf/machine/htckaiser.conf
conf/machine/include/qemu.inc
conf/machine/lsarm.conf
conf/machine/mpc8323e-rdb.conf
conf/machine/mx31ads.conf
conf/machine/mx31moboard.conf
conf/machine/n2100.conf
conf/machine/nokia800.conf
conf/machine/sequoia.conf
conf/machine/storcenter.conf
conf/machine/turbostation.conf
contrib/mtn2cl/mtn2cl.sh
packages/alsa/alsa-utils_1.0.13.bb
packages/binutils/binutils-avr32.inc
packages/bitchx/bitchx_1.1.bb
packages/gnome/libsoup_2.4.1.bb
packages/images/sdr-image.bb
packages/keymaps/files/jornada6xx/keymap-de.map
packages/keymaps/files/jornada6xx/keymap-sp.map
packages/keymaps/files/jornada6xx/keymap-uk.map
packages/linux/linux-omap2_git.bb
packages/linux/linux.inc
packages/linux/linux_2.6.25.bb
packages/mozilla/minimo/bug-322806.diff
packages/perl/files/perl-5.8.8-gcc-4.2.patch
packages/perl/perl-5.8.8/native-ssp.patch
packages/uclibc/uclibc-0.9.29/avr32/uClibc.machine
packages/uclibc/uclibc-0.9.29/uClibc.distro
packages/uclibc/uclibc_0.9.29.bb
packages/uim/uim-native_1.3.1.bb
packages/uim/uim.inc
packages/xserver-common/files/kdrive-1.4-fixes.patch
packages/xserver-common/xserver-common_1.22.bb
packages/zaurusd/files/alsa-cxx00-default.state.patch
conf/bitbake.conf
Diffs:

#
# mt diff -r1c81965a2b4441230dcc780cb75b714800217cf4 -r361c98706e4194c1d6c7c0cf3cb978f758df4151
#
#
#
# delete "packages/gtk+/gtk+-2.10.14/gtklabel-resize-patch"
# 
# delete "packages/gtk+/gtk+-2.10.14/xsettings.patch"
# 
# delete "packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch"
# 
# delete "packages/gtk+/gtk+-2.12.0/xsettings.patch"
# 
# delete "packages/gtk+/gtk+-2.6.10/gtklabel-resize-patch"
# 
# delete "packages/gtk+/gtk+-2.6.10/xsettings.patch"
# 
# delete "packages/gtk+/gtk+-2.8.16/gtklabel-resize-patch"
# 
# delete "packages/gtk+/gtk+-2.8.16/xsettings.patch"
# 
# delete "packages/gtk+/gtk+-2.8.9/gtklabel-resize-patch"
# 
# delete "packages/gtk+/gtk+-2.8.9/xsettings.patch"
# 
# rename "packages/gtk+/gtk+-2.12.3/gtklabel-resize-patch"
#     to "packages/gtk+/files/gtklabel-resize-patch"
# 
# rename "packages/gtk+/gtk+-2.12.3/xsettings.patch"
#     to "packages/gtk+/files/xsettings.patch"
# 
# add_dir "packages/geany"
# 
# add_dir "packages/linux/linux-2.6.25/sequoia"
# 
# add_dir "packages/uclibc/uclibc-0.9.29/dht-walnut"
# 
# add_dir "packages/uclibc/uclibc-0.9.29/kilauea"
# 
# add_dir "packages/uclibc/uclibc-0.9.29/sequoia"
# 
# add_file "conf/distro/jlime-henchman.conf"
#  content [c5c0029ec6fcea5daaf00874e1a20e1d514d7586]
# 
# add_file "conf/distro/jlime-mongo.conf"
#  content [649596799adddbe974beb9a95120de0c9db17b28]
# 
# add_file "conf/machine/mp900c.conf"
#  content [41f2c85c9af298c3c7eca1d376f152b85701d980]
# 
# add_file "packages/geany/geany_0.14.bb"
#  content [e9b4cac4e48f2bb791e6ae247a3a3c18a516e6e5]
# 
# add_file "packages/keymaps/files/jornada6xx/keymap-620lx-660lx.map"
#  content [4720cd8bc99db2c6c1712dc6eb290f18578e9b23]
# 
# add_file "packages/keymaps/files/jornada6xx/keymap-br.map"
#  content [da4660529884767c7991680011b59cc00a2b8a25]
# 
# add_file "packages/linux/linux-2.6.25/sequoia/defconfig"
#  content [ce75f28395b81a44bb99ccbb1bde820c92142ff5]
# 
# add_file "packages/uclibc/uclibc-0.9.29/dht-walnut/uClibc.machine"
#  content [da106c589066aa1fa0a8e86f05bb281fd1241092]
# 
# add_file "packages/uclibc/uclibc-0.9.29/kilauea/uClibc.machine"
#  content [08be21301d47248fa5e1eb0790da7c21691cb4e1]
# 
# add_file "packages/uclibc/uclibc-0.9.29/sequoia/uClibc.machine"
#  content [b5a1713ac55a3fbe19c781308220d1facb5e83b7]
# 
# patch "classes/seppuku.bbclass"
#  from [dea90de0839b4319cddfd278ce07f7f46f244309]
#    to [97be1cf15677f7c326c40bcc51d7b2a31f25260f]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [252a01909d484f213676e0ef32e9f21efbd1f999]
#    to [580a8e8bdd2e455c1aa7545e2c8d9d1f7c19f983]
# 
# patch "conf/distro/include/angstrom-2007-for-openmoko.inc"
#  from [a717aa544a7276462523eba422c16b077bee6039]
#    to [4e926bdf5178cce4d068eeb210aba5adf7982351]
# 
# patch "conf/distro/include/angstrom-eglibc.inc"
#  from [9ef21815795e68510a165699686baf65d3897a7d]
#    to [aac527cd139a2782eecccc8d1215ea89ca5b27b2]
# 
# patch "conf/distro/include/angstrom-glibc.inc"
#  from [561fbe60af1e4718fb9ecf5d28222df8410898dd]
#    to [586f7087f5d3251e88bcbb32dc31647dc11d7375]
# 
# patch "conf/distro/include/angstrom.inc"
#  from [9ab5c13a8aa37b473022beb3a0bade56230f0d49]
#    to [07055167d1e686bc6894c9e490f73d1ff54f7c89]
# 
# patch "conf/distro/include/oplinux.inc"
#  from [fdac56f39d82328f2c280d287c4311027ea9cf17]
#    to [5af0f3e555c3da25b2089272a44d317e776103c4]
# 
# patch "conf/distro/jlime-donkey.conf"
#  from [c7cba5e1fa79492679592aa01e6b8b42497afa0e]
#    to [50f90b05f62918f1b8efc4d5f311a7d80b424ad9]
# 
# patch "conf/documentation.conf"
#  from [d10c13b6402c7c828d664a5fda04d2ad3050a4cc]
#    to [c064b8c62fcb33d8148c3ff70821e40c67c0f466]
# 
# patch "conf/machine/beagleboard.conf"
#  from [0aca1472398cfb3f3a6fc65d9d84b22667811ff5]
#    to [147a7e06fda58ac16bc45831f200a7e2447ac8ac]
# 
# patch "conf/machine/htckaiser.conf"
#  from [8ecec3cc2692888e23f7f4ac09f4cb55c7234e4b]
#    to [daed3c3a075ede90bec1e6302f724e7805689cfb]
# 
# patch "conf/machine/include/qemu.inc"
#  from [f4d52db83b15750777ba577b34575b3260213b7c]
#    to [7131940604566c8c6603fa628971d87421ae776b]
# 
# patch "conf/machine/lsarm.conf"
#  from [d394193bdeced3417b65be1f2d80b14c4896f695]
#    to [4c5c9bea04a16c9c14f46202786f950e366a12d0]
# 
# patch "conf/machine/mpc8323e-rdb.conf"
#  from [95d39d551aee527b03446910655fcd130ec9b845]
#    to [be2f9d14e14a1432cc22b15fc0e1e91c48b8bbca]
# 
# patch "conf/machine/mx31ads.conf"
#  from [16e5038eddf144f583858f15d4f50581465c8f2e]
#    to [08ae32d35d76a42010a78f9ffd685e5a2b4ca00e]
# 
# patch "conf/machine/mx31moboard.conf"
#  from [4fbbc4efbfa3c6a7e53d028698e453da918a952c]
#    to [5db03404a1c6f98021c65d4e217b9fe96bfd97a8]
# 
# patch "conf/machine/n2100.conf"
#  from [2878d1aee27d82598beb6a7f5d57edbe7a0309e1]
#    to [22e23ffbf75a54193ba720ae9ad289aa963dea68]
# 
# patch "conf/machine/nokia800.conf"
#  from [b067467a5bc022fe4141b381f0900eac3a8c5239]
#    to [5dfcd6bfc2942d1bf9edddb033192891485cc2b9]
# 
# patch "conf/machine/sequoia.conf"
#  from [7daeb88263a3a4261fdb4b2b4c5de54ff5b25c7d]
#    to [1fe627040a76a769c0559761d42aac1dcebd54e3]
# 
# patch "conf/machine/storcenter.conf"
#  from [d6d0332b212ef555e874615f6b130151a4913bfc]
#    to [23d4e24772062937d437c89b719be89463334a9f]
# 
# patch "conf/machine/turbostation.conf"
#  from [3ec43c366955c759467dbfda39e7c16d4b62fcd9]
#    to [d9e07573a5eef493c1d4f53ef764cd45e62f2c98]
# 
# patch "contrib/mtn2cl/mtn2cl.sh"
#  from [ea613a6b9c807fd6939677392252634926996ebf]
#    to [ebc3d87f6ffe8fb41bd9aa23e3607970ea70d638]
# 
# patch "packages/alsa/alsa-utils_1.0.13.bb"
#  from [32b3714001d9cf34c7dc17a9d8ba3515c860bf01]
#    to [7919ed3471d1cc0a49060b126ee5f680d82054ff]
# 
# patch "packages/binutils/binutils-avr32.inc"
#  from [7d4de5cdff8cbe23a79ceaf4ae9d202ba3b70583]
#    to [f542652a8b7f98688665946ef7a8f4643be2419b]
# 
# patch "packages/bitchx/bitchx_1.1.bb"
#  from [d623ab0eb969be94749279c54efa84a610246738]
#    to [71d9b09d5f8bec54554dd6add5d25bd1394c1f64]
# 
# patch "packages/gnome/libsoup_2.4.1.bb"
#  from [2570367785f91a06eb22f43eb1a59aa4f7d61fcc]
#    to [e6b86e13ebc986c00649745b8980213d3a4641d2]
# 
# patch "packages/images/sdr-image.bb"
#  from [241b2b3b56e218b3bf887378f5eab66ef049a4b9]
#    to [b98be7ed4825c6edd9d9db45907e271785280358]
# 
# patch "packages/keymaps/files/jornada6xx/keymap-de.map"
#  from [a75d85ffe763e7d3a07b2b5946455708ab9180dd]
#    to [25237075aa4520b254b6affbe7d05e40841011aa]
# 
# patch "packages/keymaps/files/jornada6xx/keymap-sp.map"
#  from [94a7710e5ef0c6474055b0bbaa005eeddae2ede6]
#    to [43a93ccc335be732033bddc1d2fdfd0bdcd8a308]
# 
# patch "packages/keymaps/files/jornada6xx/keymap-uk.map"
#  from [d1c2822f29a65bdd5faddb78981fbb4c573f92f4]
#    to [fc943c31f0479283b40467b68da13630062b5b61]
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [7a39d0ef4c7985483f4482973e1604b71e56b7e3]
#    to [99e634f6d619f025715a2fded7d772dd67561890]
# 
# patch "packages/linux/linux.inc"
#  from [f51f2695a26e28a98c85271790ac60e689d971fd]
#    to [f1aa05046da57692f765c8cf904367093ee01958]
# 
# patch "packages/linux/linux_2.6.25.bb"
#  from [7357de969e9609eeedf602d412814cadda96d7cb]
#    to [cc090c604f64fcaff28a9afac75840fd99f449fa]
# 
# patch "packages/mozilla/minimo/bug-322806.diff"
#  from [291835329006b330a7e9cdf2e962f8afd23df8cf]
#    to [b41d98a79d017d16d7d231133c59fe8a8731ccd2]
# 
# patch "packages/perl/files/perl-5.8.8-gcc-4.2.patch"
#  from [e5a683173b0d9469b46af6e117df37bc0de7fe76]
#    to [96946b7ca1f4ee5d891973144a7e9b6dfa5a826c]
# 
# patch "packages/perl/perl-5.8.8/native-ssp.patch"
#  from [4c615884d98871a7a8c0e32556ada8193f43bce5]
#    to [93cec2ab28a84c163fd888bdb0608984866c7cdf]
# 
# patch "packages/uclibc/uclibc-0.9.29/avr32/uClibc.machine"
#  from [982b86121dc5785e0853eea3beeb64e885a28474]
#    to [de18a631d0ca40b722160065f82aa64108fd86f5]
# 
# patch "packages/uclibc/uclibc-0.9.29/uClibc.distro"
#  from [553fa4886d4d4d4069f4e83ac39de07cdae137df]
#    to [cf89107fd4379acbf2713de1b289276ce66783d2]
# 
# patch "packages/uclibc/uclibc_0.9.29.bb"
#  from [59c9209c18cebba61fe0d3b0d595b2953e6dd351]
#    to [dbbd24e34ec8e9ab218f1a914c0b9eb2e4e3468b]
# 
# patch "packages/uim/uim-native_1.3.1.bb"
#  from [f06e89091a998191e8abec41fb27c08aad836c59]
#    to [8fb7a3d85f37d5eac8bf30aff5d2e1f6cf51c9fd]
# 
# patch "packages/uim/uim.inc"
#  from [14e1f43be243a5721dd3aaa3f1be157b79c1042e]
#    to [a5fbe9af22c1b0a4a0f3a6b77e0f37451cd7d3c2]
# 
# patch "packages/xserver-common/files/kdrive-1.4-fixes.patch"
#  from [8f5baf832334e48f1611b7ad8a89d1dc103d81b5]
#    to [7f355080ef17fdb1125f0be003cd4ca2ecbc6b1e]
# 
# patch "packages/xserver-common/xserver-common_1.22.bb"
#  from [9291843b220f9d344ce56e4f5ac171696e38b2ad]
#    to [8752f199e55d1213507046c386dc15d5f4cf3a0c]
# 
# patch "packages/zaurusd/files/alsa-cxx00-default.state.patch"
#  from [5134186c26707a1d7ee7b2e4904d429218a8a96a]
#    to [ed3369363c47b75facdc7c10c263f810e46cf969]
#
============================================================
--- conf/distro/jlime-henchman.conf	c5c0029ec6fcea5daaf00874e1a20e1d514d7586
+++ conf/distro/jlime-henchman.conf	c5c0029ec6fcea5daaf00874e1a20e1d514d7586
@@ -0,0 +1,106 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Jlime Henchman <jlime.com>
+#@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the
+#              NEC Mobile Pro 900/900c handheld pc.
+#@MAINTAINER: Matt Oudenhoven <wicked5850 at yahoo.com>
+#-----------------------------------------------------------------------------
+
+#
+# Header
+#
+DISTRO_NAME = "Jlime"
+DISTRO_VERSION = "Henchman"
+#DISTRO_TYPE = "release"
+#DISTRO_TYPE = "debug"
+
+#export FEED_URLS_jlime = "henchman##http://henchman.jlime.com/feed"
+
+#<>------------------------------------------------------------------>
+#<>What we want on the bootstrap image (extra) 
+#<>                                            
+#<>------------------------------------------------------------------<
+DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
+			console-tools tslib-tests parted dialog"
+
+#<>------------------------------------------------------------------>
+#<>Our Image files should look abit better.
+#<>
+#<>------------------------------------------------------------------<
+IMAGE_NAME = "${IMAGE_BASENAME}-Henchman-${MACHINE}"
+
+#
+# Naming schemes
+#
+INHERIT += "debian multimachine"
+
+#
+# Packaging and output format
+#
+INHERIT += "package_ipk"
+IMAGE_FSTYPES = "tar.bz2"
+
+#
+# Kernel
+#
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+#
+# Binutils & Compiler
+#
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+PREFERRED_VERSION_gcc = "4.2.2"
+PREFERRED_VERSION_gcc-cross = "4.2.2"
+PREFERRED_VERSION_gcc-cross-initial = "4.2.2"
+PREFERRED_VERSION_binutils = "2.18"
+PREFERRED_VERSION_binutils-cross = "2.18"
+
+#
+# Target OS & FPU system
+# 
+TARGET_OS = "linux"
+TARGET_FPU_arm = "fixed"
+TARGET_FPU_armeb = "fixed"
+
+PREFERRED_PROVIDER_virtual/libiconv = "glibc"
+PREFERRED_PROVIDER_virtual/libintl = "glibc"
+PREFERRED_PROVIDER_virtual/libc = "glibc"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_VERSION_linux-libc-headers = "2.6.23"
+PREFERRED_VERSION_glibc = "2.5"
+PREFERRED_VERSION_glibc-intermediate = "2.5"
+
+#
+# Bootstrap & Init
+#
+PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+
+#
+# Framebuffer & X
+#
+PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
+PREFERRED_PROVIDER_tslib = "tslib"
+PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+
+#
+# GPE
+#
+require conf/distro/include/preferred-gpe-versions-2.8.inc
+
+#
+# Opie
+#
+QTE_VERSION = "2.3.10"
+PALMTOP_USE_MULTITHREADED_QTE = "yes"
+OPIE_VERSION = "1.2.3"
+require conf/distro/include/preferred-opie-versions.inc
============================================================
--- conf/distro/jlime-mongo.conf	649596799adddbe974beb9a95120de0c9db17b28
+++ conf/distro/jlime-mongo.conf	649596799adddbe974beb9a95120de0c9db17b28
@@ -0,0 +1,107 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Jlime Mongo <jlime.com>
+#@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the
+#              HP Jornada 720/728 handheld pc.
+#@MAINTAINER: Matt Oudenhoven <wicked5850 at yahoo.com>
+#-----------------------------------------------------------------------------
+
+#
+# Header
+#
+DISTRO_NAME = "Jlime"
+DISTRO_VERSION = "Mongo"
+#DISTRO_TYPE = "release"
+#DISTRO_TYPE = "debug"
+
+export FEED_URLS_jlime = "http://mongo.jlime.com/feed"
+
+#<>------------------------------------------------------------------>
+#<>What we want on the bootstrap image (extra) 
+#<>                                            
+#<>------------------------------------------------------------------<
+DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
+			console-tools tslib-tests parted dialog"
+
+#<>------------------------------------------------------------------>
+#<>Our Image files should look abit better.
+#<>
+#<>------------------------------------------------------------------<
+IMAGE_NAME = "${IMAGE_BASENAME}-Mongo-${MACHINE}"
+
+#
+# Naming schemes
+#
+INHERIT += "debian multimachine"
+
+#
+# Packaging and output format
+#
+INHERIT += "package_ipk"
+#INHERIT += "package_tar"
+IMAGE_FSTYPES = "tar.bz2"
+
+#
+# Kernel
+#
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+#
+# Binutils & Compiler
+#
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+PREFERRED_VERSION_gcc = "4.2.2"
+PREFERRED_VERSION_gcc-cross = "4.2.2"
+PREFERRED_VERSION_gcc-cross-initial = "4.2.2"
+PREFERRED_VERSION_binutils = "2.18"
+PREFERRED_VERSION_binutils-cross = "2.18"
+
+#
+# Target OS & FPU system
+# 
+TARGET_OS = "linux"
+TARGET_FPU_arm = "soft"
+TARGET_FPU_armeb = "soft"
+
+PREFERRED_PROVIDER_virtual/libiconv = "glibc"
+PREFERRED_PROVIDER_virtual/libintl = "glibc"
+PREFERRED_PROVIDER_virtual/libc = "glibc"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_VERSION_linux-libc-headers = "2.6.18"
+PREFERRED_VERSION_glibc = "2.5"
+PREFERRED_VERSION_glibc-intermediate = "2.5"
+
+#
+# Bootstrap & Init
+#
+PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+
+#
+# Framebuffer & X
+#
+PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
+PREFERRED_PROVIDER_tslib = "tslib"
+PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+
+#
+# GPE
+#
+require conf/distro/include/preferred-gpe-versions-2.8.inc
+
+#
+# Opie
+#
+QTE_VERSION = "2.3.10"
+PALMTOP_USE_MULTITHREADED_QTE = "yes"
+OPIE_VERSION = "1.2.3"
+require conf/distro/include/preferred-opie-versions.inc
============================================================
--- conf/machine/mp900c.conf	41f2c85c9af298c3c7eca1d376f152b85701d980
+++ conf/machine/mp900c.conf	41f2c85c9af298c3c7eca1d376f152b85701d980
@@ -0,0 +1,13 @@
+#@TYPE: Machine
+#@NAME: NEC Mobile Pro 900/900c 
+#@DESCRIPTION: Machine configuration for the PXA255 based Mobile Pro 9xx palmtop computer
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
+
+require conf/machine/include/tune-xscale.inc
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-mobilepro900"
+PCMCIA_MANAGER = "pcmciautils"
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda keyboard touchscreen screen"
+MACHINE_EXTRA_RDEPENDS = "kernel-modules"
============================================================
--- packages/geany/geany_0.14.bb	e9b4cac4e48f2bb791e6ae247a3a3c18%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rd61da5b80e9dd6d9c4abeb4bdba7558079f3ccdf -r361c98706e4194c1d6c7c0cf3cb978f758df4151
#
#
#
# patch "conf/bitbake.conf"
#  from [86fdaa0747310ea3f83914cbb3f62e00cd500cec]
#    to [0015241781b03dc2f3ac5f831d982fd4e9661b7f]
#
============================================================
--- conf/bitbake.conf	86fdaa0747310ea3f83914cbb3f62e00cd500cec
+++ conf/bitbake.conf	0015241781b03dc2f3ac5f831d982fd4e9661b7f
@@ -427,6 +427,7 @@ FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs
 E_CVS = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e" 
 E_URI = "http://enlightenment.freedesktop.org/files"
 FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs"
+FREESMARTPHONE_GIT = "git://git.freesmartphone.org"
 GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles"
 APACHE_MIRROR = "http://www.apache.org/dist"
 KERNELORG_MIRROR = "http://kernel.org/"






More information about the Openembedded-commits mailing list