[oe-commits] org.oe.dev merge of '487f86d7da4356e5d8c6832b7ff5f0ee9ab8c293'
rodrigo.vivi commit
oe at amethyst.openembedded.net
Thu Mar 27 19:11:38 UTC 2008
merge of '487f86d7da4356e5d8c6832b7ff5f0ee9ab8c293'
and 'd1dfc5df9769c50ec5328454ab737f091f6c573f'
Author: rodrigo.vivi at openembedded.org
Branch: org.openembedded.dev
Revision: a5ceef80167451640ed57234e28008169c49ef38
ViewMTN: http://monotone.openembedded.org/revision/info/a5ceef80167451640ed57234e28008169c49ef38
Files:
1
packages/alsa/alsa-state/fic-gta01
packages/alsa/alsa-state/fic-gta01/asound.state
packages/alsa/alsa-state/fic-gta01/capturehandset.state
packages/alsa/alsa-state/fic-gta01/captureheadset.state
packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state
packages/alsa/alsa-state/fic-gta01/gsmhandset.state
packages/alsa/alsa-state/fic-gta01/gsmheadset.state
packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state
packages/alsa/alsa-state/fic-gta01/stereoout.state
packages/alsa/alsa-state/fic-gta01/voip-handset.state
packages/alsa/alsa-state/fic-gta01/voip-headset.state
packages/alsa/alsa-state/fic-gta02
packages/alsa/alsa-state/fic-gta02/asound.state
packages/alsa/alsa-state/fic-gta02/gsmhandset.state
packages/alsa/alsa-state/fic-gta02/stereoout.state
packages/base-files/base-files/fic-gta01
packages/base-files/base-files/fic-gta01/fstab
packages/base-files/base-files/fic-gta02
packages/base-files/base-files/fic-gta02/fstab
packages/fbset/fbset-modes/fic-gta01
packages/fbset/fbset-modes/fic-gta01/fb.modes
packages/gpephone/gpe-applauncher/fic-gta01
packages/gpephone/gpe-applauncher/fic-gta01/hotkeys.conf
packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf
packages/gpsd/files/fic-gta01
packages/gpsd/files/fic-gta01/gps-hardware
packages/gpsd/files/fic-gta01/gpsd-default
packages/gpsd/files/fic-gta01/restart_gllin.sh
packages/initscripts/initscripts-1.0/fic-gta01
packages/initscripts/initscripts-1.0/fic-gta01/inittab
packages/netbase/netbase/fic-gta01
packages/netbase/netbase/fic-gta01/interfaces
packages/netbase/netbase/fic-gta02
packages/netbase/netbase/fic-gta02/interfaces
packages/openmoko2/openmoko-dialer2/fic-gta01
packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch
packages/openmoko2/openmoko-dialer2/fic-gta02
packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch
packages/pointercal/files/fic-gta01
packages/pointercal/files/fic-gta01/pointercal
packages/pointercal/files/fic-gta02
packages/pointercal/files/fic-gta02/pointercal
packages/qte/qte-2.3.12
packages/qte/qte-2.3.12/bidimetrics.patch
packages/qte/qte-2.3.12/c700-hardware.patch
packages/qte/qte-2.3.12/c7x0-w100-accel.patch
packages/qte/qte-2.3.12/daemonize.patch
packages/qte/qte-2.3.12/devfs.patch
packages/qte/qte-2.3.12/encoding.patch
packages/qte/qte-2.3.12/fix-errno-exception-spec.patch
packages/qte/qte-2.3.12/fix-linuxfb-offscreenoverflow.patch
packages/qte/qte-2.3.12/fix-linuxfb-setmode.patch
packages/qte/qte-2.3.12/fix-qgfxraster.patch
packages/qte/qte-2.3.12/fix-qscreen-sync.patch
packages/qte/qte-2.3.12/gcc3.patch
packages/qte/qte-2.3.12/gcc4.patch
packages/qte/qte-2.3.12/handhelds.patch
packages/qte/qte-2.3.12/improve-calibration-r0.patch
packages/qte/qte-2.3.12/increase-qxml-robustness.patch
packages/qte/qte-2.3.12/ipaq-keyboard.patch
packages/qte/qte-2.3.12/ipaq_sound_fix.patch
packages/qte/qte-2.3.12/kernel-keymap-CXK.patch
packages/qte/qte-2.3.12/kernel-keymap-corgi.patch
packages/qte/qte-2.3.12/kernel-keymap.patch
packages/qte/qte-2.3.12/key.patch
packages/qte/qte-2.3.12/mnci-touchscreen.patch
packages/qte/qte-2.3.12/mnci.patch
packages/qte/qte-2.3.12/no-moc.patch
packages/qte/qte-2.3.12/qiconview-speed.patch
packages/qte/qte-2.3.12/qpe.patch
packages/qte/qte-2.3.12/qt-visibility.patch
packages/qte/qte-2.3.12/qtabbar.patch
packages/qte/qte-2.3.12/qte-fix-iconsize.patch
packages/qte/qte-2.3.12/sharp_char.h
packages/qte/qte-2.3.12/simpad-defaultkbd.patch
packages/qte/qte-2.3.12/simpad.patch
packages/qte/qte-2.3.12/suspend-resume-hooks.patch
packages/qte/qte-2.3.12/switches.h
packages/qte/qte-2.3.12/tslib.patch
packages/qte/qte-2.3.12/vt-switch.patch
packages/qte/qte-common_2.3.12.inc
packages/qte/qte-mt-static_2.3.12.bb
packages/qte/qte-mt_2.3.12.bb
packages/scummvm/files/fic-gta01
packages/scummvm/files/fic-gta01/openmoko-scummvm
packages/tslib/tslib/fic-gta01
packages/tslib/tslib/fic-gta01/ts.conf
packages/u-boot/u-boot-1.2.0/fic-gta01
packages/u-boot/u-boot-1.2.0/fic-gta01/fw_env.config
packages/uclibc/uclibc-0.9.29/fic-gta01
packages/uclibc/uclibc-0.9.29/fic-gta01/uClibc.machine
conf/machine/fic-gta01.conf
conf/machine/om-gta01.conf
conf/machine/fic-gta02.conf
conf/machine/om-gta02.conf
packages/linux/linux-ixp4xx/defconfig-2.6.24
packages/linux/linux-ixp4xx/defconfig-2.6.24.4
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4
packages/linux/linux-ixp4xx_2.6.24.bb
packages/linux/linux-ixp4xx_2.6.24.4.bb
packages/alsa/alsa-state/om-gta01
packages/alsa/alsa-state/om-gta02
packages/base-files/base-files/om-gta01
packages/base-files/base-files/om-gta02
packages/binutils/binutils-2.16.1
packages/elfutils/elfutils-0.131
packages/fbset/fbset-modes/om-gta01
packages/glibc/glibc-2.3.6
packages/gpephone/gpe-applauncher/om-gta01
packages/gpsd/files/om-gta01
packages/gtkhtml/gtkhtml-3.8
packages/initscripts/initscripts-1.0/om-gta01
packages/lvm2/lvm2-2.01.15
packages/netbase/netbase/om-gta01
packages/netbase/netbase/om-gta02
packages/openmoko2/openmoko-dialer2/om-gta01
packages/openmoko2/openmoko-dialer2/om-gta02
packages/opkg/files
packages/pointercal/files/om-gta01
packages/pointercal/files/om-gta02
packages/popt/popt-1.13
packages/pump
packages/pump/pump
packages/scummvm/files/om-gta01
packages/squid/squid
packages/squidview
packages/tslib/tslib/om-gta01
packages/u-boot/u-boot-1.2.0/om-gta01
packages/uclibc/uclibc-0.9.29/om-gta01
packages/alsa/alsa-state/om-gta01/asound.state
packages/alsa/alsa-state/om-gta01/capturehandset.state
packages/alsa/alsa-state/om-gta01/captureheadset.state
packages/alsa/alsa-state/om-gta01/gsmbluetooth.state
packages/alsa/alsa-state/om-gta01/gsmhandset.state
packages/alsa/alsa-state/om-gta01/gsmheadset.state
packages/alsa/alsa-state/om-gta01/gsmspeakerout.state
packages/alsa/alsa-state/om-gta01/stereoout.state
packages/alsa/alsa-state/om-gta01/voip-handset.state
packages/alsa/alsa-state/om-gta01/voip-headset.state
packages/alsa/alsa-state/om-gta02/asound.state
packages/alsa/alsa-state/om-gta02/gsmhandset.state
packages/alsa/alsa-state/om-gta02/stereoout.state
packages/base-files/base-files/om-gta01/fstab
packages/base-files/base-files/om-gta02/fstab
packages/binutils/binutils-2.16.1/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch
packages/binutils/binutils-cross_2.16.1.bb
packages/binutils/binutils_2.16.1.bb
packages/busybox/files/50telnet
packages/busybox/files/login.failsafe
packages/db/db4-native.inc
packages/db/db4.inc
packages/device-mapper/device-mapper-1.01.05/remove_insanity.patch
packages/elfutils/elfutils-0.131/warnings.patch
packages/elfutils/elfutils_0.131.bb
packages/fbset/fbset-modes/om-gta01/fb.modes
packages/gcc/gcc-3.4.4/jarfix.patch
packages/gcc/gcc-4.2.1/gcc-pr32889.patch
packages/gcc/gcc-cross-initial_csl-arm-2006q1.bb
packages/gcc/gcc-cross_csl-arm-2006q1.bb
packages/gcc/gcc-csl-arm/gcc-new-makeinfo.patch
packages/gcc/gcc-csl-arm-2006q1.inc
packages/gcc/gcc_csl-arm-2006q1.bb
packages/glibc/glibc-2.3.6/glibc-2.3.6-allow-gcc-4.1-powerpc32-initfini.s.patch
packages/glibc/glibc-2.3.6/glibc-2.3.6-bind-already-defined-on-powerpc.patch
packages/glibc/glibc-2.3.6/glibc-2.3.6-linuxthreads-allow-gcc-4.1-powerpc32-initfini.s.patch
packages/glibc/glibc-2.3.6/late-install-loop-break.patch
packages/glibc/glibc-initial_2.3.6.bb
packages/glibc/glibc-intermediate_2.3.6.bb
packages/glibc/glibc_2.3.6.bb
packages/gpephone/gpe-applauncher/om-gta01/hotkeys.conf
packages/gpephone/gpe-applauncher/om-gta01/softkeys.conf
packages/gpsd/files/om-gta01/gps-hardware
packages/gpsd/files/om-gta01/gpsd-default
packages/gpsd/files/om-gta01/restart_gllin.sh
packages/gtkhtml/gtkhtml-3.8/60_glib-2.15-g-gnuc-function.patch
packages/gtkhtml/gtkhtml-3.8_3.12.3.bb
packages/gtkhtml/gtkhtml-3.8_3.18.0.bb
packages/initscripts/initscripts-1.0/om-gta01/inittab
packages/lvm2/lvm2-2.01.15/crosscompile_fix.patch
packages/netbase/netbase/om-gta01/interfaces
packages/netbase/netbase/om-gta02/interfaces
packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch
packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch
packages/opkg/files/fix_endianness.patch
packages/pointercal/files/om-gta01/pointercal
packages/pointercal/files/om-gta02/pointercal
packages/popt/popt-1.13/iconv.patch
packages/pump/pump/debian.patch
packages/pump/pump_0.8.24.bb
packages/scummvm/files/om-gta01/openmoko-scummvm
packages/squid/squid/fix_epoll_check.patch
packages/squid/squid/squid.init
packages/squidview/squidview_0.72.bb
packages/strace/strace-4.5.14/strace-4.5.14-avr32-add-syscalls-up-to-sysvipc.patch
packages/tslib/tslib/om-gta01/ts.conf
packages/u-boot/u-boot-1.2.0/om-gta01/fw_env.config
packages/uclibc/uclibc-0.9.29/om-gta01/uClibc.machine
MAINTAINERS
classes/e.bbclass
classes/rootfs_ipk.bbclass
conf/distro/include/angstrom-2007-for-openmoko-versions.inc
conf/distro/include/angstrom.inc
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/openmoko.conf
conf/machine/include/ixp4xx.inc
contrib/angstrom/build-feeds.sh
contrib/angstrom/build-release.sh
contrib/feed-browser/includes/config.inc
contrib/qa/bugzilla.py
packages/alsa/alsa-state.bb
packages/bluez/bluez-utils3.inc
packages/bluez/bluez-utils_3.11.bb
packages/bluez/bluez-utils_3.12.bb
packages/bluez/bluez-utils_3.13.bb
packages/bluez/bluez-utils_3.14.bb
packages/bluez/bluez-utils_3.15.bb
packages/bluez/bluez-utils_3.16.bb
packages/bluez/bluez-utils_3.17.bb
packages/busybox/busybox-1.9.1/defconfig
packages/db/db-native_4.2.52.bb
packages/db/db-native_4.3.29.bb
packages/db/db3_3.2.9.bb
packages/db/db_4.2.52.bb
packages/db/db_4.3.29.bb
packages/device-mapper/device-mapper_1.01.05.bb
packages/e17/e-wm_cvs.bb
packages/efl1/evas-native_cvs.bb
packages/elfutils/elfutils-0.127/warnings.patch
packages/esmtp/esmtp_0.5.1.bb
packages/fbreader/fbreader_0.8.2a.bb
packages/gcc/gcc-3.4.4.inc
packages/gcc/gcc-4.0.0.inc
packages/gcc/gcc-4.0.2.inc
packages/gcc/gcc-4.1.0.inc
packages/gcc/gcc-4.1.1.inc
packages/gcc/gcc-4.1.2.inc
packages/gcc/gcc-4.2.1.inc
packages/gcc/gcc-4.2.2.inc
packages/gcc/gcc-4.3.0.inc
packages/gcc/gcc-configure-common.inc
packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
packages/gcc/gcc-cross_4.1.0.bb
packages/gcc/gcc-cross_4.2.1.bb
packages/gcc/gcc-cross_4.2.2.bb
packages/gcc/gcc-cross_4.3.0.bb
packages/gcc/gcc-package-cross.inc
packages/gcc/gcc-package-target.inc
packages/gcc/gcc_4.2.1.bb
packages/gpephone/gpe-applauncher_0.10.bb
packages/gpephone/gpe-applauncher_0.11.bb
packages/gpephone/gpe-applauncher_svn.bb
packages/gpephone/phoneserver_1.0.bb
packages/gpsd/gpsd.inc
packages/images/slugos-image.bb
packages/inetutils/inetutils_1.5.bb
packages/linux/linux-2.6.24/simpad/linux-2.6.24-SIMpad-rtc-sa1100.patch
packages/linux/linux-openmoko-devel_git.bb
packages/linux/linux-openmoko.inc
packages/linux/linux-openmoko_2.6.22.5.bb
packages/linux/linux-openmoko_2.6.24.bb
packages/linux/linux_2.6.24.bb
packages/lvm2/lvm2_2.01.15.bb
packages/mamona/gcc-noemu_4.1.1.bb
packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
packages/meta/slugos-packages.bb
packages/openmoko-projects/diversity-daemon_svn.bb
packages/openmoko2/neod_svn.bb
packages/openmoko2/openmoko-dialer2_svn.bb
packages/opkg/opkg.inc
packages/opkg/opkg_svn.bb
packages/popt/popt_1.13.bb
packages/slugos-init/files/modulefunctions
packages/slugos-init/files/turnup
packages/slugos-init/slugos-init_4.8.bb
packages/squid/squid_2.6.STABLE14.bb
packages/strace/strace_4.5.14.bb
packages/uclibc/uclibc_0.9.29.bb
packages/vte/vte.inc
mtn:execute
true
conf/distro/mamona.conf
Diffs:
#
# mt diff -r487f86d7da4356e5d8c6832b7ff5f0ee9ab8c293 -ra5ceef80167451640ed57234e28008169c49ef38
#
#
#
# delete "packages/alsa/alsa-state/fic-gta01"
#
# delete "packages/alsa/alsa-state/fic-gta01/asound.state"
#
# delete "packages/alsa/alsa-state/fic-gta01/capturehandset.state"
#
# delete "packages/alsa/alsa-state/fic-gta01/captureheadset.state"
#
# delete "packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state"
#
# delete "packages/alsa/alsa-state/fic-gta01/gsmhandset.state"
#
# delete "packages/alsa/alsa-state/fic-gta01/gsmheadset.state"
#
# delete "packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state"
#
# delete "packages/alsa/alsa-state/fic-gta01/stereoout.state"
#
# delete "packages/alsa/alsa-state/fic-gta01/voip-handset.state"
#
# delete "packages/alsa/alsa-state/fic-gta01/voip-headset.state"
#
# delete "packages/alsa/alsa-state/fic-gta02"
#
# delete "packages/alsa/alsa-state/fic-gta02/asound.state"
#
# delete "packages/alsa/alsa-state/fic-gta02/gsmhandset.state"
#
# delete "packages/alsa/alsa-state/fic-gta02/stereoout.state"
#
# delete "packages/base-files/base-files/fic-gta01"
#
# delete "packages/base-files/base-files/fic-gta01/fstab"
#
# delete "packages/base-files/base-files/fic-gta02"
#
# delete "packages/base-files/base-files/fic-gta02/fstab"
#
# delete "packages/fbset/fbset-modes/fic-gta01"
#
# delete "packages/fbset/fbset-modes/fic-gta01/fb.modes"
#
# delete "packages/gpephone/gpe-applauncher/fic-gta01"
#
# delete "packages/gpephone/gpe-applauncher/fic-gta01/hotkeys.conf"
#
# delete "packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf"
#
# delete "packages/gpsd/files/fic-gta01"
#
# delete "packages/gpsd/files/fic-gta01/gps-hardware"
#
# delete "packages/gpsd/files/fic-gta01/gpsd-default"
#
# delete "packages/gpsd/files/fic-gta01/restart_gllin.sh"
#
# delete "packages/initscripts/initscripts-1.0/fic-gta01"
#
# delete "packages/initscripts/initscripts-1.0/fic-gta01/inittab"
#
# delete "packages/netbase/netbase/fic-gta01"
#
# delete "packages/netbase/netbase/fic-gta01/interfaces"
#
# delete "packages/netbase/netbase/fic-gta02"
#
# delete "packages/netbase/netbase/fic-gta02/interfaces"
#
# delete "packages/openmoko2/openmoko-dialer2/fic-gta01"
#
# delete "packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch"
#
# delete "packages/openmoko2/openmoko-dialer2/fic-gta02"
#
# delete "packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch"
#
# delete "packages/pointercal/files/fic-gta01"
#
# delete "packages/pointercal/files/fic-gta01/pointercal"
#
# delete "packages/pointercal/files/fic-gta02"
#
# delete "packages/pointercal/files/fic-gta02/pointercal"
#
# delete "packages/qte/qte-2.3.12"
#
# delete "packages/qte/qte-2.3.12/bidimetrics.patch"
#
# delete "packages/qte/qte-2.3.12/c700-hardware.patch"
#
# delete "packages/qte/qte-2.3.12/c7x0-w100-accel.patch"
#
# delete "packages/qte/qte-2.3.12/daemonize.patch"
#
# delete "packages/qte/qte-2.3.12/devfs.patch"
#
# delete "packages/qte/qte-2.3.12/encoding.patch"
#
# delete "packages/qte/qte-2.3.12/fix-errno-exception-spec.patch"
#
# delete "packages/qte/qte-2.3.12/fix-linuxfb-offscreenoverflow.patch"
#
# delete "packages/qte/qte-2.3.12/fix-linuxfb-setmode.patch"
#
# delete "packages/qte/qte-2.3.12/fix-qgfxraster.patch"
#
# delete "packages/qte/qte-2.3.12/fix-qscreen-sync.patch"
#
# delete "packages/qte/qte-2.3.12/gcc3.patch"
#
# delete "packages/qte/qte-2.3.12/gcc4.patch"
#
# delete "packages/qte/qte-2.3.12/handhelds.patch"
#
# delete "packages/qte/qte-2.3.12/improve-calibration-r0.patch"
#
# delete "packages/qte/qte-2.3.12/increase-qxml-robustness.patch"
#
# delete "packages/qte/qte-2.3.12/ipaq-keyboard.patch"
#
# delete "packages/qte/qte-2.3.12/ipaq_sound_fix.patch"
#
# delete "packages/qte/qte-2.3.12/kernel-keymap-CXK.patch"
#
# delete "packages/qte/qte-2.3.12/kernel-keymap-corgi.patch"
#
# delete "packages/qte/qte-2.3.12/kernel-keymap.patch"
#
# delete "packages/qte/qte-2.3.12/key.patch"
#
# delete "packages/qte/qte-2.3.12/mnci-touchscreen.patch"
#
# delete "packages/qte/qte-2.3.12/mnci.patch"
#
# delete "packages/qte/qte-2.3.12/no-moc.patch"
#
# delete "packages/qte/qte-2.3.12/qiconview-speed.patch"
#
# delete "packages/qte/qte-2.3.12/qpe.patch"
#
# delete "packages/qte/qte-2.3.12/qt-visibility.patch"
#
# delete "packages/qte/qte-2.3.12/qtabbar.patch"
#
# delete "packages/qte/qte-2.3.12/qte-fix-iconsize.patch"
#
# delete "packages/qte/qte-2.3.12/sharp_char.h"
#
# delete "packages/qte/qte-2.3.12/simpad-defaultkbd.patch"
#
# delete "packages/qte/qte-2.3.12/simpad.patch"
#
# delete "packages/qte/qte-2.3.12/suspend-resume-hooks.patch"
#
# delete "packages/qte/qte-2.3.12/switches.h"
#
# delete "packages/qte/qte-2.3.12/tslib.patch"
#
# delete "packages/qte/qte-2.3.12/vt-switch.patch"
#
# delete "packages/qte/qte-common_2.3.12.inc"
#
# delete "packages/qte/qte-mt-static_2.3.12.bb"
#
# delete "packages/qte/qte-mt_2.3.12.bb"
#
# delete "packages/scummvm/files/fic-gta01"
#
# delete "packages/scummvm/files/fic-gta01/openmoko-scummvm"
#
# delete "packages/tslib/tslib/fic-gta01"
#
# delete "packages/tslib/tslib/fic-gta01/ts.conf"
#
# delete "packages/u-boot/u-boot-1.2.0/fic-gta01"
#
# delete "packages/u-boot/u-boot-1.2.0/fic-gta01/fw_env.config"
#
# delete "packages/uclibc/uclibc-0.9.29/fic-gta01"
#
# delete "packages/uclibc/uclibc-0.9.29/fic-gta01/uClibc.machine"
#
# rename "conf/machine/fic-gta01.conf"
# to "conf/machine/om-gta01.conf"
#
# rename "conf/machine/fic-gta02.conf"
# to "conf/machine/om-gta02.conf"
#
# rename "packages/linux/linux-ixp4xx/defconfig-2.6.24"
# to "packages/linux/linux-ixp4xx/defconfig-2.6.24.4"
#
# rename "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24"
# to "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4"
#
# rename "packages/linux/linux-ixp4xx_2.6.24.bb"
# to "packages/linux/linux-ixp4xx_2.6.24.4.bb"
#
# add_dir "packages/alsa/alsa-state/om-gta01"
#
# add_dir "packages/alsa/alsa-state/om-gta02"
#
# add_dir "packages/base-files/base-files/om-gta01"
#
# add_dir "packages/base-files/base-files/om-gta02"
#
# add_dir "packages/binutils/binutils-2.16.1"
#
# add_dir "packages/elfutils/elfutils-0.131"
#
# add_dir "packages/fbset/fbset-modes/om-gta01"
#
# add_dir "packages/glibc/glibc-2.3.6"
#
# add_dir "packages/gpephone/gpe-applauncher/om-gta01"
#
# add_dir "packages/gpsd/files/om-gta01"
#
# add_dir "packages/gtkhtml/gtkhtml-3.8"
#
# add_dir "packages/initscripts/initscripts-1.0/om-gta01"
#
# add_dir "packages/lvm2/lvm2-2.01.15"
#
# add_dir "packages/netbase/netbase/om-gta01"
#
# add_dir "packages/netbase/netbase/om-gta02"
#
# add_dir "packages/openmoko2/openmoko-dialer2/om-gta01"
#
# add_dir "packages/openmoko2/openmoko-dialer2/om-gta02"
#
# add_dir "packages/opkg/files"
#
# add_dir "packages/pointercal/files/om-gta01"
#
# add_dir "packages/pointercal/files/om-gta02"
#
# add_dir "packages/popt/popt-1.13"
#
# add_dir "packages/pump"
#
# add_dir "packages/pump/pump"
#
# add_dir "packages/scummvm/files/om-gta01"
#
# add_dir "packages/squid/squid"
#
# add_dir "packages/squidview"
#
# add_dir "packages/tslib/tslib/om-gta01"
#
# add_dir "packages/u-boot/u-boot-1.2.0/om-gta01"
#
# add_dir "packages/uclibc/uclibc-0.9.29/om-gta01"
#
# add_file "packages/alsa/alsa-state/om-gta01/asound.state"
# content [24c88d006bc4b79644d0fd7d8c92b27d5b3d3c28]
#
# add_file "packages/alsa/alsa-state/om-gta01/capturehandset.state"
# content [e9daf2ba483a71ce163925f4f8123f9b21fae829]
#
# add_file "packages/alsa/alsa-state/om-gta01/captureheadset.state"
# content [c2a0fa104836312145b8705962462a0ab4f9049a]
#
# add_file "packages/alsa/alsa-state/om-gta01/gsmbluetooth.state"
# content [8f6dd94826572a3e21eb710a31de17c94b4ff6e5]
#
# add_file "packages/alsa/alsa-state/om-gta01/gsmhandset.state"
# content [88e380e6c174c2c8e0d067f5f3bf5cc23d9279a9]
#
# add_file "packages/alsa/alsa-state/om-gta01/gsmheadset.state"
# content [d136d1e7e79a80885e9b7a0a03c442fdc032cc61]
#
# add_file "packages/alsa/alsa-state/om-gta01/gsmspeakerout.state"
# content [534365ba106105f05e94a03aea74c9c6da59a017]
#
# add_file "packages/alsa/alsa-state/om-gta01/stereoout.state"
# content [24c88d006bc4b79644d0fd7d8c92b27d5b3d3c28]
#
# add_file "packages/alsa/alsa-state/om-gta01/voip-handset.state"
# content [4d28d6e6a2f7c934263fadf690327fe6208168fd]
#
# add_file "packages/alsa/alsa-state/om-gta01/voip-headset.state"
# content [9693cce22afbd9cb814e2f71ff566df3306c8649]
#
# add_file "packages/alsa/alsa-state/om-gta02/asound.state"
# content [4acb8d435fbb807a4eaab133f99c94acd9e1b3d8]
#
# add_file "packages/alsa/alsa-state/om-gta02/gsmhandset.state"
# content [3db54371d119d26931ec5dc3eacd2f5658fb0982]
#
# add_file "packages/alsa/alsa-state/om-gta02/stereoout.state"
# content [4acb8d435fbb807a4eaab133f99c94acd9e1b3d8]
#
# add_file "packages/base-files/base-files/om-gta01/fstab"
# content [2fcbd6c217ae7674edb29400178b9a37722b27c5]
#
# add_file "packages/base-files/base-files/om-gta02/fstab"
# content [2fcbd6c217ae7674edb29400178b9a37722b27c5]
#
# add_file "packages/binutils/binutils-2.16.1/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch"
# content [50130f1fdf5d978a3bee936e70c39ddb0851b87b]
#
# add_file "packages/binutils/binutils-cross_2.16.1.bb"
# content [0b3c910b27afd69a5dfc2e1f76115ac7aca711cf]
#
# add_file "packages/binutils/binutils_2.16.1.bb"
# content [1c9dfbf91c25005a841b0536de33d9458e9d2f08]
#
# add_file "packages/busybox/files/50telnet"
# content [1da1219aa725bae7dfd982000c97e159804237f9]
#
# add_file "packages/busybox/files/login.failsafe"
# content [d3eaa22066e6d13ead9d5ee78fd47ad0d251a261]
#
# add_file "packages/db/db4-native.inc"
# content [d9b9ccd6925ca57231ad3f1e281972378ca83be6]
#
# add_file "packages/db/db4.inc"
# content [e7bdabc82bbe6d1c172d1ee155e0024792de676a]
#
# add_file "packages/device-mapper/device-mapper-1.01.05/remove_insanity.patch"
# content [2434ff0194208989e31e1f5cb95c4330d39e1e46]
#
# add_file "packages/elfutils/elfutils-0.131/warnings.patch"
# content [0df815bcb9a51727fb54d82fcd60f491379edbe7]
#
# add_file "packages/elfutils/elfutils_0.131.bb"
# content [cbc6b18220765c3f4c2f0a62b691c3b2e5b05a2d]
#
# add_file "packages/fbset/fbset-modes/om-gta01/fb.modes"
# content [69c95216456c7e600b70f0abf276b88b6dabc0fc]
#
# add_file "packages/gcc/gcc-3.4.4/jarfix.patch"
# content [b7ebfebc20d5a343ab160db19578d8e002f38ad7]
#
# add_file "packages/gcc/gcc-4.2.1/gcc-pr32889.patch"
# content [eb45ab7284e91a16c80214a334307325bfd20674]
#
# add_file "packages/gcc/gcc-cross-initial_csl-arm-2006q1.bb"
# content [bf4fabeda212671f6efb4fa43a655e9ac822378d]
#
# add_file "packages/gcc/gcc-cross_csl-arm-2006q1.bb"
# content [ee7c52b0cf89ee33823a9c1bede659a5c815b8ac]
#
# add_file "packages/gcc/gcc-csl-arm/gcc-new-makeinfo.patch"
# content [14f96b518e48a570c9d789d0dabf2875a7c1af86]
#
# add_file "packages/gcc/gcc-csl-arm-2006q1.inc"
# content [293d716da05675420a09c56e4916ba32ab875f4a]
#
# add_file "packages/gcc/gcc_csl-arm-2006q1.bb"
# content [55df580a34f1d73c5eba25daf9c87e87a6b20344]
#
# add_file "packages/glibc/glibc-2.3.6/glibc-2.3.6-allow-gcc-4.1-powerpc32-initfini.s.patch"
# content [b679752efb74a868a4c844e90c996c3a825e6e2c]
#
# add_file "packages/glibc/glibc-2.3.6/glibc-2.3.6-bind-already-defined-on-powerpc.patch"
# content [8417c8508a63dc7f723b6a5428fefe0c8654be91]
#
# add_file "packages/glibc/glibc-2.3.6/glibc-2.3.6-linuxthreads-allow-gcc-4.1-powerpc32-initfini.s.patch"
# content [fd5afa3eb39bb90dbf6476da0722f53ecb1f576c]
#
# add_file "packages/glibc/glibc-2.3.6/late-install-loop-break.patch"
# content [64dec2b12719edc4cc40e25f01f97b059508b2f0]
#
# add_file "packages/glibc/glibc-initial_2.3.6.bb"
# content [ca2be8d4be097f344adaa820ba2ceed272ec1171]
#
# add_file "packages/glibc/glibc-intermediate_2.3.6.bb"
# content [face2eec3f85b30a268476cd29a8dde1f6472a6c]
#
# add_file "packages/glibc/glibc_2.3.6.bb"
# content [3826e28e6ca2febf5082e9e7b8b5a369ff9d48f9]
#
# add_file "packages/gpephone/gpe-applauncher/om-gta01/hotkeys.conf"
# content [217d1f1642f1bf620c6743ba01c1a6505d7d1d54]
#
# add_file "packages/gpephone/gpe-applauncher/om-gta01/softkeys.conf"
# content [84522e43d3872a2bd2d6f0e6ab13692ac3dc5683]
#
# add_file "packages/gpsd/files/om-gta01/gps-hardware"
# content [34ec43f27b84b7fd298431b678952fe476a19a9f]
#
# add_file "packages/gpsd/files/om-gta01/gpsd-default"
# content [c45e36caad5bdf37b7d5defe8f18d431e25f9bd4]
#
# add_file "packages/gpsd/files/om-gta01/restart_gllin.sh"
# content [1dd563bb0bc587c3b75094aef643c8ddc47c7942]
#
# add_file "packages/gtkhtml/gtkhtml-3.8/60_glib-2.15-g-gnuc-function.patch"
# content [b1b1fae7207eeac786b8ee9ea7f0b098b2de0009]
#
# add_file "packages/gtkhtml/gtkhtml-3.8_3.12.3.bb"
# content [8472e2a38e79fa83c7aac126c8fbd65d7797528e]
#
# add_file "packages/gtkhtml/gtkhtml-3.8_3.18.0.bb"
# content [4dc7653498a87712e21f440aa02e1dba7c89b6c3]
#
# add_file "packages/initscripts/initscripts-1.0/om-gta01/inittab"
# content [5e7dbcf2eab7f08defd62b30f6b48930515c5234]
#
# add_file "packages/lvm2/lvm2-2.01.15/crosscompile_fix.patch"
# content [23f734c4efbd74ef53a60de71ef7668ef61d569c]
#
# add_file "packages/netbase/netbase/om-gta01/interfaces"
# content [994ab7e5993a6cceab226b5b58a95031d6466741]
#
# add_file "packages/netbase/netbase/om-gta02/interfaces"
# content [994ab7e5993a6cceab226b5b58a95031d6466741]
#
# add_file "packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch"
# content [43b8c9925bee93d59e2aefd4c7eec71d0b796197]
#
# add_file "packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch"
# content [d1c708f7f915fa250e20a84fa9d4512440442a4f]
#
# add_file "packages/opkg/files/fix_endianness.patch"
# content [23247e2463410079a8e2917268896a027ddff8eb]
#
# add_file "packages/pointercal/files/om-gta01/pointercal"
# content [2e0722a1502bba9d6d25f2ac8e16d60e78136baf]
#
# add_file "packages/pointercal/files/om-gta02/pointercal"
# content [da8aab46ca3bee6dd9b77cba52a3066af3c91892]
#
# add_file "packages/popt/popt-1.13/iconv.patch"
# content [68bb8ae7d824d2897fe22763573e2f97640acdd2]
#
# add_file "packages/pump/pump/debian.patch"
# content [5f47af7fcb237434999c511b0f67cb447d3e3e35]
#
# add_file "packages/pump/pump_0.8.24.bb"
# content [76310d9adf3f023a398af7389071075d4b3eb5ed]
#
# add_file "packages/scummvm/files/om-gta01/openmoko-scummvm"
# content [2151aa3ba2826c460d0618140846150531a098bd]
#
# add_file "packages/squid/squid/fix_epoll_check.patch"
# content [3cc93eef4aafb715194029ed206e7ac60e3299b8]
#
# add_file "packages/squid/squid/squid.init"
# content [c3043ecd853b4b2c40799435e02d149efe88f6b3]
#
# add_file "packages/squidview/squidview_0.72.bb"
# content [dabe2197301460992f125b253cb9ba190b7e5cbd]
#
# add_file "packages/strace/strace-4.5.14/strace-4.5.14-avr32-add-syscalls-up-to-sysvipc.patch"
# content [e176c7290e89c10aa87418cd4867946d8929837e]
#
# add_file "packages/tslib/tslib/om-gta01/ts.conf"
# content [7123e2647340fe6a95f41cd9f53f3307c08cd223]
#
# add_file "packages/u-boot/u-boot-1.2.0/om-gta01/fw_env.config"
# content [43d22d3cac7c0fc5e16f0cf64bf5faaf64bb3299]
#
# add_file "packages/uclibc/uclibc-0.9.29/om-gta01/uClibc.machine"
# content [4bb493d88e9e62926dd36a721907fb0f7485bb50]
#
# patch "MAINTAINERS"
# from [c32136e1e82e1d64bf728f17c755ecc0abf13eb2]
# to [68b5a6f70f2d35b99a9cee6ed959cf40be50ddeb]
#
# patch "classes/e.bbclass"
# from [312ae44c83581d25ea920d0970eb19ad5677206f]
# to [2c087f480efe7a90c7cc009a93e634e6e25f16ca]
#
# patch "classes/rootfs_ipk.bbclass"
# from [c319cef6215ceb9e757092d0eb6ea8303cbaacad]
# to [fec211c8f0426463d8bddc084d993099b5bbb2ab]
#
# patch "conf/distro/include/angstrom-2007-for-openmoko-versions.inc"
# from [1b6f78d896a2edd5402766d2468d39523dfa9732]
# to [886d3e94bcbd92f2738cd2c11ac93b4e43245191]
#
# patch "conf/distro/include/angstrom.inc"
# from [915080f9ddb0bc308260b139e457c363cbd504b2]
# to [89f41f937d24a4a443d6346369202ff2554cb48a]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [20d693a8ea203b3e5f9a1fe533b82f6d8c711e9b]
# to [b0636a1ae7c238936e7e569537a5642c5d3273b8]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [0269a178e7edbe8ac9c17cef3cc5878aa563ee30]
# to [7c0571509d2e4291ba93550d02deaa90af58a9be]
#
# patch "conf/distro/openmoko.conf"
# from [7b931a240a27b8440a071d8b6cd0b456a9005005]
# to [962733e5bfbba7f%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rd1dfc5df9769c50ec5328454ab737f091f6c573f -ra5ceef80167451640ed57234e28008169c49ef38
#
#
#
# patch "conf/distro/mamona.conf"
# from [9cbafb2b9adc44908a472e8fbc349a0b5c6177de]
# to [fd683d8ddd62359322234b247211b416f546a004]
#
============================================================
--- conf/distro/mamona.conf 9cbafb2b9adc44908a472e8fbc349a0b5c6177de
+++ conf/distro/mamona.conf fd683d8ddd62359322234b247211b416f546a004
@@ -21,7 +21,7 @@ CXXFLAGS += "-fvisibility-inlines-hidden
# Kernel
# ======
-#
+
KERNEL = "kernel26"
MACHINE_KERNEL_VERSION = "2.6"
PREFERRED_VERSION_linux-omap1 ?= "2.6.22-omap1"
@@ -31,15 +31,12 @@ PREFERRED_VERSION_linux-libc-headers_nok
# Toolchain
# =========
-#
+
# gcc
-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_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_PROVIDER_virtual/i586-mamona-linux-libc-for-gcc = "glibc-intermediate"
-
-# gcc
PREFERRED_VERSION_gcc ?= "4.1.2"
PREFERRED_VERSION_gcc-cross ?= "4.1.2"
PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2"
@@ -51,40 +48,28 @@ PREFERRED_VERSION_binutils-cross-sdk ?=
PREFERRED_VERSION_binutils-cross-sdk ?= "2.18"
# *libc
-# M_* set in conf/local.conf
TARGET_OS = "linux-gnueabi"
PREFERRED_PROVIDER_virtual/libiconv = "glibc"
PREFERRED_PROVIDER_virtual/libintl = "glibc"
PREFERRED_PROVIDER_virtual/libc = "glibc"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial"
-#FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
-#BUILD_OPTIMIZATION = "-Os"
+PREFERRED_VERSION_glibc ?= "2.5"
+PREFERRED_VERSION_glibc-intermediate_i686 ?= "2.4"
+PREFERRED_VERSION_glibc-intermediate ?= "2.5"
+PREFERRED_VERSION_glibc-initial ?= "2.5"
+PREFERRED_VERSION_uclibc ?= "0.9.29"
# NPTL stuff
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
PREFERRED_PROVIDER_virtual/arm-mamona-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
-
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc-intermediate"
-
-PREFERRED_PROVIDER_virtual/arm-mamona-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
PREFERRED_PROVIDER_virtual/armeb-mamona-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
PREFERRED_PROVIDER_virtual/arm-mamona-linux-libc-for-gcc = "glibc-intermediate"
-# /NPTL
+PREFERRED_PROVIDER_virtual/i586-mamona-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_VERSION_glibc ?= "2.5"
-PREFERRED_VERSION_glibc-intermediate_i686 ?= "2.4"
-PREFERRED_VERSION_glibc-intermediate ?= "2.5"
-PREFERRED_VERSION_glibc-initial ?= "2.5"
-PREFERRED_VERSION_uclibc ?= "0.9.29"
-
# Other Packages
# ==============
-#
+
PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "update-alternatives-dpkg-native"
PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-dpkg"
PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11"
@@ -94,6 +79,7 @@ PREFERRED_PROVIDER_gconf = "gconf-dbus"
PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
PREFERRED_PROVIDER_avahi = "avahi"
PREFERRED_PROVIDER_gconf = "gconf-dbus"
-PREFERRED_VERSION_hal_nokia770 = "0.5.7"
+PREFERRED_VERSION_apt = "0.7.6"
PREFERRED_VERSION_gpsd ?= "2.33"
+PREFERRED_VERSION_hal_nokia770 = "0.5.7"
More information about the Openembedded-commits
mailing list