[oe-commits] org.oe.dev merge of '964b970138436b573add519a1eae7ca7aec32517'

hrw commit openembedded-commits at lists.openembedded.org
Thu Jan 17 21:05:31 UTC 2008 

merge of '964b970138436b573add519a1eae7ca7aec32517'
     and 'b8eab3d0461de7af79a745d6b20c8e008acb7af4'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 396c39b9ce5e76666714c3b494fef67d986ea8d6
ViewMTN: http://monotone.openembedded.org/revision/info/396c39b9ce5e76666714c3b494fef67d986ea8d6
Files:
1
conf/machine/include/collie-2.6.inc
conf/machine/include/poodle-2.6.inc
delete.txt
packages/asterisk-core-sounds-en-alaw
packages/asterisk-core-sounds-en-g729
packages/asterisk-core-sounds-en-gsm
packages/asterisk-core-sounds-en-ulaw
packages/asterisk-extra-sounds-en-alaw
packages/asterisk-extra-sounds-en-g729
packages/asterisk-extra-sounds-en-gsm
packages/asterisk-extra-sounds-en-ulaw
packages/asterisk-moh-freeplay-alaw
packages/asterisk-moh-freeplay-g729
packages/asterisk-moh-freeplay-gsm
packages/asterisk-moh-freeplay-ulaw
packages/ecj/ecj-native_3.2.2.bb
packages/ecj/ecj-native_3.3.bb
packages/ecj/files/ecj.sh
packages/jamvm/jamvm
packages/jamvm/jamvm/sh3sh4-support.patch
packages/ppp-dsl/ppp-dsl_0.1-monolithic.bb
packages/quilt/quilt_0.45.inc
packages/asterisk-core-sounds-en-alaw/asterisk-core-sounds-en-alaw_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-alaw_1.4.7.bb
packages/asterisk-core-sounds-en-g729/asterisk-core-sounds-en-g729_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-g729_1.4.7.bb
packages/asterisk-core-sounds-en-gsm/asterisk-core-sounds-en-gsm_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-gsm_1.4.7.bb
packages/asterisk-core-sounds-en-ulaw/asterisk-core-sounds-en-ulaw_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.7.bb
packages/asterisk-extra-sounds-en-alaw/asterisk-extra-sounds-en-alaw_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.6.bb
packages/asterisk-extra-sounds-en-g729/asterisk-extra-sounds-en-g729_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-g729_1.4.6.bb
packages/asterisk-extra-sounds-en-gsm/asterisk-extra-sounds-en-gsm_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.6.bb
packages/asterisk-extra-sounds-en-ulaw/asterisk-extra-sounds-en-ulaw_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.6.bb
packages/asterisk-moh-freeplay-alaw/asterisk-moh-freeplay-alaw_0.0.0.bb
packages/asterisk/asterisk-moh-freeplay-alaw_0.0.0.bb
packages/asterisk-moh-freeplay-g729/asterisk-moh-freeplay-g729_0.0.0.bb
packages/asterisk/asterisk-moh-freeplay-g729_0.0.0.bb
packages/asterisk-moh-freeplay-gsm/asterisk-moh-freeplay-gsm_0.0.0.bb
packages/asterisk/asterisk-moh-freeplay-gsm_0.0.0.bb
packages/asterisk-moh-freeplay-ulaw/asterisk-moh-freeplay-ulaw_0.0.0.bb
packages/asterisk/asterisk-moh-freeplay-ulaw_0.0.0.bb
packages/classpath/classpath-gtk_0.93.bb
packages/obsolete/classpath/classpath-gtk_0.93.bb
packages/classpath/classpath-gtk_cvs.bb
packages/obsolete/classpath/classpath-gtk_cvs.bb
packages/classpath/classpath-minimal-native_0.93.bb
packages/obsolete/classpath/classpath-minimal-native_0.93.bb
packages/classpath/classpath-minimal-native_0.95.bb
packages/obsolete/classpath/classpath-minimal-native_0.95.bb
packages/classpath/classpath-minimal_0.90.bb
packages/obsolete/classpath/classpath-minimal_0.90.bb
packages/classpath/classpath-minimal_0.95.bb
packages/obsolete/classpath/classpath-minimal_0.95.bb
packages/classpath/classpath.inc
packages/obsolete/classpath/classpath.inc
packages/classpath/classpath_0.14.bb
packages/obsolete/classpath/classpath_0.14.bb
packages/classpath/classpath_0.15.bb
packages/obsolete/classpath/classpath_0.15.bb
packages/classpath/classpath_0.17.bb
packages/obsolete/classpath/classpath_0.17.bb
packages/classpath/classpath_0.18.bb
packages/obsolete/classpath/classpath_0.18.bb
packages/classpath/classpath_0.19.bb
packages/obsolete/classpath/classpath_0.19.bb
packages/classpath/classpath_0.20.bb
packages/obsolete/classpath/classpath_0.20.bb
packages/classpath/classpath_cvs.bb
packages/obsolete/classpath/classpath_cvs.bb
packages/classpath/files/disable-automake-checks-v2.patch
packages/obsolete/classpath/files/disable-automake-checks-v2.patch
packages/classpath/files/disable-automake-checks.patch
packages/obsolete/classpath/files/disable-automake-checks.patch
packages/classpath/files/fix-endian-arm-floats.patch
packages/obsolete/classpath/files/fix-endian-arm-floats.patch
packages/classpath/files/gconf_version.patch
packages/obsolete/classpath/files/gconf_version.patch
packages/e17/enna_svn.bb
packages/e17/enna_cvs.bb
packages/jamvm/jamvm/jamvm-1.3.1-size-defaults.patch
packages/jamvm/files/jamvm-1.3.1-size-defaults.patch
packages/jamvm/jamvm-1.3.0
packages/obsolete/jamvm/jamvm-1.3.0
packages/jamvm/jamvm_1.3.0.bb
packages/obsolete/jamvm/jamvm_1.3.0.bb
packages/jamvm/jamvm_1.3.1.bb
packages/obsolete/jamvm/jamvm_1.3.1.bb
packages/jamvm/jamvm_1.3.2.bb
packages/obsolete/jamvm/jamvm_1.3.2.bb
packages/jamvm/jamvm_1.4.1.bb
packages/obsolete/jamvm/jamvm_1.4.1.bb
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/ppp-dsl/dsl-provider
packages/ppp-dsl/files/dsl-provider
packages/ppp-dsl/ppp_on_boot.dsl
packages/ppp-dsl/files/ppp_on_boot.dsl
packages/quilt/files/install.patch
packages/quilt/quilt-0.45/install.patch
packages/quilt/quilt-0.39
packages/obsolete/quilt/quilt-0.39
packages/quilt/quilt-0.45/non-gnu.patch
packages/quilt/files/non-gnu.patch
packages/quilt/quilt-native_0.39.bb
packages/obsolete/quilt/quilt-native_0.39.bb
packages/quilt/quilt_0.39.bb
packages/obsolete/quilt/quilt_0.39.bb
packages/quilt/quilt_0.39.inc
packages/obsolete/quilt/quilt_0.39.inc
packages/tasks/task-toolchain-openmoko-sdk.bb
packages/tasks/task-openmoko-toolchain-target.bb
packages/base-files/base-files/openprotium
packages/freesmartphone
packages/gpephone/libiac2
packages/gpephone/libim2
packages/gpsdrive/gpsdrive-pda
packages/linux/chumby-kernel
packages/monit
packages/monit/files
packages/monit/monit-4.10.1
packages/obsolete/classpath
packages/obsolete/classpath/files
packages/obsolete/jamvm
packages/obsolete/jamvm/files
packages/obsolete/quilt
packages/pngcrush
packages/ppp/ppp-gprs
packages/ppp/ppp-gprs/chats
packages/ppp/ppp-gprs/peers
packages/ppp-dsl/files
packages/pwsafe
packages/quilt/quilt-0.46
packages/uicmoc/files
packages/vsftpd/vsftpd-charconv-2.0.5
classes/cmake.bbclass
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/cacao/cacao-cldc.inc
packages/cacao/cacao_0.98+hg20071001.bb
packages/cacao/cacaoh-native.inc
packages/cacao/cacaoh-native_0.98+hg20071001.bb
packages/cacao/files/cacao-0.98+hg-arm-cacheflush-workaround.patch
packages/cacao/files/cacao-0.98+hg-attachthread.patch
packages/cacao/files/cacao-0.98+svn-classpath_var.patch
packages/cacao/files/cacao-0.98+svn-libdir.diff
packages/classpath/classpath-minimal_0.96.1.bb
packages/classpath/classpath_0.95.bb
packages/classpath/classpath_0.96.1.bb
packages/freesmartphone/gsm0710muxd_svn.bb
packages/gcc/gcc-4.2.2/fortran-cross-compile-hack.patch
packages/gcc/gcc-4.2.2/fortran-static-linking.patch
packages/gcc/gcc-4.2.2/gcc-4.0.2-e300c2c3.patch
packages/gpephone/almmgrd_svn.bb
packages/gpephone/calendar2_svn.bb
packages/gpephone/dialer_svn.bb
packages/gpephone/libalmmgr_svn.bb
packages/gpephone/libgemwidget_svn.bb
packages/gpephone/libiac2/disable-tests.patch
packages/gpephone/libiac2_svn.bb
packages/gpephone/libiac_svn.bb
packages/gpephone/libim2/disable-tests.patch
packages/gpephone/libim2_svn.bb
packages/gpephone/liblipsevent2_svn.bb
packages/gpephone/libmsgenabler2_svn.bb
packages/gpephone/libmsgenabler_svn.bb
packages/gpsdrive/gpsdrive-pda/makefile.patch
packages/gpsdrive/gpsdrive-pda_2.10pre2.bb
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/jamvm/jamvm.inc
packages/jamvm/jamvm_1.5.0.bb
packages/linux/chumby-kernel/defconfig
packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb
packages/linux/linux-2.6.23/kallsyms-missing-include.patch
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.23.14
packages/linux/linux-openmoko-devel_2.6.23+2.6.24-rc7.bb
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/musicbrainz/libmusicbrainz_2.1.5.bb
packages/obsolete/jamvm/files/jamvm-1.3.1-size-defaults.patch
packages/openmoko2/settingsgui_0.7+0.8-beta.bb
packages/openprotium-init/files/initscripts/zleds
packages/orinoco/orinoco-modules.inc
packages/pngcrush/pngcrush-native_1.6.4.bb
packages/pngcrush/pngcrush_1.6.4.bb
packages/ppp/ppp-gprs/chats/chat-gprs
packages/ppp/ppp-gprs/peers/_gprs
packages/ppp/ppp-gprs/peers/_gprs-ap-internet
packages/ppp/ppp-gprs_1.0.bb
packages/pwsafe/pwsafe_0.2.0.bb
packages/quilt/quilt-0.46/aclocal.patch
packages/quilt/quilt-0.46/install.patch
packages/quilt/quilt-native_0.46.bb
packages/quilt/quilt_0.46.bb
packages/rp-pppoe/rp-pppoe-3.8/dont-swallow-errors.patch
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/tasks/task-openmoko-toolchain-host.bb
packages/tasks/task-openprotium.bb
packages/uicmoc/files/configure-fix.patch
packages/vsftpd/vsftpd-charconv-2.0.5/vsftpd-charconv.patch
packages/vsftpd/vsftpd-charconv_2.0.5.bb
MAINTAINERS
classes/module-base.bbclass
classes/module.bbclass
conf/distro/angstrom-2008.1.conf
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/openmoko.conf
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-cldc_0.98.bb
packages/cacao/cacao.inc
packages/cacao/cacaoh-cldc-native_0.98.bb
packages/dtnrg/dtn_2.5.0.bb
packages/efl1/epdf_cvs.bb
packages/gcc/gcc-cross-sdk_4.2.2.bb
packages/gcc/gcc-cross_4.2.2.bb
packages/gcc/gcc_4.2.2.bb
packages/gpephone/addressbook_svn.bb
packages/gpephone/contact_svn.bb
packages/gpephone/firewall_svn.bb
packages/gpephone/gpe-applauncher_svn.bb
packages/gpephone/libabenabler2_svn.bb
packages/gpephone/libabenabler_svn.bb
packages/gpephone/libcalenabler2_svn.bb
packages/gpephone/libmsgenabler_1.0.bb
packages/gpephone/librecord2_svn.bb
packages/gpephone/libsettings_svn.bb
packages/gpephone/machined_svn.bb
packages/gpephone/ptim-engine_svn.bb
packages/gpephone/ptim-headers_svn.bb
packages/gpephone/ptim-helper_svn.bb
packages/gpephone/ptim-manager_svn.bb
packages/gpephone/quickdial_svn.bb
packages/gpephone/useen_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/jamvm/jamvm_1.4.5.bb
packages/kaffe/kaffe.inc
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/midpath/midpath-cldc-native_0.1.bb
packages/midpath/midpath-cldc-x11_0.1.bb
packages/midpath/midpath-cldc_0.1.bb
packages/midpath/midpath.inc
packages/musicbrainz/libmusicbrainz_3.0.1.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/orinoco/orinoco-modules_0.13e.bb
packages/orinoco/orinoco-modules_0.15rc1.bb
packages/orinoco/orinoco-modules_0.15rc2.bb
packages/orinoco/orinoco-modules_cvs.bb
packages/ppp-dialin/ppp-dialin_0.1.bb
packages/ppp-dsl/ppp-dsl_0.1.bb
packages/quilt/quilt-native.inc
packages/quilt/quilt-native_0.45.bb
packages/quilt/quilt-package.inc
packages/quilt/quilt.inc
packages/quilt/quilt_0.45.bb
packages/rp-pppoe/rp-pppoe_3.8.bb
packages/sablevm/sablevm-classpath_1.1.9.bb
packages/sablevm/sablevm-classpath_1.11.3.bb
packages/sablevm/sablevm-classpath_1.12.bb
packages/sccd/files/scc.h
packages/sccd/sccd_1.0.bb
packages/supertux/files/supertux.desktop
packages/tasks/task-openmoko-debug.bb
packages/tasks/task-openmoko-feed.bb
packages/uicmoc/uicmoc4-native.inc
site/arm-linux
mtn:execute
true
mtn:manual_merge
packages/wifistix/wifistix-modules/sk_buff.patch
Diffs:

#
# mt diff -r964b970138436b573add519a1eae7ca7aec32517 -r396c39b9ce5e76666714c3b494fef67d986ea8d6
#
# 
# 
# delete "conf/machine/include/collie-2.6.inc"
# 
# delete "conf/machine/include/poodle-2.6.inc"
# 
# delete "delete.txt"
# 
# delete "packages/asterisk-core-sounds-en-alaw"
# 
# delete "packages/asterisk-core-sounds-en-g729"
# 
# delete "packages/asterisk-core-sounds-en-gsm"
# 
# delete "packages/asterisk-core-sounds-en-ulaw"
# 
# delete "packages/asterisk-extra-sounds-en-alaw"
# 
# delete "packages/asterisk-extra-sounds-en-g729"
# 
# delete "packages/asterisk-extra-sounds-en-gsm"
# 
# delete "packages/asterisk-extra-sounds-en-ulaw"
# 
# delete "packages/asterisk-moh-freeplay-alaw"
# 
# delete "packages/asterisk-moh-freeplay-g729"
# 
# delete "packages/asterisk-moh-freeplay-gsm"
# 
# delete "packages/asterisk-moh-freeplay-ulaw"
# 
# delete "packages/ecj/ecj-native_3.2.2.bb"
# 
# delete "packages/ecj/ecj-native_3.3.bb"
# 
# delete "packages/ecj/files/ecj.sh"
# 
# delete "packages/jamvm/jamvm"
# 
# delete "packages/jamvm/jamvm/sh3sh4-support.patch"
# 
# delete "packages/ppp-dsl/ppp-dsl_0.1-monolithic.bb"
# 
# delete "packages/quilt/quilt_0.45.inc"
# 
# rename "packages/asterisk-core-sounds-en-alaw/asterisk-core-sounds-en-alaw_1.4.7.bb"
#     to "packages/asterisk/asterisk-core-sounds-en-alaw_1.4.7.bb"
# 
# rename "packages/asterisk-core-sounds-en-g729/asterisk-core-sounds-en-g729_1.4.7.bb"
#     to "packages/asterisk/asterisk-core-sounds-en-g729_1.4.7.bb"
# 
# rename "packages/asterisk-core-sounds-en-gsm/asterisk-core-sounds-en-gsm_1.4.7.bb"
#     to "packages/asterisk/asterisk-core-sounds-en-gsm_1.4.7.bb"
# 
# rename "packages/asterisk-core-sounds-en-ulaw/asterisk-core-sounds-en-ulaw_1.4.7.bb"
#     to "packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.7.bb"
# 
# rename "packages/asterisk-extra-sounds-en-alaw/asterisk-extra-sounds-en-alaw_1.4.6.bb"
#     to "packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.6.bb"
# 
# rename "packages/asterisk-extra-sounds-en-g729/asterisk-extra-sounds-en-g729_1.4.6.bb"
#     to "packages/asterisk/asterisk-extra-sounds-en-g729_1.4.6.bb"
# 
# rename "packages/asterisk-extra-sounds-en-gsm/asterisk-extra-sounds-en-gsm_1.4.6.bb"
#     to "packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.6.bb"
# 
# rename "packages/asterisk-extra-sounds-en-ulaw/asterisk-extra-sounds-en-ulaw_1.4.6.bb"
#     to "packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.6.bb"
# 
# rename "packages/asterisk-moh-freeplay-alaw/asterisk-moh-freeplay-alaw_0.0.0.bb"
#     to "packages/asterisk/asterisk-moh-freeplay-alaw_0.0.0.bb"
# 
# rename "packages/asterisk-moh-freeplay-g729/asterisk-moh-freeplay-g729_0.0.0.bb"
#     to "packages/asterisk/asterisk-moh-freeplay-g729_0.0.0.bb"
# 
# rename "packages/asterisk-moh-freeplay-gsm/asterisk-moh-freeplay-gsm_0.0.0.bb"
#     to "packages/asterisk/asterisk-moh-freeplay-gsm_0.0.0.bb"
# 
# rename "packages/asterisk-moh-freeplay-ulaw/asterisk-moh-freeplay-ulaw_0.0.0.bb"
#     to "packages/asterisk/asterisk-moh-freeplay-ulaw_0.0.0.bb"
# 
# rename "packages/classpath/classpath-gtk_0.93.bb"
#     to "packages/obsolete/classpath/classpath-gtk_0.93.bb"
# 
# rename "packages/classpath/classpath-gtk_cvs.bb"
#     to "packages/obsolete/classpath/classpath-gtk_cvs.bb"
# 
# rename "packages/classpath/classpath-minimal-native_0.93.bb"
#     to "packages/obsolete/classpath/classpath-minimal-native_0.93.bb"
# 
# rename "packages/classpath/classpath-minimal-native_0.95.bb"
#     to "packages/obsolete/classpath/classpath-minimal-native_0.95.bb"
# 
# rename "packages/classpath/classpath-minimal_0.90.bb"
#     to "packages/obsolete/classpath/classpath-minimal_0.90.bb"
# 
# rename "packages/classpath/classpath-minimal_0.95.bb"
#     to "packages/obsolete/classpath/classpath-minimal_0.95.bb"
# 
# rename "packages/classpath/classpath.inc"
#     to "packages/obsolete/classpath/classpath.inc"
# 
# rename "packages/classpath/classpath_0.14.bb"
#     to "packages/obsolete/classpath/classpath_0.14.bb"
# 
# rename "packages/classpath/classpath_0.15.bb"
#     to "packages/obsolete/classpath/classpath_0.15.bb"
# 
# rename "packages/classpath/classpath_0.17.bb"
#     to "packages/obsolete/classpath/classpath_0.17.bb"
# 
# rename "packages/classpath/classpath_0.18.bb"
#     to "packages/obsolete/classpath/classpath_0.18.bb"
# 
# rename "packages/classpath/classpath_0.19.bb"
#     to "packages/obsolete/classpath/classpath_0.19.bb"
# 
# rename "packages/classpath/classpath_0.20.bb"
#     to "packages/obsolete/classpath/classpath_0.20.bb"
# 
# rename "packages/classpath/classpath_cvs.bb"
#     to "packages/obsolete/classpath/classpath_cvs.bb"
# 
# rename "packages/classpath/files/disable-automake-checks-v2.patch"
#     to "packages/obsolete/classpath/files/disable-automake-checks-v2.patch"
# 
# rename "packages/classpath/files/disable-automake-checks.patch"
#     to "packages/obsolete/classpath/files/disable-automake-checks.patch"
# 
# rename "packages/classpath/files/fix-endian-arm-floats.patch"
#     to "packages/obsolete/classpath/files/fix-endian-arm-floats.patch"
# 
# rename "packages/classpath/files/gconf_version.patch"
#     to "packages/obsolete/classpath/files/gconf_version.patch"
# 
# rename "packages/e17/enna_svn.bb"
#     to "packages/e17/enna_cvs.bb"
# 
# rename "packages/jamvm/jamvm/jamvm-1.3.1-size-defaults.patch"
#     to "packages/jamvm/files/jamvm-1.3.1-size-defaults.patch"
# 
# rename "packages/jamvm/jamvm-1.3.0"
#     to "packages/obsolete/jamvm/jamvm-1.3.0"
# 
# rename "packages/jamvm/jamvm_1.3.0.bb"
#     to "packages/obsolete/jamvm/jamvm_1.3.0.bb"
# 
# rename "packages/jamvm/jamvm_1.3.1.bb"
#     to "packages/obsolete/jamvm/jamvm_1.3.1.bb"
# 
# rename "packages/jamvm/jamvm_1.3.2.bb"
#     to "packages/obsolete/jamvm/jamvm_1.3.2.bb"
# 
# rename "packages/jamvm/jamvm_1.4.1.bb"
#     to "packages/obsolete/jamvm/jamvm_1.4.1.bb"
# 
# 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/ppp-dsl/dsl-provider"
#     to "packages/ppp-dsl/files/dsl-provider"
# 
# rename "packages/ppp-dsl/ppp_on_boot.dsl"
#     to "packages/ppp-dsl/files/ppp_on_boot.dsl"
# 
# rename "packages/quilt/files/install.patch"
#     to "packages/quilt/quilt-0.45/install.patch"
# 
# rename "packages/quilt/quilt-0.39"
#     to "packages/obsolete/quilt/quilt-0.39"
# 
# rename "packages/quilt/quilt-0.45/non-gnu.patch"
#     to "packages/quilt/files/non-gnu.patch"
# 
# rename "packages/quilt/quilt-native_0.39.bb"
#     to "packages/obsolete/quilt/quilt-native_0.39.bb"
# 
# rename "packages/quilt/quilt_0.39.bb"
#     to "packages/obsolete/quilt/quilt_0.39.bb"
# 
# rename "packages/quilt/quilt_0.39.inc"
#     to "packages/obsolete/quilt/quilt_0.39.inc"
# 
# 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/gpephone/libiac2"
# 
# add_dir "packages/gpephone/libim2"
# 
# add_dir "packages/gpsdrive/gpsdrive-pda"
# 
# 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/obsolete/classpath"
# 
# add_dir "packages/obsolete/classpath/files"
# 
# add_dir "packages/obsolete/jamvm"
# 
# add_dir "packages/obsolete/jamvm/files"
# 
# add_dir "packages/obsolete/quilt"
# 
# add_dir "packages/pngcrush"
# 
# add_dir "packages/ppp/ppp-gprs"
# 
# add_dir "packages/ppp/ppp-gprs/chats"
# 
# add_dir "packages/ppp/ppp-gprs/peers"
# 
# add_dir "packages/ppp-dsl/files"
# 
# add_dir "packages/pwsafe"
# 
# add_dir "packages/quilt/quilt-0.46"
# 
# add_dir "packages/uicmoc/files"
# 
# add_dir "packages/vsftpd/vsftpd-charconv-2.0.5"
# 
# add_file "classes/cmake.bbclass"
#  content [02512e3f040f3401c03f13f92d01da77069ce59e]
# 
# 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/cacao/cacao-cldc.inc"
#  content [d3ea647ce467d4d617b4ce6b05fb6270e58fda61]
# 
# add_file "packages/cacao/cacao_0.98+hg20071001.bb"
#  content [ab5bff912c3f54f9c37573994562c9a793c71e6f]
# 
# add_file "packages/cacao/cacaoh-native.inc"
#  content [21cb933b74df6d2ac41c9593d5df8f193f74b51a]
# 
# add_file "packages/cacao/cacaoh-native_0.98+hg20071001.bb"
#  content [3e9914f2a492d38de75e478cba4c16addca80a06]
# 
# add_file "packages/cacao/files/cacao-0.98+hg-arm-cacheflush-workaround.patch"
#  content [b4231277ce3d268059eaa141886c615a2dac0fc5]
# 
# add_file "packages/cacao/files/cacao-0.98+hg-attachthread.patch"
#  content [4aaacaa58d869f91cd245871bcad90a6ec0c72c1]
# 
# add_file "packages/cacao/files/cacao-0.98+svn-classpath_var.patch"
#  content [3ba0b66a46c0306ff811d3930f646fe0074b7477]
# 
# add_file "packages/cacao/files/cacao-0.98+svn-libdir.diff"
#  content [b97c32544ee97fef51a7222eb879ce6e68e3d1d4]
# 
# add_file "packages/classpath/classpath-minimal_0.96.1.bb"
#  content [e55ff8e0007e4814498b21013d19e63123d425ee]
# 
# add_file "packages/classpath/classpath.inc"
#  content [f89bbf74a4b188100d82872ac4cea3f094bafca9]
# 
# add_file "packages/classpath/classpath_0.95.bb"
#  content [d2f820a6ce35613717c16b3612ca071f4d918e83]
# 
# add_file "packages/classpath/classpath_0.96.1.bb"
#  content [d2f820a6ce35613717c16b3612ca071f4d918e83]
# 
# add_file "packages/freesmartphone/gsm0710muxd_svn.bb"
#  content [6e5e1fdfb04ba1e035eaf6f8c6f911ce99d8769c]
# 
# add_file "packages/gcc/gcc-4.2.2/fortran-cross-compile-hack.patch"
#  content [544859e05e08d2a0b5639e1182a8a2a4ef114d07]
# 
# add_file "packages/gcc/gcc-4.2.2/fortran-static-linking.patch"
#  content [e51538f27d036e3418faae17b7dcd656ae38313a]
# 
# add_file "packages/gcc/gcc-4.2.2/gcc-4.0.2-e300c2c3.patch"
#  content [84568712feddebdf1d7bf5b760367393b94cf58d]
# 
# add_file "packages/gpephone/almmgrd_svn.bb"
#  content [25c7f68d4e9e07ed59265a1f275da3696532163b]
# 
# add_file "packages/gpephone/calendar2_svn.bb"
#  content [82196f61eca7b47d785a964144a279c6acdfd001]
# 
# add_file "packages/gpephone/dialer_svn.bb"
#  content [98dc9faf7118c94be8d57048d92db391f716a290]
# 
# add_file "packages/gpephone/libalmmgr_svn.bb"
#  content [f89397c2a6549797eec60645fcb0f1f141ce941c]
# 
# add_file "packages/gpephone/libgemwidget_svn.bb"
#  content [3e0c2912b00d90e5873a3782d885e3934046f433]
# 
# add_file "packages/gpephone/libiac2/disable-tests.patch"
#  content [efd8947a1d613f17903217fc9db1d3a5116bce60]
# 
# add_file "packages/gpephone/libiac2_svn.bb"
#  content [f7478f731cfbefa2721b6995c1c57629826efab6]
# 
# add_file "packages/gpephone/libiac_svn.bb"
#  content [7cc7ff46bb9359e3883a4f9c0c15fb232157d69e]
# 
# add_file "packages/gpephone/libim2/disable-tests.patch"
#  content [0df0f232ed225a157ef20cfc949862fe4028f296]
# 
# add_file "packages/gpephone/libim2_svn.bb"
#  content [19f2ddb013683120a735b58a3dd67387d006147f]
# 
# add_file "packages/gpephone/liblipsevent2_svn.bb"
#  content [9168c8ec313ad837ae2d7b4896b4314aa79e3673]
# 
# add_file "packages/gpephone/libmsgenabler2_svn.bb"
#  content [98732dfed57aec57dd1b60c208b0540f3fc15122]
# 
# add_file "packages/gpephone/libmsgenabler_svn.bb"
#  content [c0e9d7dafdbb5d413c2e8addd95c5d0f4a9ed5a9]
# 
# add_file "packages/gpsdrive/gpsdrive-pda/makefile.patch"
#  content [c2473ec4972d5084e6249e8d896b9ecca57cbf54]
# 
# add_file "packages/gpsdrive/gpsdrive-pda_2.10pre2.bb"
#  content [29c061374aefcc591a87829d659fc50cdc3acefa]
# 
# 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/jamvm/jamvm.inc"
#  content [5edcfc7c22cf4daf00c3d364962aa42af749237e]
# 
# add_file "packages/jamvm/jamvm_1.5.0.bb"
#  content [645cab3c8ecedf36901ba0d416cb8956c85f04b1]
# 
# 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-2.6.23/kallsyms-missing-include.patch"
#  content [4e0b600719116634929705c1b57bde66c11c7a2f]
# 
# add_file "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.23.14"
#  content [fedacb0b5361d6ea9af44c234bb391c39aa55eeb]
# 
# add_file "packages/linux/linux-openmoko-devel_2.6.23+2.6.24-rc7.bb"
#  content [9b2a2354c222d9e3a4068950e45a4445d31981c9]
# 
# 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/musicbrainz/libmusicbrainz_2.1.5.bb"
#  content [9c70cdf3ad872cc2b9f5bf67233f035eabbebcd4]
# 
# add_file "packages/obsolete/jamvm/files/jamvm-1.3.1-size-defaults.patch"
#  content [87b384507b8adbd40cca46154ac6911a8a79c4d6]
# 
# add_file "packages/openmoko2/settingsgui_0.7+0.8-beta.bb"
#  content [f6b45b1198a17a3fc45cafda47eb5c17f1299ded]
# 
# add_file "packages/openprotium-init/files/initscripts/zleds"
#  content [3d4888975ea9811709433fbce07f001e26d19d28]
# 
# add_file "packages/orinoco/orinoco-modules.inc"
#  content [a0f71de24feba1b09e5a8e110fed2b234ea823b7]
# 
# add_file "packages/pngcrush/pngcrush-native_1.6.4.bb"
#  content [0c0ea8c7613f6d0177ff82807f6f30883858aebd]
# 
# add_file "packages/pngcrush/pngcrush_1.6.4.bb"
#  content [97eadbe6dc00b130393dc9fa876e44980ee6dad5]
# 
# add_file "packages/ppp/ppp-gprs/chats/chat-gprs"
#  content [3c17c4742880eb980b1f32c5bfb8ec89be225b16]
# 
# add_file "packages/ppp/ppp-gprs/peers/_gprs"
#  content [b8d56b83b8ed0db469e296a2adb24896adf7ebf3]
# 
# add_file "packages/ppp/ppp-gprs/peers/_gprs-ap-internet"
#  content [7ec04eac6aae50cf06036988b2d63e7f754abcd2]
# 
# add_file "packages/ppp/ppp-gprs_1.0.bb"
#  content [698b8ad36ea9b264cbdc9d217158f578b0635aaf]
# 
# add_file "packages/pwsafe/pwsafe_0.2.0.bb"
#  content [74b026623cf0a33873ea495d93977109766da810]
# 
# add_file "packages/quilt/quilt-0.46/aclocal.patch"
#  content [ccc9f868c7adc5563ec7c822d1612d06662d62f0]
# 
# add_file "packages/quilt/quilt-0.46/install.patch"
#  content [b821f6cd66eca792042c080bc1e0e8410ede1e41]
# 
# add_file "packages/quilt/quilt-na%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rb8eab3d0461de7af79a745d6b20c8e008acb7af4 -r396c39b9ce5e76666714c3b494fef67d986ea8d6
#
# 
# 
# add_file "packages/wifistix/wifistix-modules/sk_buff.patch"
#  content [07ad752e578a675b4aaf3843012740c28acd3d2d]
# 
============================================================
--- packages/wifistix/wifistix-modules/sk_buff.patch	07ad752e578a675b4aaf3843012740c28acd3d2d
+++ packages/wifistix/wifistix-modules/sk_buff.patch	07ad752e578a675b4aaf3843012740c28acd3d2d
@@ -0,0 +1,18 @@
+--- src_cf8385/wlan/wlan_wmm.c	2007-06-22 11:23:39.000000000 -0700
++++ src_cf8385/wlan/wlan_wmm-orig.c	2007-10-28 13:27:46.000000000 -0700
+@@ -701,9 +701,15 @@
+ 	switch (eth->h_proto)
+ 	{
+ 	case __constant_htons(ETH_P_IP):
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
++		PRINTM(INFO, "packet type ETH_P_IP: %04x, tos=%#x prio=%#x\n",
++               eth->h_proto,ip_hdr(skb)->tos,skb->priority);
++               tos = IPTOS_PREC(ip_hdr(skb)->tos) >> IPTOS_OFFSET;
++#else
+ 		PRINTM(INFO, "packet type ETH_P_IP: %04x, tos=%#x prio=%#x\n",
+                eth->h_proto,skb->nh.iph->tos,skb->priority);
+ 		tos = IPTOS_PREC(skb->nh.iph->tos) >> IPTOS_OFFSET;
++#endif
+ 		break;
+ 	case __constant_htons(ETH_P_ARP):
+ 		PRINTM(INFO, "ARP packet %04x\n",eth->h_proto);

More information about the Openembedded-commits mailing list