[oe-commits] org.oe.dev merge of '88dd6a801655485b76bb6d591c1f763d51ff47b8'

mickeyl commit openembedded-commits at lists.openembedded.org
Thu Aug 23 12:43:42 UTC 2007 

merge of '88dd6a801655485b76bb6d591c1f763d51ff47b8'
     and 'ea2a23cae4f4d939a07f699c39b603c4c2559ad1'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 630d91b636d9eb5ff3634efb7f7ed911fbd36602
ViewMTN: http://monotone.openembedded.org/revision.psp?id=630d91b636d9eb5ff3634efb7f7ed911fbd36602
Files:
1
packages/classpath/classpath-minimal.inc
packages/gsm/files/fic-gta01
packages/gsm/files/fic-gta01/default
packages/gsm/files/fix-mlbuf.patch
packages/gsm/files/htcuniversal
packages/gsm/files/htcuniversal/default
packages/gsm/files/magician
packages/gsm/files/magician/default
packages/python/python-pygobject-native_2.12.2.bb
packages/python/python-pygobject_2.12.2.bb
packages/qemu/qemu-qop-nogfx-native_svn.bb
packages/gaim/pidgin_2.1.0.bb
packages/gaim/pidgin_2.1.1.bb
packages/glibc/glibc-initial_2.6.bb
packages/glibc/glibc-initial_2.6.1.bb
packages/glibc/glibc-intermediate_2.6.bb
packages/glibc/glibc-intermediate_2.6.1.bb
packages/glibc/glibc_2.6.bb
packages/glibc/glibc_2.6.1.bb
packages/sane-backends/sane-backends-1.0.15
packages/sane-backends/sane-backends-1.0.17
packages/sane-backends/sane-backends_1.0.15.bb
packages/sane-backends/sane-backends_1.0.17.bb
packages/freetype/freetype-2.3.5
packages/kxml2
packages/linux/linux-2.6.21
packages/linux/linux-2.6.21/gumstix
packages/linux/linux-ml403-mvista-2.6.x
packages/linux/linux-ml403-slab-2.6.x
packages/python/python-openmoko
classes/xilinx-bsp.bbclass
packages/abiword/abiword-embedded_2.5.2.bb
packages/abiword/abiword-plugins_2.5.2.bb
packages/abiword/abiword_2.5.2.bb
packages/freetype/freetype-2.3.5/fix-x86_64-build.patch
packages/freetype/freetype-native_2.3.5.bb
packages/freetype/freetype_2.3.5.bb
packages/gphoto2/gphoto2_2.4.0.bb
packages/gtk-webcore/midori_0.0.5.bb
packages/images/angstrom-minimal-image-with-mtd-utils.bb
packages/kxml2/kxml2_2.3.0.bb
packages/libgphoto2/libgphoto2_2.4.0.bb
packages/librsvg/librsvg_2.11.1.bb
packages/linux/linux-2.6.21/270-usb-gadget-udc.patch
packages/linux/linux-2.6.21/arch-config.patch
packages/linux/linux-2.6.21/bkpxa-pxa-cpu.patch
packages/linux/linux-2.6.21/bkpxa-pxa-cpufreq.patch
packages/linux/linux-2.6.21/board-init.patch
packages/linux/linux-2.6.21/bugfix-i2c-include.patch
packages/linux/linux-2.6.21/bugfix-mmc-clock.patch
packages/linux/linux-2.6.21/bugfix-pxa-cpufreq.patch
packages/linux/linux-2.6.21/bugfix-serial-interrupt.patch
packages/linux/linux-2.6.21/bugfix-serial-register-status.patch
packages/linux/linux-2.6.21/compact-flash.patch
packages/linux/linux-2.6.21/compile-fix-pxa_cpufreq.patch
packages/linux/linux-2.6.21/cpufreq-better-freqs.patch
packages/linux/linux-2.6.21/cpufreq-fixup.patch
packages/linux/linux-2.6.21/cpufreq-ondemand-by-default.patch
packages/linux/linux-2.6.21/defconfig.patch
packages/linux/linux-2.6.21/disable-uncompress-message.patch
packages/linux/linux-2.6.21/ethernet-config.patch
packages/linux/linux-2.6.21/flash.patch
packages/linux/linux-2.6.21/gumstix/defconfig
packages/linux/linux-2.6.21/gumstix-asoc.patch
packages/linux/linux-2.6.21/gumstix-fb-logo.patch
packages/linux/linux-2.6.21/gumstix-pxa270-usb-host.patch
packages/linux/linux-2.6.21/header.patch
packages/linux/linux-2.6.21/mach-types-fix.patch
packages/linux/linux-2.6.21/misalignment-handling.patch
packages/linux/linux-2.6.21/mmc-card-detect.patch
packages/linux/linux-2.6.21/modular-init-bluetooth.patch
packages/linux/linux-2.6.21/modular-init-smc91x.patch
packages/linux/linux-2.6.21/modular-init-usb-gadget.patch
packages/linux/linux-2.6.21/pcm-gcc-411-bugfix.patch
packages/linux/linux-2.6.21/proc-gpio.patch
packages/linux/linux-2.6.21/pxa-regs-additions.patch
packages/linux/linux-2.6.21/pxa-regs-fixup.patch
packages/linux/linux-2.6.21/pxa2xx_udc.patch
packages/linux/linux-2.6.21/pxafb-18bpp-mode.patch
packages/linux/linux-2.6.21/pxafb-definition.patch
packages/linux/linux-2.6.21/ramfs-mode-support.patch
packages/linux/linux-2.6.21/serial-divisor.patch
packages/linux/linux-2.6.21/serial-ether-addr.patch
packages/linux/linux-2.6.21/smc-ether-addr.patch
packages/linux/linux-2.6.21/uImage-in-own-partition.patch
packages/linux/linux-2.6.21/ucb1400-ac97-audio.patch
packages/linux/linux-gta01/defconfig-2.6.21.6-fic-gta01
packages/linux/linux-gta01_2.6.21.6.bb
packages/linux/linux-ml403-mvista-2.6.x/xilinx-ml403_defconfig
packages/linux/linux-ml403-mvista-2.6.x_git.bb
packages/linux/linux-ml403-slab-2.6.x/xilinx-ml403_defconfig
packages/linux/linux-ml403-slab-2.6.x_git.bb
packages/openmoko2/openmoko-tasks2_svn.bb
packages/python/python-dbus/python-path.patch
packages/python/python-openmoko/python-path.patch
packages/qemu/files/02_snapshot_use_tmpdir.patch
packages/qemu/files/03_machines_list_no_error.patch
packages/qemu/files/04_do_not_print_rtc_freq_if_ok.patch
packages/qemu/files/05_non-fatal_if_linux_hd_missing.patch
packages/qemu/files/06_exit_segfault.patch
packages/qemu/files/10_signal_jobs.patch
packages/qemu/files/11_signal_sigaction.patch
packages/qemu/files/12_signal_powerpc_support.patch
packages/qemu/files/22_net_tuntap_stall.patch
packages/qemu/files/30_syscall_ipc.patch
packages/qemu/files/31_syscalls.patch
packages/qemu/files/32_syscall_sysctl.patch
packages/qemu/files/33_syscall_ppc_clone.patch
packages/qemu/files/39_syscall_fadvise64.patch
packages/qemu/files/41_arm_fpa_sigfpe.patch
packages/qemu/files/52_ne2000_return.patch
packages/qemu/files/61_safe_64bit_int.patch
packages/qemu/files/63_sparc_build.patch
packages/qemu/files/64_ppc_asm_constraints.patch
packages/qemu/files/65_kfreebsd.patch
packages/qemu/files/66_tls_ld.patch
packages/qemu/files/91-oh-sdl-cursor.patch
packages/qemu/files/93-oh-pl110-rgb.patch
packages/qemu/files/fix_segfault.patch
packages/qemu/files/no-strip.patch
packages/qemu/files/qemu-0.9.0-nptl-update.patch
packages/qemu/files/qemu-0.9.0-nptl.patch
packages/qemu/files/qemu-amd64-32b-mapping-0.9.0.patch
packages/qemu/files/workaround_bad_futex_headers.patch
packages/qemu/qemu-native_20070613.bb
packages/qemu/qemu_20070613.bb
classes/distutils.bbclass
classes/image.bbclass
classes/rootfs_ipk.bbclass
classes/seppuku.bbclass
conf/distro/angstrom-2008.1.conf
conf/distro/include/sane-srcdates.inc
conf/machine/alix.conf
conf/machine/at32stk1000.conf
conf/machine/at91sam9263ek.conf
conf/machine/atngw100.conf
conf/machine/compulab-pxa270.conf
conf/machine/epia.conf
conf/machine/fic-gta01.conf
conf/machine/geodegx.conf
conf/machine/geodelx.conf
conf/machine/guinness.conf
conf/machine/gumstix.conf
conf/machine/i586-generic.conf
conf/machine/i686-generic.conf
conf/machine/include/tune-ppc440e.conf
conf/machine/include/tune-ppc603e.conf
conf/machine/kb9202.conf
conf/machine/netvista.conf
conf/machine/progear.conf
conf/machine/sarge-at91.conf
conf/machine/wrap.conf
conf/machine/x86.conf
conf/machine/xilinx-ml403.conf
contrib/python/generate-manifest-2.5.py
files/device_table-jlime.txt
files/device_table-minimal.txt
files/device_table-slugos.txt
files/device_table-unslung.txt
packages/classpath/classpath-minimal-native_0.95.bb
packages/classpath/classpath-minimal_0.95.bb
packages/fbreader/fbreader_0.8.2a.bb
packages/gaim/pidgin.inc
packages/geoclue/geoclue_git.bb
packages/gpe-bootsplash/files/angstrom/splash-p.svg
packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
packages/gpephone/libsettings_0.3.bb
packages/gsm/files/default
packages/gsm/libgsmd_svn.bb
packages/gstreamer/gst-common.inc
packages/gstreamer/gst-plugins-bad_0.10.5.bb
packages/gstreamer/gst-plugins.inc
packages/initscripts/initscripts-1.0/save-rtc.sh
packages/linux/compulab-pxa270_2.6.16.bb
packages/linux/compulab-pxa270_2.6.22.bb
packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb
packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
packages/linux/ixp4xx-kernel.inc
packages/linux/linux-bast_2.4.25-vrs1-bast1.bb
packages/linux/linux-dht-walnut_2.6.20.bb
packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
packages/linux/linux-efika_2.6.20.11.bb
packages/linux/linux-efika_2.6.20.bb
packages/linux/linux-efika_2.6.21+git.bb
packages/linux/linux-epia_2.6.11.bb
packages/linux/linux-epia_2.6.12.bb
packages/linux/linux-epia_2.6.19.2.bb
packages/linux/linux-epia_2.6.8.1.bb
packages/linux/linux-geodegx_2.4.24.bb
packages/linux/linux-geodelx_2.6.11.bb
packages/linux/linux-gta01_2.6.21.3.bb
packages/linux/linux-gta01_2.6.21.5.bb
packages/linux/linux-jlime-jornada6xx_2.6.11.bb
packages/linux/linux-jlime-jornada6xx_2.6.17.bb
packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb
packages/linux/linux-jlime-jornada7xx_2.6.17.bb
packages/linux/linux-jlime-jornada7xx_2.6.18.bb
packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
packages/linux/linux-ks8695_2.6.16.bb
packages/linux/linux-magicbox_2.6.18.6.bb
packages/linux/linux-magicbox_2.6.19.2.bb
packages/linux/linux-navman_2.6.18.bb
packages/linux/linux-smdk2440_2.6.20+git.bb
packages/linux/linux-smdk2443_2.6.20+git.bb
packages/linux/linux-titan-sh4_2.6.21.bb
packages/linux/linux-wrap-geode_2.6.17.bb
packages/linux/linux-wrt_2.4.20.bb
packages/linux/linux-wrt_2.4.30.bb
packages/linux/linux-x86_2.6.17.9.bb
packages/linux/linux-x86_2.6.20.bb
packages/linux/linux-z_2.6.20.bb
packages/linux/linux.inc
packages/linux/linux_2.6.14.bb
packages/linux/linux_2.6.21.bb
packages/linux/logicpd-pxa270_2.6.17-rc5.bb
packages/linux/logicpd-pxa270_2.6.19.2.bb
packages/linux/mainstone-kernel_2.6.11.bb
packages/linux/mainstone-kernel_2.6.18.bb
packages/linux/mx21ads-kernel_2.6.19rc6.bb
packages/linux/mx31ads-kernel_2.6.19rc6.bb
packages/linux/netbook-pro-kernel_2.6.17.bb
packages/linux/triton-kernel_2.6.11.bb
packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
packages/ltp/ltp_20070228.bb
packages/openmoko2/libmokojournal2_svn.bb
packages/python/python-2.5-manifest.inc
packages/python/python-dbus_0.81.1.bb
packages/python/python-ecore_cvs.bb
packages/python/python-edje_cvs.bb
packages/python/python-emotion_cvs.bb
packages/python/python-evas_cvs.bb
packages/python/python-openmoko_0.1.bb
packages/python/python_2.5.1.bb
packages/qemu/qemu_cvs.bb
packages/qt/qt4-x11-free_4.3.0.bb
packages/tasks/task-openmoko.bb
packages/uboot/uboot-openmoko_svn.bb
packages/wv/wv_1.2.0.bb
packages/uicmoc/uicmoc4-native_4.3.1.bb
packages/uicmoc/uicmoc4-native_4.2.3.bb
packages/uicmoc/uicmoc4-native_4.3.0.bb
Diffs:

#
# mt diff -r88dd6a801655485b76bb6d591c1f763d51ff47b8 -r630d91b636d9eb5ff3634efb7f7ed911fbd36602
#
# 
# 
# delete "packages/classpath/classpath-minimal.inc"
# 
# delete "packages/gsm/files/fic-gta01"
# 
# delete "packages/gsm/files/fic-gta01/default"
# 
# delete "packages/gsm/files/fix-mlbuf.patch"
# 
# delete "packages/gsm/files/htcuniversal"
# 
# delete "packages/gsm/files/htcuniversal/default"
# 
# delete "packages/gsm/files/magician"
# 
# delete "packages/gsm/files/magician/default"
# 
# delete "packages/python/python-pygobject-native_2.12.2.bb"
# 
# delete "packages/python/python-pygobject_2.12.2.bb"
# 
# delete "packages/qemu/qemu-qop-nogfx-native_svn.bb"
# 
# rename "packages/gaim/pidgin_2.1.0.bb"
#     to "packages/gaim/pidgin_2.1.1.bb"
# 
# rename "packages/glibc/glibc-initial_2.6.bb"
#     to "packages/glibc/glibc-initial_2.6.1.bb"
# 
# rename "packages/glibc/glibc-intermediate_2.6.bb"
#     to "packages/glibc/glibc-intermediate_2.6.1.bb"
# 
# rename "packages/glibc/glibc_2.6.bb"
#     to "packages/glibc/glibc_2.6.1.bb"
# 
# rename "packages/sane-backends/sane-backends-1.0.15"
#     to "packages/sane-backends/sane-backends-1.0.17"
# 
# rename "packages/sane-backends/sane-backends_1.0.15.bb"
#     to "packages/sane-backends/sane-backends_1.0.17.bb"
# 
# add_dir "packages/freetype/freetype-2.3.5"
# 
# add_dir "packages/kxml2"
# 
# add_dir "packages/linux/linux-2.6.21"
# 
# add_dir "packages/linux/linux-2.6.21/gumstix"
# 
# add_dir "packages/linux/linux-ml403-mvista-2.6.x"
# 
# add_dir "packages/linux/linux-ml403-slab-2.6.x"
# 
# add_dir "packages/python/python-openmoko"
# 
# add_file "classes/xilinx-bsp.bbclass"
#  content [1c5ead4afe4f57431d3f3a5a8c80bdaf34afa9b8]
# 
# add_file "packages/abiword/abiword-embedded_2.5.2.bb"
#  content [f5eb7c78697311dd47c0487749b1225434ed84f9]
# 
# add_file "packages/abiword/abiword-plugins_2.5.2.bb"
#  content [380a4ea0f3f1f3606d2a65ae330bb4bc025f1452]
# 
# add_file "packages/abiword/abiword_2.5.2.bb"
#  content [c6c5fd771ef0b03717df37cac565bd8ff8d4c2f1]
# 
# add_file "packages/freetype/freetype-2.3.5/fix-x86_64-build.patch"
#  content [690894b3931340f65a16f59f1c0f40a85560ce1d]
# 
# add_file "packages/freetype/freetype-native_2.3.5.bb"
#  content [dd9daf1996d3774461b7c4f1e0d57e5a6560878e]
# 
# add_file "packages/freetype/freetype_2.3.5.bb"
#  content [41e9ea91885c464fff25e787be0cbe6947c95e47]
# 
# add_file "packages/gphoto2/gphoto2_2.4.0.bb"
#  content [cd3e313d727b48a81b5b3d9736604d8e8c5f99a6]
# 
# add_file "packages/gtk-webcore/midori_0.0.5.bb"
#  content [02453b1794116c17e282c8cce5aacd1375feeae2]
# 
# add_file "packages/images/angstrom-minimal-image-with-mtd-utils.bb"
#  content [5788c842aec73348a25d838114582c5b6e44c17e]
# 
# add_file "packages/kxml2/kxml2_2.3.0.bb"
#  content [7c4ff792800980cb83dfb9edf16c2672f5940354]
# 
# add_file "packages/libgphoto2/libgphoto2_2.4.0.bb"
#  content [63b6ff882613dcebc4d9b12e6b17ce72b5fc7f90]
# 
# add_file "packages/librsvg/librsvg_2.11.1.bb"
#  content [59bdb0233bda87be9c3b73a68049d017505cb1f7]
# 
# add_file "packages/linux/linux-2.6.21/270-usb-gadget-udc.patch"
#  content [46d1e25ee8c6b2057ad12fef37ecff405ac5e046]
# 
# add_file "packages/linux/linux-2.6.21/arch-config.patch"
#  content [77e962d186fbf986a7150fcf92fc7e9a2f2e3c6c]
# 
# add_file "packages/linux/linux-2.6.21/bkpxa-pxa-cpu.patch"
#  content [61c42220d83235a7ed992b29a5be2b15f23c0022]
# 
# add_file "packages/linux/linux-2.6.21/bkpxa-pxa-cpufreq.patch"
#  content [189b51b1ebd33e9e49934cc272a151dd27314737]
# 
# add_file "packages/linux/linux-2.6.21/board-init.patch"
#  content [d713b018e314e882ff245ce9fb326a9614bee226]
# 
# add_file "packages/linux/linux-2.6.21/bugfix-i2c-include.patch"
#  content [2cc5db320546c0c376dc4ce82183109232b4a4a7]
# 
# add_file "packages/linux/linux-2.6.21/bugfix-mmc-clock.patch"
#  content [453917381c5760514750f165957c49b478ffc65c]
# 
# add_file "packages/linux/linux-2.6.21/bugfix-pxa-cpufreq.patch"
#  content [7107883474ca1adbd13644873540c034005a19ed]
# 
# add_file "packages/linux/linux-2.6.21/bugfix-serial-interrupt.patch"
#  content [61a140ba63e9d2a85c0a659d7db18f46f661fddd]
# 
# add_file "packages/linux/linux-2.6.21/bugfix-serial-register-status.patch"
#  content [5947e11a809c8053638b1e70b3f5f544fa60af64]
# 
# add_file "packages/linux/linux-2.6.21/compact-flash.patch"
#  content [4097907bb3d341271ccf00ade8a0d937ab2e70d4]
# 
# add_file "packages/linux/linux-2.6.21/compile-fix-pxa_cpufreq.patch"
#  content [922480ad3b67a47f4da75e43d52f036c56074b4e]
# 
# add_file "packages/linux/linux-2.6.21/cpufreq-better-freqs.patch"
#  content [8c8edc8e89041dd1b031e376970c2c3f594b215f]
# 
# add_file "packages/linux/linux-2.6.21/cpufreq-fixup.patch"
#  content [2db68113b34b6973ceae2dfdec52a59c3d1e558a]
# 
# add_file "packages/linux/linux-2.6.21/cpufreq-ondemand-by-default.patch"
#  content [44a99a89c462703ccc42e071e63960a550d025c0]
# 
# add_file "packages/linux/linux-2.6.21/defconfig.patch"
#  content [36b01c2f21608396fe7da5c8aba9aad2810a6939]
# 
# add_file "packages/linux/linux-2.6.21/disable-uncompress-message.patch"
#  content [db4d24d8f7d6449fc24795635b90d0df15c97bc1]
# 
# add_file "packages/linux/linux-2.6.21/ethernet-config.patch"
#  content [0debcec19adacd79ffaab0baea1f8bee70fcb16c]
# 
# add_file "packages/linux/linux-2.6.21/flash.patch"
#  content [028683f763c8358b0f1c076926660440cc783c3d]
# 
# add_file "packages/linux/linux-2.6.21/gumstix/defconfig"
#  content [7d5c57d58c405ba8cc4468aba4ebf28e41c1dec7]
# 
# add_file "packages/linux/linux-2.6.21/gumstix-asoc.patch"
#  content [672e82d740da0eefc64b737ada85c935d289999c]
# 
# add_file "packages/linux/linux-2.6.21/gumstix-fb-logo.patch"
#  content [a28f1499776f44a83ad92ed1ad935d24910ed98b]
# 
# add_file "packages/linux/linux-2.6.21/gumstix-pxa270-usb-host.patch"
#  content [89cb49be5d3e523794982ddbd2908bf141174bc1]
# 
# add_file "packages/linux/linux-2.6.21/header.patch"
#  content [1a15dda271c62ef51928e06d14a61bd20f7fc32c]
# 
# add_file "packages/linux/linux-2.6.21/mach-types-fix.patch"
#  content [18d504ef0214d52e33d2b8a577e0c2dfb8aa0663]
# 
# add_file "packages/linux/linux-2.6.21/misalignment-handling.patch"
#  content [27f8266aa43f862763f684ed8d6ef944d5883850]
# 
# add_file "packages/linux/linux-2.6.21/mmc-card-detect.patch"
#  content [02f4c903d4cd18a0a7f1f6b3dbbb2268d96d09de]
# 
# add_file "packages/linux/linux-2.6.21/modular-init-bluetooth.patch"
#  content [7121c06e9b7abb1bead874386960934fc97e824b]
# 
# add_file "packages/linux/linux-2.6.21/modular-init-smc91x.patch"
#  content [95c46437bdc083831d12dfbc91ddc43a092fe687]
# 
# add_file "packages/linux/linux-2.6.21/modular-init-usb-gadget.patch"
#  content [e2c91ef570684c54b0ff393820b15d0fcd5812dd]
# 
# add_file "packages/linux/linux-2.6.21/pcm-gcc-411-bugfix.patch"
#  content [8c06dbae7910651bbcd8731d6851454f1c47d459]
# 
# add_file "packages/linux/linux-2.6.21/proc-gpio.patch"
#  content [5e31326fd32827afc39c0edb84d13f4384cf232b]
# 
# add_file "packages/linux/linux-2.6.21/pxa-regs-additions.patch"
#  content [ee3725192f4fc6fcad730b0bbbe7374351e551f9]
# 
# add_file "packages/linux/linux-2.6.21/pxa-regs-fixup.patch"
#  content [c0c412734d4bc015112b1d6eb7b6a56359b772fc]
# 
# add_file "packages/linux/linux-2.6.21/pxa2xx_udc.patch"
#  content [16ea985d508ff9f01b790060b0dd95a8ad2b7969]
# 
# add_file "packages/linux/linux-2.6.21/pxafb-18bpp-mode.patch"
#  content [e2975bb2f4a9275bce85a586e82e13259c28fec6]
# 
# add_file "packages/linux/linux-2.6.21/pxafb-definition.patch"
#  content [e5b26a71fa9b5f9747529b0c2e4511ba69a62863]
# 
# add_file "packages/linux/linux-2.6.21/ramfs-mode-support.patch"
#  content [fbd5e754e2c544fd036504b685f88f3aa963189c]
# 
# add_file "packages/linux/linux-2.6.21/serial-divisor.patch"
#  content [75684ee587587dacdb2a0ccfeeb394be85cdee49]
# 
# add_file "packages/linux/linux-2.6.21/serial-ether-addr.patch"
#  content [e93b779ef26803beb9c01abaf035039df4dfdb11]
# 
# add_file "packages/linux/linux-2.6.21/smc-ether-addr.patch"
#  content [3e7823c1cf361019e3536add7917cb5f60278370]
# 
# add_file "packages/linux/linux-2.6.21/uImage-in-own-partition.patch"
#  content [440fe8c2946d0f307271094a940cdcd50526f92d]
# 
# add_file "packages/linux/linux-2.6.21/ucb1400-ac97-audio.patch"
#  content [07aab28f12b91f580ecb82ec23cb5431185dff7c]
# 
# add_file "packages/linux/linux-gta01/defconfig-2.6.21.6-fic-gta01"
#  content [f3b3a05ebb9609a899206b0eda2a008c3322f3d8]
# 
# add_file "packages/linux/linux-gta01_2.6.21.6.bb"
#  content [3579e619e87a73512648f35c46663521f55f4cac]
# 
# add_file "packages/linux/linux-ml403-mvista-2.6.x/xilinx-ml403_defconfig"
#  content [f543a0a9a0b50abda57ba15ce8b6a5c14922a27e]
# 
# add_file "packages/linux/linux-ml403-mvista-2.6.x_git.bb"
#  content [607a3ec1212c49a8bec07ab6a9220e1868f31e6d]
# 
# add_file "packages/linux/linux-ml403-slab-2.6.x/xilinx-ml403_defconfig"
#  content [f543a0a9a0b50abda57ba15ce8b6a5c14922a27e]
# 
# add_file "packages/linux/linux-ml403-slab-2.6.x_git.bb"
#  content [9199fb7885a068659ab66b6897c7dcf1f94cf3c4]
# 
# add_file "packages/openmoko2/openmoko-tasks2_svn.bb"
#  content [450e5e7f51113ebcee7b13cd3dca55240602492b]
# 
# add_file "packages/python/python-dbus/python-path.patch"
#  content [82cbc113e66f67ef9fac47fe70ef097309fe50e9]
# 
# add_file "packages/python/python-openmoko/python-path.patch"
#  content [40983bb354b660303ebeaaa838b0b8332b6eaf8d]
# 
# add_file "packages/qemu/files/02_snapshot_use_tmpdir.patch"
#  content [8403be60765a8909f9b6a767cbd07ee2f7c09ad1]
# 
# add_file "packages/qemu/files/03_machines_list_no_error.patch"
#  content [cfe9bfca11494597ab693967b837c0b319a1bc80]
# 
# add_file "packages/qemu/files/04_do_not_print_rtc_freq_if_ok.patch"
#  content [7c5f8e844d1a9c9682a0b04f85ac5bb4b8864fcf]
# 
# add_file "packages/qemu/files/05_non-fatal_if_linux_hd_missing.patch"
#  content [6efa673b4a11e4f9bd831fbd3d96ca3366e9f160]
# 
# add_file "packages/qemu/files/06_exit_segfault.patch"
#  content [739b4304e59e7da1f66ce4d8c6a83c0b70bb5c7d]
# 
# add_file "packages/qemu/files/10_signal_jobs.patch"
#  content [3a3afc42ec711934f405e1fc146212be3fa29538]
# 
# add_file "packages/qemu/files/11_signal_sigaction.patch"
#  content [c60b23cbfe3fce4083ce38a9dc8e554243f4dba3]
# 
# add_file "packages/qemu/files/12_signal_powerpc_support.patch"
#  content [0e7147174922e92a337dd93368e994e698684b6f]
# 
# add_file "packages/qemu/files/22_net_tuntap_stall.patch"
#  content [8cec6480e7e4679aec02b86456cd4ed0a1075867]
# 
# add_file "packages/qemu/files/30_syscall_ipc.patch"
#  content [e71354dad4348bd00df2b5f3e0b8658e391b2ecd]
# 
# add_file "packages/qemu/files/31_syscalls.patch"
#  content [9010de83fb53df2c5e3951558492eb241ae3f3b5]
# 
# add_file "packages/qemu/files/32_syscall_sysctl.patch"
#  content [520b3e1116706ffcad15ea2adccc4a42c09ccd0b]
# 
# add_file "packages/qemu/files/33_syscall_ppc_clone.patch"
#  content [b1881fc3198840208c8632ed9d4f60f1ef8cdf90]
# 
# add_file "packages/qemu/files/39_syscall_fadvise64.patch"
#  content [a49ce3f4646e34ea6110a2f392260fd4bd0ca194]
# 
# add_file "packages/qemu/files/41_arm_fpa_sigfpe.patch"
#  content [fbb470318c950562ddc4fbf3df37516ffb815436]
# 
# add_file "packages/qemu/files/52_ne2000_return.patch"
#  content [956a67eece2e7e66380210c2a57ff525403ebe04]
# 
# add_file "packages/qemu/files/61_safe_64bit_int.patch"
#  content [bf3546ceeeaf46c386dc3adb45f10dd26c6103c6]
# 
# add_file "packages/qemu/files/63_sparc_build.patch"
#  content [dbfb5d952d243298df3f084d4fe62652a7ab32dd]
# 
# add_file "packages/qemu/files/64_ppc_asm_constraints.patch"
#  content [1811eca7e62890eaf038db253e8fa5b740f33ac6]
# 
# add_file "packages/qemu/files/65_kfreebsd.patch"
#  content [17542ecd6ba6ccd8cac96a84f521536934436878]
# 
# add_file "packages/qemu/files/66_tls_ld.patch"
#  content [9e2466568d6db535b1b17dc742a79e92d52352a1]
# 
# add_file "packages/qemu/files/91-oh-sdl-cursor.patch"
#  content [811b00dcaa48e6c18625b7a21c1cb27e051f9fed]
# 
# add_file "packages/qemu/files/93-oh-pl110-rgb.patch"
#  content [891f126b53d66622a1bb15f648c73e72c074f1ec]
# 
# add_file "packages/qemu/files/fix_segfault.patch"
#  content [940f95ce3ae9e47540f0cd728c1909b191a35451]
# 
# add_file "packages/qemu/files/no-strip.patch"
#  content [e50ada97aea32904dde176f41b8ca86f89b5ca65]
# 
# add_file "packages/qemu/files/qemu-0.9.0-nptl-update.patch"
#  content [fb29fbe8d8f278836b49efc8391d3b42c6463074]
# 
# add_file "packages/qemu/files/qemu-0.9.0-nptl.patch"
#  content [ab4c731b4346cfac131cc0a11ef465bd49b81439]
# 
# add_file "packages/qemu/files/qemu-amd64-32b-mapping-0.9.0.patch"
#  content [8fd26edd3a49f28f746072843d90718b4ab1401a]
# 
# add_file "packages/qemu/files/workaround_bad_futex_headers.patch"
#  content [950b6e78d486a94bcf1599f931f55c59d2ef6001]
# 
# add_file "packages/qemu/qemu-native_20070613.bb"
#  content [342f872dda508387c0cfd231275c9f7fa10f3a9e]
# 
# add_file "packages/qemu/qemu_20070613.bb"
#  content [08e188f8fc9c503ecd5a07df1479a19a1531b34e]
# 
# patch "classes/distutils.bbclass"
#  from [b5fdf6a8a6b47377bbad57ef7d345783624e42be]
#    to [539b0b48207ebc4a3d5c0eb1aabe41de88cc8922]
# 
# patch "classes/image.bbclass"
#  from [6bfd73489be48ca3395112458e8092971909dc82]
#    to [4de98f478a319e0c9de999d79c0bf5a753f37a10]
# 
# patch "classes/rootfs_ipk.bbclass"
#  from [9592480b5cedd24c510d2644e968734f65965f9a]
#    to [731a40ee3d0b40e7e6d9bdc838728a484250233e]
# 
# patch "classes/seppuku.bbclass"
#  from [a69586a66f285bca06d5d46b92195f56ece0749d]
#    to [600990318f058b4d0322d76c901d7805b090a8c3]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [783879e52665932b7ebc461dd753e4481635d326]
#    to [8a3187bfeabfc7d9f5c299a7ba5cd346e3aba275]
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [ccb3a58cdc94f8b3782b9c1addc3638f883f4b83]
#    to [8f2a2257e9cf41af47a20315e5688da7a65871dd]
# 
# patch "conf/machine/alix.conf"
#  from [76cc73f8bf7af8542d445c5d919516e000352bb2]
#    to [6ac777208694aa9b00784052d5baca787f429532]
# 
# patch "conf/machine/at32stk1000.conf"
#  from [2ab48481fd9d3e2e4648ce9d96d680c3d78cde4a]
#    to [05b0bc339df4d5de0c109f42be8cae71aa14ac2c]
# 
# patch "conf/machine/at91sam9263ek.conf"
#  from [a05a082216e3ac5ee08f1882e725c2f90a277700]
#    to [3ee1c7f18e3af408e61e46c2790a4a96784cc4f7]
# 
# patch "conf/machine/atngw100.conf"
#  from [b5cb85b6f35f560c53155b1363a067be0a9a9192]
#    to [027f776421cc5f24af9fcf738db756347a30c733]
# 
# patch "conf/machine/compulab-pxa270.conf"
#  from [d1c4d22022e1eaefa1637b8babd925a8cb738cde]
#    to [0ae0bc3504f44c5c874639256fb2920d10ca79ce]
# 
# patch "conf/machine/epia.conf"
#  from [641965dd32edeeb4a10890be1b0bc3339fe13559]
#    to [b9d513ffac950087fa7ca9ed84684b6186b32006]
# 
# patch "conf/machine/fic-gta01.conf"
#  from [1ef7e5d0dd0d861d301d9817a3ef3cf36959179d]
#    to [1f95cfda3ceeee646ee03718c50280ea1818fa58]
# 
# patch "conf/machine/geodegx.conf"
#  from [5e1cc5910b747a31bf87753033236a9d383249a7]
#    to [444f8e041fee062b1341f33d482b9e8283d8f612]
# 
# patch "conf/machine/geodelx.conf"
#  from [bb33a4392a78a281646a05e283d68c64bdca7024]
#    to [aa16341564f7ffa56c1ca89a603a1f1a6b15efd2]
# 
# patch "conf/machine/guinness.conf"
#  from [83ad2351ae9b942f6123ebaa254deff0ea2ecdce]
#    to [a0afdf0c7e1609a6ccdc964544650fb1848ec71d]
# 
# patch "conf/machine/gumstix.conf"
#  from [c62a04e5981d2e5ed4096ac6667138f90e8e01d6]
#    to [a650e6c9c2788b0d9289abdda0b9ed9e3e8ded38]
# 
# patch "conf/machine/i586-generic.conf"
#  from [9ade4b2570050666438641b4db85710e2d9ec721]
#    to [c5fd72db431ef2ed503db0c88c5b22e788be90bd]
# 
# patch "conf/machine/i686-generic.conf"
#  from [0c20422ac9dbb45e4ed402a12f60f084001e1950]
#    to [669fc531794bbc10ec2d56acd9c276fa190eb66f]
# 
# patch "conf/machine/include/tune-ppc440e.conf"
#  from [31fe75135a31057b5ebdc3c5eb2cbf35eb537517]
#    to [052007ad15ac8865ca76cc3a6437455a3452e08f]
# 
# patch "conf/machine/include/tune-ppc603e.conf"
#  from [1042e68f15c2317e0f566b684347fdde50ea47d9]
#    to [50fd6b9827febbf259bd0d2bb79155cc64b82409]
# 
# patch "conf/machine/kb9202.conf"
#  from [9b25cdf77fd68007a0530049d4d894658ca55243]
#    to [796cb3dca2995c5538dfdf811eb1d8ed0b4d8a73]
# 
# patch "conf/machine/netvista.conf"
#  from [9156f4e8eef6278994d8a65b98af005cc02ce8c3]
#    to [5fa034197f2e35cab1099297e0461c05d84a1401]
# 
# patch "conf/machine/progear.conf"
#  from [f90862448b84e7a6b56bc57d0fdbff0c74afb962]
#    to [22e49b5432e36f46f19bdb061e0226cda4016d6c]
# 
# patch "conf/machine/sarge-at91.conf"
#  from [c143fccacff25ccef3d78df850733d0a04c84286]
#    to [fc95d03d6f4c65cff828e7db4ac6d1d6ec137b17]
%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rea2a23cae4f4d939a07f699c39b603c4c2559ad1 -r630d91b636d9eb5ff3634efb7f7ed911fbd36602
#
# 
# 
# add_file "packages/uicmoc/uicmoc4-native_4.3.1.bb"
#  content [9a5b3e0cf118671e949e94f3ccdfdc0106bf1511]
# 
# patch "packages/uicmoc/uicmoc4-native_4.2.3.bb"
#  from [bb258bfafd5b03ee012d8e4530a8f4219b862463]
#    to [80dd401b3668e6f4f71b2e43bfff330d9196e7a9]
# 
# patch "packages/uicmoc/uicmoc4-native_4.3.0.bb"
#  from [8520da26a06ef5cd286a9749b5a8e78337c3f665]
#    to [bd07c0050ef051ca21f2712499797670879d8879]
# 
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.1.bb	9a5b3e0cf118671e949e94f3ccdfdc0106bf1511
+++ packages/uicmoc/uicmoc4-native_4.3.1.bb	9a5b3e0cf118671e949e94f3ccdfdc0106bf1511
@@ -0,0 +1,59 @@
+DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+SECTION = "libs"
+HOMEPAGE = "http://www.trolltech.com"
+PRIORITY = "optional"
+LICENSE = "GPL QPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz"
+S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
+
+inherit native
+
+EXTRA_OECONF = "-prefix ${STAGING_DIR}/${BUILD_SYS}/qt4 \
+                -qt-libjpeg -qt-gif -system-zlib \
+                -no-nis -no-cups -no-exceptions  \
+                -no-accessibility -no-libjpeg    \
+                -no-nas-sound -no-sm             \
+                -no-xshape    -no-xinerama       \
+                -no-xcursor   -no-xrandr         \
+                -no-xrender   -no-fontconfig     \
+                -no-tablet    -no-xkb            \
+                -no-libpng                       \
+                -verbose -release  -fast -static \
+                -qt3support "
+# yank default -e
+EXTRA_OEMAKE = " "
+
+do_configure() {
+	echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+}
+
+TOBUILD = "\
+  src/tools/moc \
+  src/corelib \
+  src/sql \
+  src/qt3support \
+  src/xml \
+  src/tools/uic \
+  src/tools/rcc \
+  src/network \
+  src/gui \
+  src/tools/uic3 \
+"
+
+do_compile() {
+	unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
+	for i in ${TOBUILD}; do
+		cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
+	done
+}
+
+do_stage() {
+        install -m 0755 bin/moc ${STAGING_BINDIR}/moc4
+        install -m 0755 bin/uic ${STAGING_BINDIR}/uic4
+        install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34
+        install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4
+        install -d ${STAGING_DIR}/${BUILD_SYS}/qt4/
+        install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR}/${BUILD_SYS}/qt4/
+}
============================================================
--- packages/uicmoc/uicmoc4-native_4.2.3.bb	bb258bfafd5b03ee012d8e4530a8f4219b862463
+++ packages/uicmoc/uicmoc4-native_4.2.3.bb	80dd401b3668e6f4f71b2e43bfff330d9196e7a9
@@ -1,7 +1,9 @@ DESCRIPTION = "User-Interface-, Meta-Obj
 DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+DEPENDS = "libx11-native libxext-native"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL QPL"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz"
 
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.0.bb	8520da26a06ef5cd286a9749b5a8e78337c3f665
+++ packages/uicmoc/uicmoc4-native_4.3.0.bb	bd07c0050ef051ca21f2712499797670879d8879
@@ -1,8 +1,9 @@ DESCRIPTION = "User-Interface-, Meta-Obj
 DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+DEPENDS = "libx11-native libxext-native"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL QPL"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz"

More information about the Openembedded-commits mailing list