[oe-commits] org.oe.dev merge of 'dbc92be1fe4742c442c336c46478ebc072b977ed'
rpurdie commit
openembedded-commits at lists.openembedded.org
Mon Jan 28 21:10:20 UTC 2008
merge of 'dbc92be1fe4742c442c336c46478ebc072b977ed'
and 'f37c4d25879e2b68bedfa992671306a142e8181d'
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: c52156528d815f33e82a36a7efed684a7d43dee4
ViewMTN: http://monotone.openembedded.org/revision/info/c52156528d815f33e82a36a7efed684a7d43dee4
Files:
1
packages/qemu/qemu-0.9.0+cvs20070701
packages/qemu/qemu-0.9.0+cvs20070701/arm_nptl-0.9.0.patch
packages/qemu/qemu-0.9.0+cvs20070701/configure-0.9.0.patch
packages/qemu/qemu-0.9.0+cvs20070701/pl110_rgb-r0-0.9.0.patch
packages/qemu/qemu-0.9.0+cvs20070701/qemu-0.9.0-gcc4.patch
packages/qemu/qemu-0.9.0+cvs20070701/qemu-amd64-32b-mapping-0.9.0.patch
packages/qemu/qemu-0.9.0+cvs20070701/qemu-sdl-cursor-0.9.0.patch
packages/qemu/qemu-0.9.0+cvs20071121
packages/qemu/qemu-0.9.0+cvs20071121/02_snapshot_use_tmpdir.patch
packages/qemu/qemu-0.9.0+cvs20071121/04_do_not_print_rtc_freq_if_ok.patch
packages/qemu/qemu-0.9.0+cvs20071121/05_non-fatal_if_linux_hd_missing.patch
packages/qemu/qemu-0.9.0+cvs20071121/06_exit_segfault.patch
packages/qemu/qemu-0.9.0+cvs20071121/10_signal_jobs.patch
packages/qemu/qemu-0.9.0+cvs20071121/11_signal_sigaction.patch
packages/qemu/qemu-0.9.0+cvs20071121/22_net_tuntap_stall.patch
packages/qemu/qemu-0.9.0+cvs20071121/31_syscalls.patch
packages/qemu/qemu-0.9.0+cvs20071121/32_syscall_sysctl.patch
packages/qemu/qemu-0.9.0+cvs20071121/33_syscall_ppc_clone.patch
packages/qemu/qemu-0.9.0+cvs20071121/39_syscall_fadvise64.patch
packages/qemu/qemu-0.9.0+cvs20071121/41_arm_fpa_sigfpe.patch
packages/qemu/qemu-0.9.0+cvs20071121/52_ne2000_return.patch
packages/qemu/qemu-0.9.0+cvs20071121/61_safe_64bit_int.patch
packages/qemu/qemu-0.9.0+cvs20071121/63_sparc_build.patch
packages/qemu/qemu-0.9.0+cvs20071121/64_ppc_asm_constraints.patch
packages/qemu/qemu-0.9.0+cvs20071121/65_kfreebsd.patch
packages/qemu/qemu-0.9.0+cvs20071121/66_tls_ld.patch
packages/qemu/qemu-0.9.0+cvs20071121/91-oh-sdl-cursor.patch
packages/qemu/qemu-0.9.0+cvs20071121/disable-error-in-configure.patch
packages/qemu/qemu-0.9.0+cvs20071121/fix_segfault.patch
packages/qemu/qemu-0.9.0+cvs20071121/no-strip.patch
packages/qemu/qemu-0.9.0+cvs20071121/qemu-0.9.0-nptl-update.patch
packages/qemu/qemu-0.9.0+cvs20071121/qemu-0.9.0-nptl.patch
packages/qemu/qemu-0.9.0+cvs20071121/qemu-amd64-32b-mapping-0.9.0.patch
packages/qemu/qemu-0.9.0+cvs20071121/workaround_bad_futex_headers.patch
packages/qemu/qemu-native_0.9.0+cvs.bb
packages/qemu/qemu-native_20071121.bb
packages/qemu/qemu_0.9.0+cvs.bb
packages/qemu/qemu_20071121.bb
packages/qemu/files
packages/qemu/qemu-0.9.0+cvs20070613
packages/qemu/qemu-0.9.1
conf/distro/chinook-compat.conf
packages/qemu/qemu-0.9.1/02_snapshot_use_tmpdir.patch
packages/qemu/qemu-0.9.1/04_do_not_print_rtc_freq_if_ok.patch
packages/qemu/qemu-0.9.1/05_non-fatal_if_linux_hd_missing.patch
packages/qemu/qemu-0.9.1/06_exit_segfault.patch
packages/qemu/qemu-0.9.1/10_signal_jobs.patch
packages/qemu/qemu-0.9.1/11_signal_sigaction.patch
packages/qemu/qemu-0.9.1/22_net_tuntap_stall.patch
packages/qemu/qemu-0.9.1/31_syscalls.patch
packages/qemu/qemu-0.9.1/32_syscall_sysctl.patch
packages/qemu/qemu-0.9.1/33_syscall_ppc_clone.patch
packages/qemu/qemu-0.9.1/39_syscall_fadvise64.patch
packages/qemu/qemu-0.9.1/41_arm_fpa_sigfpe.patch
packages/qemu/qemu-0.9.1/52_ne2000_return.patch
packages/qemu/qemu-0.9.1/61_safe_64bit_int.patch
packages/qemu/qemu-0.9.1/63_sparc_build.patch
packages/qemu/qemu-0.9.1/64_ppc_asm_constraints.patch
packages/qemu/qemu-0.9.1/65_kfreebsd.patch
packages/qemu/qemu-0.9.1/66_tls_ld.patch
packages/qemu/qemu-0.9.1/91-oh-sdl-cursor.patch
packages/qemu/qemu-0.9.1/configure_symlinkpath_fix.patch
packages/qemu/qemu-0.9.1/disable-error-in-configure.patch
packages/qemu/qemu-0.9.1/fix_segfault.patch
packages/qemu/qemu-0.9.1/qemu-0.9.0-nptl-update.patch
packages/qemu/qemu-0.9.1/qemu-0.9.0-nptl.patch
packages/qemu/qemu-0.9.1/qemu-amd64-32b-mapping-0.9.0.patch
packages/qemu/qemu-0.9.1/series
packages/qemu/qemu-0.9.1/workaround_bad_futex_headers.patch
packages/qemu/qemu-native_0.9.1.bb
packages/qemu/qemu_0.9.1.bb
conf/machine/include/zaurus-2.6.inc
packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb
packages/linux/linux-rp-2.6.24/defconfig-collie
packages/linux/linux-rp.inc
packages/linux/linux-rp_2.6.24.bb
packages/tasks/task-base.bb
Diffs:
#
# mt diff -rdbc92be1fe4742c442c336c46478ebc072b977ed -rc52156528d815f33e82a36a7efed684a7d43dee4
#
#
#
# delete "packages/qemu/qemu-0.9.0+cvs20070701"
#
# delete "packages/qemu/qemu-0.9.0+cvs20070701/arm_nptl-0.9.0.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20070701/configure-0.9.0.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20070701/pl110_rgb-r0-0.9.0.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20070701/qemu-0.9.0-gcc4.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20070701/qemu-amd64-32b-mapping-0.9.0.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20070701/qemu-sdl-cursor-0.9.0.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/02_snapshot_use_tmpdir.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/04_do_not_print_rtc_freq_if_ok.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/05_non-fatal_if_linux_hd_missing.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/06_exit_segfault.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/10_signal_jobs.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/11_signal_sigaction.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/22_net_tuntap_stall.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/31_syscalls.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/32_syscall_sysctl.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/33_syscall_ppc_clone.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/39_syscall_fadvise64.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/41_arm_fpa_sigfpe.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/52_ne2000_return.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/61_safe_64bit_int.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/63_sparc_build.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/64_ppc_asm_constraints.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/65_kfreebsd.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/66_tls_ld.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/91-oh-sdl-cursor.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/disable-error-in-configure.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/fix_segfault.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/no-strip.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/qemu-0.9.0-nptl-update.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/qemu-0.9.0-nptl.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/qemu-amd64-32b-mapping-0.9.0.patch"
#
# delete "packages/qemu/qemu-0.9.0+cvs20071121/workaround_bad_futex_headers.patch"
#
# delete "packages/qemu/qemu-native_0.9.0+cvs.bb"
#
# delete "packages/qemu/qemu-native_20071121.bb"
#
# delete "packages/qemu/qemu_0.9.0+cvs.bb"
#
# delete "packages/qemu/qemu_20071121.bb"
#
# rename "packages/qemu/files"
# to "packages/qemu/qemu-0.9.0+cvs20070613"
#
# add_dir "packages/qemu/qemu-0.9.1"
#
# add_file "conf/distro/chinook-compat.conf"
# content [7567172718a5b4eadcd1df5d2f7fa4b65943e7bc]
#
# add_file "packages/qemu/qemu-0.9.1/02_snapshot_use_tmpdir.patch"
# content [95902abe972c0117b57d54242b10952345ad4b64]
#
# add_file "packages/qemu/qemu-0.9.1/04_do_not_print_rtc_freq_if_ok.patch"
# content [dc742810735d00dedfd8e47af80dcefc5fa4ad30]
#
# add_file "packages/qemu/qemu-0.9.1/05_non-fatal_if_linux_hd_missing.patch"
# content [a45f7e0569343444159e17aa9fd8ee9b7a403ce5]
#
# add_file "packages/qemu/qemu-0.9.1/06_exit_segfault.patch"
# content [190ff8bb34781d01170ad2974986e93edeff7cd9]
#
# add_file "packages/qemu/qemu-0.9.1/10_signal_jobs.patch"
# content [4d3f0bdffd2255604b99f94fe849843e67804bc7]
#
# add_file "packages/qemu/qemu-0.9.1/11_signal_sigaction.patch"
# content [6239c97a4310fdeb0675ca01e242b016666590a9]
#
# add_file "packages/qemu/qemu-0.9.1/22_net_tuntap_stall.patch"
# content [1b0b93a8b629817174131a8393132f08eeecfda4]
#
# add_file "packages/qemu/qemu-0.9.1/31_syscalls.patch"
# content [5c1853f29c22b55d13d63f5d9ba9709984fef2af]
#
# add_file "packages/qemu/qemu-0.9.1/32_syscall_sysctl.patch"
# content [21e97cfce4fddc8cb3bd4d23f5447d334e4022a2]
#
# add_file "packages/qemu/qemu-0.9.1/33_syscall_ppc_clone.patch"
# content [e2e68ae57624332c35776b8580a1d048eaa8dede]
#
# add_file "packages/qemu/qemu-0.9.1/39_syscall_fadvise64.patch"
# content [c8c52af469c5cfc5904d54ebf0af65a8cd6437ba]
#
# add_file "packages/qemu/qemu-0.9.1/41_arm_fpa_sigfpe.patch"
# content [c51650ba7f46b4801d03d21d9e8150ac96863b8d]
#
# add_file "packages/qemu/qemu-0.9.1/52_ne2000_return.patch"
# content [8973070f701de392c97d4f32fea5a9e7de00b616]
#
# add_file "packages/qemu/qemu-0.9.1/61_safe_64bit_int.patch"
# content [6ddfc1d5cdb4fe41040dad5ec86e383eb999ebe9]
#
# add_file "packages/qemu/qemu-0.9.1/63_sparc_build.patch"
# content [cf4ece7a04ba8082b3073610abac5eb803e9cd1e]
#
# add_file "packages/qemu/qemu-0.9.1/64_ppc_asm_constraints.patch"
# content [1811eca7e62890eaf038db253e8fa5b740f33ac6]
#
# add_file "packages/qemu/qemu-0.9.1/65_kfreebsd.patch"
# content [8cd0a0ee2ef25dab8ab6e59789f002ca7ad20f4b]
#
# add_file "packages/qemu/qemu-0.9.1/66_tls_ld.patch"
# content [9e2466568d6db535b1b17dc742a79e92d52352a1]
#
# add_file "packages/qemu/qemu-0.9.1/91-oh-sdl-cursor.patch"
# content [642b23228c74ee687f714e65d40106df5d169c1a]
#
# add_file "packages/qemu/qemu-0.9.1/configure_symlinkpath_fix.patch"
# content [15a06b3cc6b9f433e490f0604650c9c3190de395]
#
# add_file "packages/qemu/qemu-0.9.1/disable-error-in-configure.patch"
# content [9bae702ad57a8ee872355ec2cd71a787c478aae5]
#
# add_file "packages/qemu/qemu-0.9.1/fix_segfault.patch"
# content [2646a90e5332ddd40d4b0a2ea79145e510bd67e9]
#
# add_file "packages/qemu/qemu-0.9.1/qemu-0.9.0-nptl-update.patch"
# content [2f21635fe80c86f7311a4776e181f2380b6215c2]
#
# add_file "packages/qemu/qemu-0.9.1/qemu-0.9.0-nptl.patch"
# content [75ca42868beee91e9155a7a6db9ea2ff93259df1]
#
# add_file "packages/qemu/qemu-0.9.1/qemu-amd64-32b-mapping-0.9.0.patch"
# content [0619779f8b4801fe92c6d4a66349416725ec6611]
#
# add_file "packages/qemu/qemu-0.9.1/series"
# content [398e69c1be43e04a7c477db74731f30c2ffc71ce]
#
# add_file "packages/qemu/qemu-0.9.1/workaround_bad_futex_headers.patch"
# content [950b6e78d486a94bcf1599f931f55c59d2ef6001]
#
# add_file "packages/qemu/qemu-native_0.9.1.bb"
# content [5bfe05d88f23ceb44703b3bcf45fa5973e346c35]
#
# add_file "packages/qemu/qemu_0.9.1.bb"
# content [93195f797645fce4947d446dc05698e7e5ec094d]
#
============================================================
--- conf/distro/chinook-compat.conf 7567172718a5b4eadcd1df5d2f7fa4b65943e7bc
+++ conf/distro/chinook-compat.conf 7567172718a5b4eadcd1df5d2f7fa4b65943e7bc
@@ -0,0 +1,166 @@
+#@--------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Chinook-compatible
+#@--------------------------------------------------------------------
+
+DISTRO = "chinook-compat"
+DISTRO_NAME = "Chinook-compat"
+DISTRO_VERSION = "test-${DATE}"
+DISTRO_TYPE = "debug"
+#DISTRO_TYPE = "release"
+
+require conf/distro/include/angstrom-glibc.inc
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -O1"
+
+INHERIT += "package_deb debian"
+TARGET_OS = "linux-gnueabi"
+
+TARGET_FPU_nokia770 = "soft"
+TARGET_FPU_nokia800 = "hard"
+
+DPKG_ARCH_nokia770 = "armel"
+DPKG_ARCH_nokia800 = "armel"
+
+FEED_ARCH_nokia770 = "armv5te"
+
+# Actually n800 is armv6 but we are using armv5te because qemu does not emulate
+# armv6 yet.
+FEED_ARCH_nokia800 = "armv5te"
+#FEED_ARCH_nokia800 = "armv6"
+
+#Make sure we use 2.6 on machines with a 2.4/2.6 selector
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+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/libc = "glibc"
+
+# NPTL stuff
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+
+PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-binutils = "binutils-cross"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-header"
+
+PREFERRED_VERSION_automake-native = "1.9.6"
+
+PREFERRED_VERSION_binutils = "2.17.50.0.12"
+PREFERRED_VERSION_binutils-cross = "2.18"
+
+PREFERRED_VERSION_gcc = "3.4.4+csl-arm-2005q3"
+PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3"
+PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3"
+
+# Use recent enough version of the headers to let HAL build successfully.
+PREFERRED_VERSION_linux-libc-headers = "2.6.20"
+
+PREFERRED_VERSION_glibc = "2.5"
+PREFERRED_VERSION_glibc-intermediate = "2.5"
+PREFERRED_VERSION_glibc-initial = "2.5"
+
+PREFERRED_VERSION_libtool = "1.5.6"
+
+require conf/distro/include/sane-srcrevs.inc
+
+PREFERRED_VERSION_fontconfig = "2.4.1"
+PREFERRED_VERSION_freetype = "2.2.1"
+PREFERRED_VERSION_freetype-native = "2.2.1"
+PREFERRED_VERSION_cairo = "1.4.10"
+PREFERRED_VERSION_glib-2.0 = "2.12.12"
+PREFERRED_VERSION_pango = "1.16.4"
+PREFERRED_VERSION_atk = "1.18.0"
+PREFERRED_VERSION_gtk+ = "2.10.14"
+
+PREFERRED_VERSION_gnome-vfs = "2.16"
+# 3.9.1 would be correct
+PREFERRED_VERSION_gtkhtml-3.8 = "3.8.2"
+# 2.6.27 would be correct
+PREFERRED_VERSION_libxml = "2.6.29"
+# 2.16 would be correct
+PREFERRED_VERSION_gconf = "2.6.1"
+
+# gstreamer
+# 0.10.13 would be correct (+ maemo patches)
+PREFERRED_VERSION_gstreamer = "0.10.14"
+PREFERRED_VERSION_gst-plugins-good = "0.10.6"
+# 0.10.13 would be correct (+ maemo patches)
+PREFERRED_VERSION_gst-plugins-base = "0.10.14"
+# 0.11.3 would be correct ( + maemo patches)
+PREFERRED_VERSION_gst-ffmpeg = "0.10.2"
+
+PREFERRED_PROVIDER_virtual/db = "db"
+PREFERRED_PROVIDER_virtual/db-native = "db-native"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
+# This is a hack to avoid building mesa which crashes the compiler
+PREFERRED_PROVIDER_virtual/libsdl = "libsdl-directfb"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+PREFERRED_VERSION_xserver-kdrive = "1.3.0.0"
+PREFERRED_VERSION_libxrandr = "1.2.1"
+PREFERRED_VERSION_xrandr = "1.2.0"
+PREFERRED_VERSION_randrproto = "1.2.1"
+
+PREFERRED_VERSION_libgnomeui = "2.18.1"
+
+PREFERRED_PROVIDER_gtk+ = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ani = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-gif = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ico = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-png = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ras = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-tga = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm = "gtk+"
+
+PREFERRED_PROVIDER_gconf = "gconf"
+
+PREFERRED_VERSION_pixman = "0.9.6"
+
+PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt"
+PREFERRED_PROVIDER_avahi = "avahi"
+
+# Prevent chosing jikes-native (until java bootstrap patch is merged).
+PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
+
+PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
+
+PREFERRED_VERSION_libsoup = "2.2.7"
+PREFERRED_VERSION_libglade = "2.4.2"
+PREFERRED_VERSION_gnutls = "1.4.5"
+PREFERRED_VERSION_libgpg-error = "1.0"
+PREFERRED_VERSION_libgcrypt = "1.2.3"
+
+PREFERRED_VERSION_gpe-scap = "1.3"
+
+# Does not compile with the CodeSourcery compiler .. :(
+PREFERRED_VERSION_kaffe = "1.1.8+cvs20080120"
+PREFERRED_VERSION_kaffeh-native = "1.1.8+cvs20080120"
+
+# WARNING: If you change these values after the respective package has
+# been built the change will have no effect. Edit the package's file in
+# ${STAGING}/pkgdata/runtime then.
+PKG_ncurses = "libncurses5"
+PKG_ncurses-tools = "ncurses-bin"
+PKG_ncurses-terminfo = "ncurses-base"
+
+PKG_gtk+ = "libgtk2.0-0"
+PKG_pango = "libpango1.0-0"
+PKG_atk = "libatk1.0-0"
+PKG_glib-2.0 = "libglib2.0-0"
+PKG_gconf = "libgconf2-6"
+DEBIANNAME_dbus_pn-dbus = "dbus"
+PKG_hildon-1 = "libhildon1"
+
+PKG_zlib = "zlib1g"
+PKG_libglade = "libglade2-0"
+PKG_libsoup = "libsoup2.2-8"
============================================================
--- packages/qemu/qemu-0.9.1/02_snapshot_use_tmpdir.patch 95902abe972c0117b57d54242b10952345ad4b64
+++ packages/qemu/qemu-0.9.1/02_snapshot_use_tmpdir.patch 95902abe972c0117b57d54242b10952345ad4b64
@@ -0,0 +1,23 @@
+#DPATCHLEVEL=0
+---
+# block.c | 6 +++++-
+# 1 file changed, 5 insertions(+), 1 deletion(-)
+#
+Index: block.c
+===================================================================
+--- block.c.orig 2007-12-03 23:47:25.000000000 +0000
++++ block.c 2007-12-03 23:47:31.000000000 +0000
+@@ -191,8 +191,12 @@ void get_tmp_filename(char *filename, in
+ void get_tmp_filename(char *filename, int size)
+ {
+ int fd;
++ char *tmpdir;
+ /* XXX: race condition possible */
+- pstrcpy(filename, size, "/tmp/vl.XXXXXX");
++ tmpdir = getenv("TMPDIR");
++ if (!tmpdir)
++ tmpdir = "/tmp";
++ snprintf(filename, size, "%s/vl.XXXXXX", tmpdir);
+ fd = mkstemp(filename);
+ close(fd);
+ }
============================================================
--- packages/qemu/qemu-0.9.1/04_do_not_print_rtc_freq_if_ok.patch dc742810735d00dedfd8e47af80dcefc5fa4ad30
+++ packages/qemu/qemu-0.9.1/04_do_not_print_rtc_freq_if_ok.patch dc742810735d00dedfd8e47af80dcefc5fa4ad30
@@ -0,0 +1,26 @@
+#DPATCHLEVEL=1
+---
+# vl.c | 5 ++++-
+# 1 file changed, 4 insertions(+), 1 deletion(-)
+#
+Index: qemu/vl.c
+===================================================================
+--- qemu.orig/vl.c 2007-12-03 15:44:35.000000000 +0000
++++ qemu/vl.c 2007-12-03 15:51:03.000000000 +0000
+@@ -1289,12 +1289,15 @@ static void hpet_stop_timer(struct qemu_
+
+ static int rtc_start_timer(struct qemu_alarm_timer *t)
+ {
++ unsigned long current_rtc_freq = 0;
+ int rtc_fd;
+
+ TFR(rtc_fd = open("/dev/rtc", O_RDONLY));
+ if (rtc_fd < 0)
+ return -1;
+- if (ioctl(rtc_fd, RTC_IRQP_SET, RTC_FREQ) < 0) {
++ ioctl(rtc_fd, RTC_IRQP_READ, ¤t_rtc_freq);
++ if (current_rtc_freq != RTC_FREQ &&
++ ioctl(rtc_fd, RTC_IRQP_SET, RTC_FREQ) < 0) {
+ fprintf(stderr, "Could not configure '/dev/rtc' to have a 1024 Hz timer. This is not a fatal\n"
+ "error, but for better emulation accuracy either use a 2.6 host Linux kernel or\n"
+ "type 'echo 1024 > /proc/sys/dev/rtc/max-user-freq' as root.\n");
============================================================
--- packages/qemu/qemu-0.9.1/05_non-fatal_if_linux_hd_missing.patch a45f7e0569343444159e17aa9fd8ee9b7a403ce5
+++ packages/qemu/qemu-0.9.1/05_non-fatal_if_linux_hd_missing.patch a45f7e0569343444159e17aa9fd8ee9b7a403ce5
@@ -0,0 +1,17 @@
+#DPATCHLEVEL=1
+---
+# hw/pc.c | 1 -
+# 1 file changed, 1 deletion(-)
+#
+Index: qemu/hw/pc.c
+===================================================================
+--- qemu.orig/hw/pc.c 2007-12-03 23:47:25.000000000 +0000
++++ qemu/hw/pc.c 2007-12-03 23:47:38.000000000 +0000
+@@ -385,7 +385,6 @@ static void generate_bootsect(uint32_t g
+ if (bs_table[0] == NULL) {
+ fprintf(stderr, "A disk image must be given for 'hda' when booting "
+ "a Linux kernel\n");
+- exit(1);
+ }
+
+ memset(bootsect, 0, sizeof(bootsect));
============================================================
--- packages/qemu/qemu-0.9.1/06_exit_segfault.patch 190ff8bb34781d01170ad2974986e93edeff7cd9
+++ packages/qemu/qemu-0.9.1/06_exit_segfault.patch 190ff8bb34781d01170ad2974986e93edeff7cd9
@@ -0,0 +1,45 @@
+#DPATCHLEVEL=0
+---
+# linux-user/main.c | 8 ++++----
+# 1 file changed, 4 insertions(+), 4 deletions(-)
+#
+Index: linux-user/main.c
+===================================================================
+--- linux-user/main.c.orig 2007-12-03 23:47:25.000000000 +0000
++++ linux-user/main.c 2007-12-03 23:47:41.000000000 +0000
+@@ -714,7 +714,7 @@ void cpu_loop (CPUSPARCState *env)
+ default:
+ p%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rf37c4d25879e2b68bedfa992671306a142e8181d -rc52156528d815f33e82a36a7efed684a7d43dee4
#
#
#
# patch "conf/machine/include/zaurus-2.6.inc"
# from [369ab4994dfbf2ae3f9cedb438e595502fa29ebc]
# to [39d33e732bf59736015329814890e175fef292aa]
#
# patch "packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb"
# from [7bcc0559527de7fa6dc5913757e48a1337fcd7e8]
# to [de07ac05a73eb359a3249b9850f1527893d391a7]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-collie"
# from [88dce40b70e6ac0eb07620e56083f4a05686eb7a]
# to [9b2c70575288716c8ab9954a8ffba6ab29a2bea6]
#
# patch "packages/linux/linux-rp.inc"
# from [f6ead960d9a72e9da49bbcc20e05e0c2c0642a00]
# to [955d75bfe07f7f78a1bb382972543be8f55ae216]
#
# patch "packages/linux/linux-rp_2.6.24.bb"
# from [e8b8caca563d7b9223ac2feb23b463dac5a36045]
# to [f4ce0a6d362f7ef0d1493f8b2e5e3332f72403e8]
#
# patch "packages/tasks/task-base.bb"
# from [2ef7c7b6aa8d583973deb733c4c4ea6efdffe5eb]
# to [c13ff0dc014dd2c93926e1f1aef880d9dda3571c]
#
============================================================
--- conf/machine/include/zaurus-2.6.inc 369ab4994dfbf2ae3f9cedb438e595502fa29ebc
+++ conf/machine/include/zaurus-2.6.inc 39d33e732bf59736015329814890e175fef292aa
@@ -32,6 +32,8 @@ MACHINE_EXTRA_RRECOMMENDS_poodle = "kern
MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz"
MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
+MACHINE_EXTRA_RRECOMMENDS_collie = "kernel-module-locomo-spi kernel-module-sa1100-cs kernel-module-mmc-block \
+ kernel-module-collie-ts kernel-module-leds-locomo kernel-module-locomokbd"
GUI_MACHINE_CLASS = "bigscreen"
GUI_MACHINE_CLASS_collie = "smallscreen"
============================================================
--- packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb 7bcc0559527de7fa6dc5913757e48a1337fcd7e8
+++ packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb de07ac05a73eb359a3249b9850f1527893d391a7
@@ -12,6 +12,6 @@ do_stage () {
do_stage () {
cd gcc
- oe_runmake install-common install-headers install-libgcc
+ oe_runmake install-libgcc install-common install-headers
install -m 0755 xgcc ${CROSS_DIR}/bin/${TARGET_PREFIX}gcc-${PV}
}
============================================================
--- packages/linux/linux-rp-2.6.24/defconfig-collie 88dce40b70e6ac0eb07620e56083f4a05686eb7a
+++ packages/linux/linux-rp-2.6.24/defconfig-collie 9b2c70575288716c8ab9954a8ffba6ab29a2bea6
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.24-rc8
-# Mon Jan 21 22:14:20 2008
+# Linux kernel version: 2.6.24
+# Sun Jan 27 14:12:17 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -219,8 +219,7 @@ CONFIG_HZ=100
CONFIG_PREEMPT=y
CONFIG_NO_IDLE_HZ=y
CONFIG_HZ=100
-CONFIG_AEABI=y
-CONFIG_OABI_COMPAT=y
+# CONFIG_AEABI is not set
CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
CONFIG_NODES_SHIFT=2
CONFIG_SELECT_MEMORY_MODEL=y
@@ -245,7 +244,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
#
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 mem=32M fbcon=rotate:1 dyntick=enable debug"
+CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 mem=64M fbcon=rotate:1 dyntick=enable debug"
# CONFIG_XIP_KERNEL is not set
CONFIG_KEXEC=y
CONFIG_ATAGS_PROC=y
@@ -272,6 +271,7 @@ CONFIG_BINFMT_MISC=m
CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_AOUT=m
CONFIG_BINFMT_MISC=m
+# CONFIG_ARTHUR is not set
#
# Power management options
@@ -282,7 +282,7 @@ CONFIG_SUSPEND=y
CONFIG_PM_SLEEP=y
CONFIG_SUSPEND_UP_POSSIBLE=y
CONFIG_SUSPEND=y
-CONFIG_APM_EMULATION=m
+CONFIG_APM_EMULATION=y
#
# Networking
@@ -294,7 +294,7 @@ CONFIG_PACKET_MMAP=y
#
CONFIG_PACKET=m
CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=m
+CONFIG_UNIX=y
CONFIG_XFRM=y
CONFIG_XFRM_USER=m
# CONFIG_XFRM_SUB_POLICY is not set
@@ -324,7 +324,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
CONFIG_TCP_CONG_CUBIC=y
CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_TCP_MD5SIG is not set
-# CONFIG_IP_VS is not set
CONFIG_IPV6=m
# CONFIG_IPV6_PRIVACY is not set
# CONFIG_IPV6_ROUTER_PREF is not set
@@ -343,75 +342,7 @@ CONFIG_IPV6_TUNNEL=m
CONFIG_IPV6_TUNNEL=m
# CONFIG_IPV6_MULTIPLE_TABLES is not set
# CONFIG_NETWORK_SECMARK is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-
-#
-# Core Netfilter Configuration
-#
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NF_CONNTRACK_ENABLED is not set
-# CONFIG_NF_CONNTRACK is not set
-CONFIG_NETFILTER_XTABLES=m
-# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_TOS=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# IPv6: Netfilter Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP6_NF_QUEUE is not set
-# CONFIG_IP6_NF_IPTABLES is not set
+# CONFIG_NETFILTER is not set
# CONFIG_IP_DCCP is not set
# CONFIG_IP_SCTP is not set
# CONFIG_TIPC is not set
@@ -893,6 +824,7 @@ CONFIG_SPI_MASTER=y
# SPI Master Controller Drivers
#
# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_LOCOMO is not set
#
# SPI Protocol Masters
@@ -915,6 +847,8 @@ CONFIG_SSB_POSSIBLE=y
# Multifunction device drivers
#
# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_ASIC3 is not set
+# CONFIG_HTC_ASIC3_DS1WM is not set
#
# Multimedia Capabilities Port drivers
@@ -1330,14 +1264,14 @@ CONFIG_ENABLE_MUST_CHECK=y
# CONFIG_PRINTK_TIME is not set
CONFIG_ENABLE_WARN_DEPRECATED=y
CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_MAGIC_SYSRQ=y
+# CONFIG_MAGIC_SYSRQ is not set
# CONFIG_UNUSED_SYMBOLS is not set
# CONFIG_DEBUG_FS is not set
# CONFIG_HEADERS_CHECK is not set
CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_SHIRQ is not set
-CONFIG_DETECT_SOFTLOCKUP=y
-CONFIG_SCHED_DEBUG=y
+# CONFIG_DETECT_SOFTLOCKUP is not set
+# CONFIG_SCHED_DEBUG is not set
# CONFIG_SCHEDSTATS is not set
# CONFIG_TIMER_STATS is not set
# CONFIG_DEBUG_SLAB is not set
============================================================
--- packages/linux/linux-rp.inc f6ead960d9a72e9da49bbcc20e05e0c2c0642a00
+++ packages/linux/linux-rp.inc 955d75bfe07f7f78a1bb382972543be8f55ae216
@@ -56,10 +56,16 @@ module_autoload_snd-soc-poodle_poodle =
module_autoload_snd-soc-spitz_akita = "snd-soc-spitz"
module_autoload_snd-soc-spitz_spitz = "snd-soc-spitz"
module_autoload_snd-soc-poodle_poodle = "snd-soc-poodle"
+
module_autoload_locomo-spi_collie = "locomo-spi"
module_autoload_mmc_block_collie = "mmc_block"
-module_autoload_locomo-kbd_collie = "locomo-kbd"
+module_autoload_locomokbd_collie = "locomokbd"
+module_autoload_sa1100-cs_collie = "sa1100_cs"
+module_autoload_collie-ts_collie = "collie-ts"
+module_autoload_leds-locomo_collie = "leds-locomo"
+module_autoload_unix_collie = "unix"
+
do_configure() {
rm -f ${S}/.config
============================================================
--- packages/linux/linux-rp_2.6.24.bb e8b8caca563d7b9223ac2feb23b463dac5a36045
+++ packages/linux/linux-rp_2.6.24.bb f4ce0a6d362f7ef0d1493f8b2e5e3332f72403e8
@@ -1,6 +1,6 @@ require linux-rp.inc
require linux-rp.inc
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_collie = "1"
============================================================
--- packages/tasks/task-base.bb 2ef7c7b6aa8d583973deb733c4c4ea6efdffe5eb
+++ packages/tasks/task-base.bb c13ff0dc014dd2c93926e1f1aef880d9dda3571c
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r57"
+PR = "r58"
inherit task
@@ -168,7 +168,8 @@ RRECOMMENDS_task-base-kernel26 = "\
kernel-module-rtc-dev \
kernel-module-rtc-proc \
kernel-module-rtc-sysfs \
- kernel-module-rtc-sa1100"
+ kernel-module-rtc-sa1100 \
+ kernel-module-unix"
RDEPENDS_task-base-keyboard = "\
keymaps"
More information about the Openembedded-commits
mailing list