[oe-commits] org.oe.dev merge of '0f1b9dcedb4d611ce7ce7ca8935b934dbc44061c'

florian commit openembedded-commits at lists.openembedded.org
Thu Feb 7 13:25:53 UTC 2008


merge of '0f1b9dcedb4d611ce7ce7ca8935b934dbc44061c'
     and '8dadec7d9f47d3e60f4729a152204227dce39c49'

Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: c20a54aa8e31679eab91bd7856ec168bce74a60e
ViewMTN: http://monotone.openembedded.org/revision/info/c20a54aa8e31679eab91bd7856ec168bce74a60e
Files:
1
packages/libglade/libglade-2.0.1
packages/libglade/libglade-2.0.1/glade-cruft.patch
packages/libglade/libglade-2.4.0
packages/libglade/libglade-2.4.0/glade-cruft.patch
packages/libglade/libglade-2.4.0/no-xml2.patch
packages/libglade/libglade-2.4.2
packages/libglade/libglade-2.4.2/glade-cruft.patch
packages/libglade/libglade-2.4.2/no-xml2.patch
packages/libglade/libglade-2.5.1
packages/libglade/libglade-2.5.1/glade-cruft.patch
packages/libglade/libglade-2.5.1/no-xml2.patch
packages/libeventdb/libeventdb_0.90.bb
packages/libeventdb/libeventdb.inc
packages/libglade/libglade-2.0.1/gtk-2.0.m4
packages/libglade/files/gtk-2.0.m4
packages/libglade/libglade-2.5.1/no-deprecation.patch
packages/libglade/files/no-deprecation.patch
packages/libglade/libglade-2.6.2
packages/libglade/files
packages/libglade/libglade_2.6.2.bb
packages/libglade/libglade.inc
packages/postgresql/postgresql_8.2.4.bb
packages/postgresql/postgresql.inc
contrib/image-convert
packages/vorbis-tools/vorbis-tools-1.1.1
contrib/image-convert/README
contrib/image-convert/cpio2tar
contrib/image-convert/tar2ext2
contrib/image-convert/tar2ext2.mount
contrib/image-convert/tar2jffs
packages/initrdscripts/files/90-check-modules.sh
packages/initrdscripts/initramfs-module-check-modules_1.0.bb
packages/kismet/kismet.inc
packages/libao/libao_0.8.8.bb
packages/opkg/opkg-ipkg-compat.bb
packages/u-boot/u-boot-1.3.1/mpc8313e-rdb-autoboot.patch
packages/u-boot/u-boot-1.3.1/mpc8313e-rdb-nand.patch
packages/upnp/libupnp_1.4.2.bb
packages/ushare/ushare_1.1a.bb
packages/vorbis-tools/vorbis-tools-1.1.1/remove-deprecated-curl-option.patch
packages/vorbis-tools/vorbis-tools_1.1.1.bb
conf/distro/include/sane-srcrevs.inc
packages/angstrom/angstrom-feed-configs.bb
packages/freesmartphone/gsm0710muxd_svn.bb
packages/images/initramfs-bootmenu-image.bb
packages/images/initramfs-image.bb
packages/images/initramfs-minimal-image.bb
packages/kismet/kismet-newcore_svn.bb
packages/kismet/kismet_2007-01-R1b.bb
packages/kismet/kismet_2007-10-R1.bb
packages/kismet/kismet_svn.bb
packages/libeventdb/libeventdb_0.17.bb
packages/libeventdb/libeventdb_0.18.bb
packages/libeventdb/libeventdb_0.19.bb
packages/libeventdb/libeventdb_0.21.bb
packages/libeventdb/libeventdb_0.30.bb
packages/libeventdb/libeventdb_svn.bb
packages/libglade/libglade_2.0.1.bb
packages/libglade/libglade_2.4.0.bb
packages/libglade/libglade_2.4.2.bb
packages/libglade/libglade_2.5.1.bb
packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig
packages/linux/linux_2.6.23.bb
packages/mtpaint/mtpaint_3.02.bb
packages/postgresql/postgresql_8.1.4.bb
packages/postgresql/postgresql_8.1.8.bb
packages/python/python-2.5.1/sitecustomize.py
packages/python/python_2.5.1.bb
mtn:execute
true
packages/linux/linux-2.6.23/netvista
packages/linux/linux-2.6.23/netvista/defconfig
packages/xserver-common/xserver-common_1.20.bb
conf/machine/netvista.conf
Diffs:

#
# mt diff -r0f1b9dcedb4d611ce7ce7ca8935b934dbc44061c -rc20a54aa8e31679eab91bd7856ec168bce74a60e
#
# 
# 
# delete "packages/libglade/libglade-2.0.1"
# 
# delete "packages/libglade/libglade-2.0.1/glade-cruft.patch"
# 
# delete "packages/libglade/libglade-2.4.0"
# 
# delete "packages/libglade/libglade-2.4.0/glade-cruft.patch"
# 
# delete "packages/libglade/libglade-2.4.0/no-xml2.patch"
# 
# delete "packages/libglade/libglade-2.4.2"
# 
# delete "packages/libglade/libglade-2.4.2/glade-cruft.patch"
# 
# delete "packages/libglade/libglade-2.4.2/no-xml2.patch"
# 
# delete "packages/libglade/libglade-2.5.1"
# 
# delete "packages/libglade/libglade-2.5.1/glade-cruft.patch"
# 
# delete "packages/libglade/libglade-2.5.1/no-xml2.patch"
# 
# rename "packages/libeventdb/libeventdb_0.90.bb"
#     to "packages/libeventdb/libeventdb.inc"
# 
# rename "packages/libglade/libglade-2.0.1/gtk-2.0.m4"
#     to "packages/libglade/files/gtk-2.0.m4"
# 
# rename "packages/libglade/libglade-2.5.1/no-deprecation.patch"
#     to "packages/libglade/files/no-deprecation.patch"
# 
# rename "packages/libglade/libglade-2.6.2"
#     to "packages/libglade/files"
# 
# rename "packages/libglade/libglade_2.6.2.bb"
#     to "packages/libglade/libglade.inc"
# 
# rename "packages/postgresql/postgresql_8.2.4.bb"
#     to "packages/postgresql/postgresql.inc"
# 
# add_dir "contrib/image-convert"
# 
# add_dir "packages/vorbis-tools/vorbis-tools-1.1.1"
# 
# add_file "contrib/image-convert/README"
#  content [6a51a30551e511575545a5fd8f73323e24a5a25e]
# 
# add_file "contrib/image-convert/cpio2tar"
#  content [e07f0f5d36511dd5de463b7f681d718aa5a217a0]
# 
# add_file "contrib/image-convert/tar2ext2"
#  content [d85040f059d884124f04ced0190c90dd4f07e0aa]
# 
# add_file "contrib/image-convert/tar2ext2.mount"
#  content [f3a784276701f55e27d354d61098277d73ad6103]
# 
# add_file "contrib/image-convert/tar2jffs"
#  content [351ffdf2f7346259f133eeed2e6477c83e34d59a]
# 
# add_file "packages/initrdscripts/files/90-check-modules.sh"
#  content [e60f755f3b8a6d72a799b68ff1a7291714bce727]
# 
# add_file "packages/initrdscripts/initramfs-module-check-modules_1.0.bb"
#  content [fbcef5b65fba763e3f80cb8690e058b469db5f03]
# 
# add_file "packages/kismet/kismet.inc"
#  content [6d7f0ae5376d1127a682ca46b5c14143495885a1]
# 
# add_file "packages/libao/libao_0.8.8.bb"
#  content [b0b9daad5efb3df2ad278c61f784f9d44d848959]
# 
# add_file "packages/libeventdb/libeventdb_0.90.bb"
#  content [f7cd7ccf69494c816675221c17c3899b3485ad74]
# 
# add_file "packages/libglade/libglade_2.6.2.bb"
#  content [260a55eda5df2583b5a81605299e62f43424f7c7]
# 
# add_file "packages/opkg/opkg-ipkg-compat.bb"
#  content [f9bba36069b6fa8993aa13524c9e9242cb594108]
# 
# add_file "packages/postgresql/postgresql_8.2.4.bb"
#  content [41ca5b2fb5d019ac39217a5c0179b31e6f22ec24]
# 
# add_file "packages/u-boot/u-boot-1.3.1/mpc8313e-rdb-autoboot.patch"
#  content [d10d1edb2510c27cbbfca47e962cfc8da45f0788]
# 
# add_file "packages/u-boot/u-boot-1.3.1/mpc8313e-rdb-nand.patch"
#  content [64eee6cc9ba75710f130f074b0632df44049ca14]
# 
# add_file "packages/upnp/libupnp_1.4.2.bb"
#  content [5954835ded65c76dd5353b45114a58452af0e8c7]
# 
# add_file "packages/ushare/ushare_1.1a.bb"
#  content [bbb32d6dd91881d091868f8ac695e9f334a1bd22]
# 
# add_file "packages/vorbis-tools/vorbis-tools-1.1.1/remove-deprecated-curl-option.patch"
#  content [6360e706032992cfec98e59e97045e45974e3a9c]
# 
# add_file "packages/vorbis-tools/vorbis-tools_1.1.1.bb"
#  content [db34e3d02c83e5377aa24467f9f43ceabb94833e]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [fb575d442b03b48609b0ce08a42fbfd9b34c140b]
#    to [5ee65f7cf7e09a0829aa4594da6e1facf3aaf7bd]
# 
# patch "packages/angstrom/angstrom-feed-configs.bb"
#  from [00be167d12290e5397a37b2c96241288c530a27b]
#    to [486fc4918f2c8a68142e81f078766cb17d1af82c]
# 
# patch "packages/freesmartphone/gsm0710muxd_svn.bb"
#  from [03f62477a6bd8456dc0f7e5444bf0e62bf2575c3]
#    to [b58fedc1f5b1fff05ee4090f2383de57cd3970da]
# 
# patch "packages/images/initramfs-bootmenu-image.bb"
#  from [8f1db3a032593d55326052d8031210f27d4194a9]
#    to [2338c2a27bfad430d95e665a283ae145d7e0dfce]
# 
# patch "packages/images/initramfs-image.bb"
#  from [16330772de554a7ddfd102c78519476ac56c84bd]
#    to [0d884f4dd165ce4f703bdf6ab9d55cfe5f3c3884]
# 
# patch "packages/images/initramfs-minimal-image.bb"
#  from [dbd98cff25cbaf41dce93c25db637d21705ffa51]
#    to [dd0f0126b7a188c7a4441a21b0ce881cf4e342b5]
# 
# patch "packages/kismet/kismet-newcore_svn.bb"
#  from [613997394be7e86e20920124bb2c4b10ce09a6d6]
#    to [312f6dbfa409f99e4016d13495545a9846e66abc]
# 
# patch "packages/kismet/kismet_2007-01-R1b.bb"
#  from [7e83fb1593b2bd1fd42096c78c76fda8b806160c]
#    to [44c52fb61cc91d305df7c9f9ad5404b97f45f5c4]
# 
# patch "packages/kismet/kismet_2007-10-R1.bb"
#  from [b8971fcf7ccf5f139688680c6faccc7b2cfe9bff]
#    to [44c52fb61cc91d305df7c9f9ad5404b97f45f5c4]
# 
# patch "packages/kismet/kismet_svn.bb"
#  from [318ffe650be4c09ccb40afed1857af643d02a724]
#    to [a4c2a34319b0225d1132aa1120dfc35897253ead]
# 
# patch "packages/libeventdb/libeventdb.inc"
#  from [00bd0aa085967a7c614d37c15c639bb8dd8b0aea]
#    to [a989080bd8f6c5e9bead8f2aef1390e8f18eb364]
# 
# patch "packages/libeventdb/libeventdb_0.17.bb"
#  from [e4f740a1da36d08411746bd620766e9de47cf35e]
#    to [e77aba843d815849ce95a84393a37fa78a359bea]
# 
# patch "packages/libeventdb/libeventdb_0.18.bb"
#  from [6a43edb6d181d65868ea41557f63b1a92c5015ea]
#    to [f7cd7ccf69494c816675221c17c3899b3485ad74]
# 
# patch "packages/libeventdb/libeventdb_0.19.bb"
#  from [6582a9e961827dac38d33e493ed393631b60098c]
#    to [f7cd7ccf69494c816675221c17c3899b3485ad74]
# 
# patch "packages/libeventdb/libeventdb_0.21.bb"
#  from [6582a9e961827dac38d33e493ed393631b60098c]
#    to [f7cd7ccf69494c816675221c17c3899b3485ad74]
# 
# patch "packages/libeventdb/libeventdb_0.30.bb"
#  from [a915b3f9c63bec0af8eee4b072c3b770c2826452]
#    to [ec33b40bd80787f59bdfce33e4b898ec82fb755a]
# 
# patch "packages/libeventdb/libeventdb_svn.bb"
#  from [2664184e6630ade5d75ac8cc129d94d7b036f5f4]
#    to [8dd94097d1b481e31f78af12926e04181cf14cbd]
# 
# patch "packages/libglade/libglade.inc"
#  from [d94670ece5e8b9e8e3e0ba00b7744b565be182af]
#    to [436c12a98f08dbbdf23435a5f7427334a373b13b]
# 
# patch "packages/libglade/libglade_2.0.1.bb"
#  from [5b9997972462185f7650879d29314cf970269214]
#    to [4f7237e7991a74e49681d098a30a11727f4f6eda]
# 
# patch "packages/libglade/libglade_2.4.0.bb"
#  from [1522a52bfc4e1fd114cbcbdf0dcc668d5d2ae51d]
#    to [4e7c0d5e52113288c7c519a8b542e7638929bc46]
# 
# patch "packages/libglade/libglade_2.4.2.bb"
#  from [77537a247a98aa71ce5b3b06eb9ab78407ee23a3]
#    to [883f2c0f0b8d2ec182afa3f3cd1b08c0c0d80257]
# 
# patch "packages/libglade/libglade_2.5.1.bb"
#  from [ea9815d992df837e1c5913b615a6ea5130f2d9e5]
#    to [71f7284eedd6ea02babe87719f55b96727f9cb09]
# 
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig"
#  from [cf9f8cb9fd5be055814a58a31b7eafe2772a8658]
#    to [31fbac69083a743610a7b45b209c1eedf231ea8f]
# 
# patch "packages/linux/linux_2.6.23.bb"
#  from [1ed6e5009df4110d04d11f9a3286167c70a681b6]
#    to [d0076453dce6a15a60ac441aaedca4b4d35b86da]
# 
# patch "packages/mtpaint/mtpaint_3.02.bb"
#  from [0d31847e5b9445f2d65b9de6540705a4c3ae6a97]
#    to [02c54288bb93202f5af441ac113ed5bf75869d11]
# 
# patch "packages/postgresql/postgresql.inc"
#  from [969bc54ca34868f98644e9c9079ec2525cc08bbc]
#    to [e37431b7065b95ed185a1fa0cc6c30c0d2898034]
# 
# patch "packages/postgresql/postgresql_8.1.4.bb"
#  from [98fe892b8cf4a6013e48a0e9e68aca394fbe2e47]
#    to [deb1ab6389bb118cc689529caaaf09ec341b5fa2]
# 
# patch "packages/postgresql/postgresql_8.1.8.bb"
#  from [3457236ec656fc67c87d390af818ef6b2f5b9f75]
#    to [deb1ab6389bb118cc689529caaaf09ec341b5fa2]
# 
# patch "packages/python/python-2.5.1/sitecustomize.py"
#  from [af970496467ab4f0fbef36bbcac4de27afc77306]
#    to [37922f91ecd1cbccb466f30c120aeabfd2a0ae05]
# 
# patch "packages/python/python_2.5.1.bb"
#  from [55634fe124616917620d9a3239b160c4abcfd772]
#    to [6d27b00bf376c2bb92ca2334ea83cc13b1d06aa0]
# 
#   set "contrib/image-convert/cpio2tar"
#  attr "mtn:execute"
# value "true"
# 
#   set "contrib/image-convert/tar2ext2"
#  attr "mtn:execute"
# value "true"
# 
#   set "contrib/image-convert/tar2ext2.mount"
#  attr "mtn:execute"
# value "true"
# 
#   set "contrib/image-convert/tar2jffs"
#  attr "mtn:execute"
# value "true"
# 
============================================================
--- contrib/image-convert/README	6a51a30551e511575545a5fd8f73323e24a5a25e
+++ contrib/image-convert/README	6a51a30551e511575545a5fd8f73323e24a5a25e
@@ -0,0 +1,5 @@
+This directory contains scripts to convert (root) filesystem images from one
+format to another. While OpenEmbedded has extensive support for generating
+images in various formats, sometimes it may be useful/needed to convert
+already existing image.
+
============================================================
--- contrib/image-convert/cpio2tar	e07f0f5d36511dd5de463b7f681d718aa5a217a0
+++ contrib/image-convert/cpio2tar	e07f0f5d36511dd5de463b7f681d718aa5a217a0
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+STAGING= #~/linux-ppc/build-oe-angstrom/tmp/staging/i686-linux/bin/
+
+${STAGING}fakeroot bash -c " \
+rm -rf scratch; mkdir scratch; \
+cd scratch; gzip -d -c ../$1 | cpio -i --make-directories; \
+cd ..; \
+tar -cj -C scratch -f $(basename $1 .cpio.gz).tar.bz2 ."
============================================================
--- contrib/image-convert/tar2ext2	d85040f059d884124f04ced0190c90dd4f07e0aa
+++ contrib/image-convert/tar2ext2	d85040f059d884124f04ced0190c90dd4f07e0aa
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+if [ $# -ne 2 ]; then
+    echo "Usage: $0 <tarball> <ext2 size>"
+    exit
+fi
+
+ext=`echo $1 | sed -r -e 's/.+\.([^.]+\.[^.]+)/\1/'`
+base=$(basename $1 .$ext)
+dir=$(dirname $1)
+
+if [ "$ext" == "tar.bz2" ]; then
+    uncompress=j
+else
+    uncompress=z
+fi
+
+rm -rf mnt
+mkdir -p mnt
+
+fakeroot bash -c "\
+tar -x$uncompress -f $1 -C mnt; \
+genext2fs -d mnt -b $(($2 * 1024)) $dir/$base.img; \
+rm -rf mnt; \
+"
============================================================
--- contrib/image-convert/tar2ext2.mount	f3a784276701f55e27d354d61098277d73ad6103
+++ contrib/image-convert/tar2ext2.mount	f3a784276701f55e27d354d61098277d73ad6103
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+if [ $# -ne 2 ]; then
+    echo "Usage: $0 <tarball> <ext2 size>"
+    exit
+fi
+
+ext=`echo $1 | sed -r -e 's/.+\.([^.]+\.[^.]+)/\1/'`
+base=$(basename $1 .$ext)
+if [ "$ext" == "tar.bz2" ]; then
+    uncompress=j
+else
+    uncompress=z
+fi
+
+dd if=/dev/zero of=$base.img bs=1M count=$2
+mkfs.ext2 -F -m1 $base.img
+
+mkdir -p mnt
+mount -o loop $base.img mnt
+
+tar -x$uncompress -f $1 -C mnt
+
+umount mnt
+rm -rf mnt
============================================================
--- contrib/image-convert/tar2jffs	351ffdf2f7346259f133eeed2e6477c83e34d59a
+++ contrib/image-convert/tar2jffs	351ffdf2f7346259f133eeed2e6477c83e34d59a
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+STAGING= #~/linux-ppc/build-oe-angstrom/tmp/staging/i686-linux/bin/
+
+${STAGING}fakeroot bash -c " \
+rm -rf scratch; mkdir scratch; \
+tar -xj -f $1 -C scratch; \
+${STAGING}mkfs.jffs2 -x lzo --root=scratch --faketime --output=$(dirname $1)/$(basename $1 .tar.bz2).jffs2"
============================================================
--- packages/initrdscripts/files/90-check-modules.sh	e60f755f3b8a6d72a799b68ff1a7291714bce727
+++ packages/initrdscripts/files/90-check-modules.sh	e60f755f3b8a6d72a799b68ff1a7291714bce727
@@ -0,0 +1,24 @@
+#!/bin/sh
+# Check that modules for the current kernel exist, error out otherwise
+
+uname=`cat /proc/version`
+ver=`expr "x$uname" : 'xLinux version \([^ ]\+\) '`
+
+if [ -n "$BOOT_ROOT" -a ! -d "$BOOT_ROOT/lib/modules/$ver" ]; then
+    echo -e "\033[1m===================="
+    echo "ERROR!"
+    echo "There are no modules for this kernel"
+    echo "version ($ver) in the root file "
+    echo "system, which will lead to boot failure or"
+    echo "broken functionally. If you performed"
+    echo "a kernel upgrade, make sure that version"
+    echo "installed in root filesystem matches"
+    echo "version used in bootloader."
+    echo -e "====================\033[0m"
+    echo
+
+    echo "System halted"
+    while true; do
+	sleep 10000
+    done
+fi
============================================================
--- packages/initrdscripts/initramfs-module-check-modules_1.0.bb	fbcef5b65fba763e3f80cb8690e058b469db5f03
+++ packages/initrdscripts/initramfs-module-check-modules_1.0.bb	fbcef5b65fba763e3f80cb8690e058b469db5f03
@@ -0,0 +1,12 @@
+SRC_URI = "file://90-check-modules.sh"
+PR = "r0"
+DESCRIPTION = "An initramfs module for checking that kernel modules exist in rootfs"
+RDEPENDS = "initramfs-uniboot"
+
+do_install() {
+	install -d ${D}/initrd.d
+        install -m 0755 ${WORKDIR}/90-check-modules.sh ${D}/initrd.d/
+}
+
+PACKAGE_ARCH = "all"
+FILES_${PN} += " /initrd.d/* "
============================================================
--- packages/kismet/kismet.inc	6d7f0ae5376d1127a682ca46b5c14143495885a1
+++ packages/kismet/kismet.inc	6d7f0ae5376d1127a682ca46b5c14143495885a1
@@ -0,0 +1,33 @@
+DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
+HOMEPAGE = "http://www.kismetwireless.net/"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2 libpcap"
+
+SRC_URI = "http://www.kismetwireless.net/code/kismet-${PV}.tar.gz"
+
+EXTRA_OECONF = "--enable-wsp100 --with-pcap=linux \
+                --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
+
+inherit autotools
+
+fakeroot do_install() {
+     oe_runmake "DESTDIR=${D}" suidinstall
+}
+
+do_install_append() {
+	if test -e ${WORKDIR}/kismet.conf; then
+		install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/
+	fi
+}
+
+PACKAGES =+ "${PN}-sounds ${PN}-gpsmap"
+
+FILES_${PN}-sounds = "${datadir}/kismet/wav"
+RDEPENDS_${PN}-sounds = "sox"
+
+FILES_${PN}-gpsmap = "${bindir}/gpsmap*"
+RDEPENDS_${PN}-gpsmap = "gpsd"
+
+CONFFILES_${PN} = "${sysconfdir}/kismet.conf ${sysconfdir}/kismet_ui.conf ${sysconfdir}/kismet_drone.conf"
+
============================================================
--- packages/libao/libao_0.8.8.bb	b0b9daad5efb3df2ad278c61f784f9d44d848959
+++ packages/libao/libao_0.8.8.bb	b0b9daad5efb3df2ad278c61f784f9d44d848959
@@ -0,0 +1,39 @@
+LICENSE = "GPL"
+DESCRIPTION = "A cross platform audio library"
+HOMEPAGE = "http://www.xiph.org/ao/"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "alsa-lib pulseaudio"
+PROVIDES = "libao-alsa libao-alsa-plugin"
+PR = "r0"
+
+SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-esd --disable-esdtest \
+		--disable-alsa --enable-alsa09 \
+		--disable-arts --disable-nas \
+                --enable-pulse --enable-alsa09-mmap"
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/ao
+	install -m 0644 ${S}/include/ao/ao.h ${S}/include/ao/os_types.h \
+			${S}/include/ao/plugin.h ${STAGING_INCDIR}/ao/
+
+	oe_libinstall -so -C src libao ${STAGING_LIBDIR}
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 ao.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+PACKAGES =+ "${PN}-alsa ${PN}-alsa-dev ${PN}-pulse ${PN}-pulse-dev"
+
+FILES_${PN}-alsa = "${libdir}/ao/plugins-2/libalsa*.so"
+FILES_${PN}-alsa-dev = "${libdir}/ao/plugins-2/libalsa*.la"
+FILES_${PN}-pulse = "${libdir}/ao/plugins-2/libpulse*.so"
+FILES_${PN}-pulse-dev = "${libdir}/ao/plugins-2/libpulse*.la"
+
+FILES_${PN} += "${libdir}/ao/plugins-2/*.so"
+FILES_${PN}-dev += "${libdir}/ao/plugins-2/*.la"
+FILES_${PN}-dbg += "${libdir}/ao/plugins-2/.debug"
+
============================================================
--- packages/libeventdb/libeventdb_0.90.bb	f7cd7ccf69494c816675221c17c3899b3485ad74
+++ packages/libeventdb/libeventdb_0.90.bb	f7cd7ccf69494c816675221c17c3899b3485ad74
@@ -0,0 +1,3 @@
+require libeventdb.inc
+
+PR = "r1"
============================================================
--- packages/libglade/libglade_2.6.2.bb	260a55eda5df2583b5a81605299e62f43424f7c7
+++ packages/libglade/libglade_2.6.2.bb	260a55eda5df2583b5a81605299e62f43424f7c7
@@ -0,0 +1,11 @@
+require libglade.inc
+
+PR = "r2"
+
+inherit gnome
+
+SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1"
+
+EXTRA_OECONF += "--without-libxml2"
+
+LDFLAGS += "-lz"
=====================================================%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -r8dadec7d9f47d3e60f4729a152204227dce39c49 -rc20a54aa8e31679eab91bd7856ec168bce74a60e
#
# 
# 
# add_dir "packages/linux/linux-2.6.23/netvista"
# 
# add_file "packages/linux/linux-2.6.23/netvista/defconfig"
#  content [194cad167a3bd92c06baf952080953e93a7c0691]
# 
# add_file "packages/xserver-common/xserver-common_1.20.bb"
#  content [14f7d103bf373a302fc67211bc1c91f71605d7fb]
# 
# patch "conf/machine/netvista.conf"
#  from [4a37e5d3eb7a0ac06c088d3f1d6f68e27044f66b]
#    to [1e8916b0ef719e2519ead2446fbf85bb7d5a455a]
# 
============================================================
--- packages/linux/linux-2.6.23/netvista/defconfig	194cad167a3bd92c06baf952080953e93a7c0691
+++ packages/linux/linux-2.6.23/netvista/defconfig	194cad167a3bd92c06baf952080953e93a7c0691
@@ -0,0 +1,1614 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.23
+# Mon Feb  4 10:38:07 2008
+#
+CONFIG_X86_32=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_SEMAPHORE_SLEEPERS=y
+CONFIG_X86=y
+CONFIG_MMU=y
+CONFIG_ZONE_DMA=y
+CONFIG_QUICKLIST=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_DMI=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_USER_NS is not set
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+# CONFIG_BLK_DEV_INITRD is not set
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+
+#
+# Processor type and features
+#
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+# CONFIG_SMP is not set
+CONFIG_X86_PC=y
+# CONFIG_X86_ELAN is not set
+# CONFIG_X86_VOYAGER is not set
+# CONFIG_X86_NUMAQ is not set
+# CONFIG_X86_SUMMIT is not set
+# CONFIG_X86_BIGSMP is not set
+# CONFIG_X86_VISWS is not set
+# CONFIG_X86_GENERICARCH is not set
+# CONFIG_X86_ES7000 is not set
+# CONFIG_PARAVIRT is not set
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+CONFIG_M586=y
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+# CONFIG_M686 is not set
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP2 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+CONFIG_X86_GENERIC=y
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_L1_CACHE_SHIFT=7
+CONFIG_X86_XADD=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_X86_PPRO_FENCE=y
+CONFIG_X86_F00F_BUG=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_POPAD_OK=y
+CONFIG_X86_ALIGNMENT_16=y
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=4
+CONFIG_HPET_TIMER=y
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+# CONFIG_X86_UP_APIC is not set
+CONFIG_X86_MCE=y
+# CONFIG_X86_MCE_NONFATAL is not set
+CONFIG_VM86=y
+# CONFIG_TOSHIBA is not set
+# CONFIG_I8K is not set
+# CONFIG_X86_REBOOTFIXUPS is not set
+# CONFIG_MICROCODE is not set
+# CONFIG_X86_MSR is not set
+# CONFIG_X86_CPUID is not set
+
+#
+# Firmware Drivers
+#
+# CONFIG_EDD is not set
+# CONFIG_DELL_RBU is not set
+# CONFIG_DCDBAS is not set
+CONFIG_DMIID=y
+CONFIG_NOHIGHMEM=y
+# CONFIG_HIGHMEM4G is not set
+# CONFIG_HIGHMEM64G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+# CONFIG_X86_PAE is not set
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_SPARSEMEM_STATIC=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_NR_QUICK=1
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_MATH_EMULATION is not set
+CONFIG_MTRR=y
+# CONFIG_EFI is not set
+CONFIG_SECCOMP=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+# CONFIG_KEXEC is not set
+CONFIG_PHYSICAL_START=0x100000
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x100000
+CONFIG_COMPAT_VDSO=y
+
+#
+# Power management options (ACPI, APM)
+#
+CONFIG_PM=y
+CONFIG_PM_LEGACY=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND_UP_POSSIBLE=y
+CONFIG_SUSPEND=y
+CONFIG_HIBERNATION_UP_POSSIBLE=y
+# CONFIG_HIBERNATION is not set
+CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+# CONFIG_ACPI_PROCFS is not set
+CONFIG_ACPI_PROC_EVENT=y
+CONFIG_ACPI_AC=y
+CONFIG_ACPI_BATTERY=y
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_FAN=y
+# CONFIG_ACPI_DOCK is not set
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_THERMAL=y
+# CONFIG_ACPI_ASUS is not set
+# CONFIG_ACPI_TOSHIBA is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_EC=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_SYSTEM=y
+CONFIG_X86_PM_TIMER=y
+# CONFIG_ACPI_CONTAINER is not set
+# CONFIG_ACPI_SBS is not set
+CONFIG_APM=y
+CONFIG_APM_IGNORE_USER_SUSPEND=y
+CONFIG_APM_DO_ENABLE=y
+CONFIG_APM_CPU_IDLE=y
+CONFIG_APM_DISPLAY_BLANK=y
+CONFIG_APM_ALLOW_INTS=y
+# CONFIG_APM_REAL_MODE_POWER_OFF is not set
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
+#
+CONFIG_PCI=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+# CONFIG_PCI_GODIRECT is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+# CONFIG_PCIEPORTBUS is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_ISA_DMA_API=y
+# CONFIG_ISA is not set
+# CONFIG_MCA is not set
+# CONFIG_SCx200 is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_MISC=y
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IP_VS is not set
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL 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 is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_QUEUE=y
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIUSB=m
+CONFIG_BT_HCIUSB_SCO=y
+# CONFIG_BT_HCIUART is not set
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+CONFIG_WIRELESS_EXT=y
+# CONFIG_MAC80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+# CONFIG_IEEE80211_CRYPT_TKIP is not set
+CONFIG_IEEE80211_SOFTMAC=m
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+# CONFIG_MTD is not set
+CONFIG_PARPORT=y
+CONFIG_PARPORT_PC=y
+# CONFIG_PARPORT_SERIAL is not set
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+# CONFIG_PARPORT_GSC is not set
+# CONFIG_PARPORT_AX88796 is not set
+# CONFIG_PARPORT_1284 is not set
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG is not set
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_FD=y
+# CONFIG_PARIDE is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_IBM_ASM is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_SONY_LAPTOP is not set
+# CONFIG_THINKPAD_ACPI is not set
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+# CONFIG_BLK_DEV_HD_IDE is not set
+CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_IDEDISK_MULTI_MODE=y
+CONFIG_BLK_DEV_IDECD=y
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_BLK_DEV_IDESCSI is not set
+# CONFIG_BLK_DEV_IDEACPI is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+CONFIG_BLK_DEV_CMD640=y
+# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
+# CONFIG_BLK_DEV_IDEPNP is not set
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+CONFIG_IDEPCI_PCIBUS_ORDER=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_OPTI621 is not set
+CONFIG_BLK_DEV_RZ1000=y
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+# CONFIG_IDEDMA_ONLYDISK is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_ATIIXP is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_CS5535 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+CONFIG_BLK_DEV_PIIX=y
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SIS5513 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+# CONFIG_IDE_ARM is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+CONFIG_CHR_DEV_SG=y
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_SPI is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CO%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list