[oe-commits] org.oe.dev merge of '101eec5076cbe6de0504b5ce78498024e3c16e03'

oe commit oe at amethyst.openembedded.net
Tue Apr 15 14:07:11 UTC 2008


merge of '101eec5076cbe6de0504b5ce78498024e3c16e03'
     and '53534b02ad19a4d9ac608eedde7747fa84f7f8fc'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 0e3c598953a66b65fbda0d8827b027d6e2ae1b84
ViewMTN: http://monotone.openembedded.org/revision/info/0e3c598953a66b65fbda0d8827b027d6e2ae1b84
Files:
1
packages/wlan-ng/wlan-ng-modules-0.2.1-pre26
packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/config.in
packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/no-compat.patch
packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/only-the-modules.patch
packages/wlan-ng/wlan-ng-modules-0.2.3
packages/wlan-ng/wlan-ng-modules-0.2.3/config.in
packages/wlan-ng/wlan-ng-modules-0.2.3/module_param_array.patch
packages/wlan-ng/wlan-ng-modules-0.2.3/modules-symvers.patch
packages/wlan-ng/wlan-ng-modules-0.2.3/only-the-modules.patch
packages/wlan-ng/wlan-ng-modules-0.2.3/prism2sta_commsqual_defer.patch
packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823
packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-the-modules.patch
packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109
packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/only-the-modules.patch
packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb
packages/wlan-ng/wlan-ng-modules_0.2.3.bb
packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb
packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb
packages/wlan-ng/wlan-ng-modules_svn.bb
packages/wlan-ng/wlan-ng-utils-0.2.1-pre26
packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/config.in
packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/only-the-utils.patch
packages/wlan-ng/wlan-ng-utils-0.2.2
packages/wlan-ng/wlan-ng-utils-0.2.2/config.in
packages/wlan-ng/wlan-ng-utils-0.2.2/only-the-utils.patch
packages/wlan-ng/wlan-ng-utils-0.2.3
packages/wlan-ng/wlan-ng-utils-0.2.3/config.in
packages/wlan-ng/wlan-ng-utils-0.2.3/only-the-utils.patch
packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823
packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in
packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch
packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb
packages/wlan-ng/wlan-ng-utils_0.2.3.bb
packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb
packages/wlan-ng/wlan-ng-utils_svn.bb
packages/libtomcrypt/libtomcrypt_0.97b.bb
packages/libtomcrypt/libtomcrypt_1.17.bb
packages/klibc/files/wc.patch
packages/opkg/opkg-nogpg_svn.bb
packages/klibc/klibc-common.inc
packages/klibc/klibc-utils-static_1.5.bb
packages/klibc/klibc.inc
packages/klibc/klibc_1.5.bb
packages/libsdl/libsdl-qpe_1.2.9.bb
packages/libsdl/libsdl.inc
packages/swt/swt-gtk.inc
packages/swt/swt3.3-gtk_3.3.1.bb
packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb
packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb
packages/swt/swt3.4-gtk_3.3+3.4M3.bb
packages/swt/swt3.4-gtk_3.3+3.4M5.bb
packages/linux/linux-davinci/binutils-buildid-arm.patch
packages/linux/linux-davinci/davinci-nand.patch
packages/linux/linux-davinci/davinci-sffsdr/sffsdr.patch
conf/machine/davinci-sffsdr.conf
packages/linux/linux-davinci/davinci-sffsdr/defconfig
packages/linux/linux-davinci_2.6.x+git-davinci.bb
Diffs:

#
# mt diff -r101eec5076cbe6de0504b5ce78498024e3c16e03 -r0e3c598953a66b65fbda0d8827b027d6e2ae1b84
#
#
#
# delete "packages/wlan-ng/wlan-ng-modules-0.2.1-pre26"
# 
# delete "packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/config.in"
# 
# delete "packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/no-compat.patch"
# 
# delete "packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/only-the-modules.patch"
# 
# delete "packages/wlan-ng/wlan-ng-modules-0.2.3"
# 
# delete "packages/wlan-ng/wlan-ng-modules-0.2.3/config.in"
# 
# delete "packages/wlan-ng/wlan-ng-modules-0.2.3/module_param_array.patch"
# 
# delete "packages/wlan-ng/wlan-ng-modules-0.2.3/modules-symvers.patch"
# 
# delete "packages/wlan-ng/wlan-ng-modules-0.2.3/only-the-modules.patch"
# 
# delete "packages/wlan-ng/wlan-ng-modules-0.2.3/prism2sta_commsqual_defer.patch"
# 
# delete "packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823"
# 
# delete "packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-the-modules.patch"
# 
# delete "packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109"
# 
# delete "packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/only-the-modules.patch"
# 
# delete "packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb"
# 
# delete "packages/wlan-ng/wlan-ng-modules_0.2.3.bb"
# 
# delete "packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb"
# 
# delete "packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb"
# 
# delete "packages/wlan-ng/wlan-ng-modules_svn.bb"
# 
# delete "packages/wlan-ng/wlan-ng-utils-0.2.1-pre26"
# 
# delete "packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/config.in"
# 
# delete "packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/only-the-utils.patch"
# 
# delete "packages/wlan-ng/wlan-ng-utils-0.2.2"
# 
# delete "packages/wlan-ng/wlan-ng-utils-0.2.2/config.in"
# 
# delete "packages/wlan-ng/wlan-ng-utils-0.2.2/only-the-utils.patch"
# 
# delete "packages/wlan-ng/wlan-ng-utils-0.2.3"
# 
# delete "packages/wlan-ng/wlan-ng-utils-0.2.3/config.in"
# 
# delete "packages/wlan-ng/wlan-ng-utils-0.2.3/only-the-utils.patch"
# 
# delete "packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823"
# 
# delete "packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in"
# 
# delete "packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch"
# 
# delete "packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb"
# 
# delete "packages/wlan-ng/wlan-ng-utils_0.2.3.bb"
# 
# delete "packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb"
# 
# delete "packages/wlan-ng/wlan-ng-utils_svn.bb"
# 
# rename "packages/libtomcrypt/libtomcrypt_0.97b.bb"
#     to "packages/libtomcrypt/libtomcrypt_1.17.bb"
# 
# add_file "packages/klibc/files/wc.patch"
#  content [91dc314c8c1ad42f06a34d17214e5f6b6ee17b41]
# 
# add_file "packages/opkg/opkg-nogpg_svn.bb"
#  content [6a28b7179459ce3aa52c1ac8cb85a9de1743d5f2]
# 
# patch "packages/klibc/klibc-common.inc"
#  from [f63bcd79d6bf261ecf2b188db14fc0d05f566d49]
#    to [ccb876653934cbf5f4dab36b2e0f872ea6a374cf]
# 
# patch "packages/klibc/klibc-utils-static_1.5.bb"
#  from [294377bb13d3cf5efd6994870abd0ab9791b2c7b]
#    to [07d4992c0cf89657c8e8886c714616b2908143af]
# 
# patch "packages/klibc/klibc.inc"
#  from [d53c11c9e1fd6fc8f6ebda72e283e32fce38c4e9]
#    to [8d2b8d491a2f32c56a106fc771c37588ed5e4781]
# 
# patch "packages/klibc/klibc_1.5.bb"
#  from [7a3e8ba7ef141381c3e8bc1f15829474bcd8e2d8]
#    to [da0ed0aee0f0a1183a68d18409fede8ae945922a]
# 
# patch "packages/libsdl/libsdl-qpe_1.2.9.bb"
#  from [bc4c99538eb36cd779ec379046f207fb0223ad54]
#    to [8fe7bc6a02c45a082c01486d4d9fb50ff08c7ad5]
# 
# patch "packages/libsdl/libsdl.inc"
#  from [ef7bae28505a44d0e047eb8721e4850acb2e495e]
#    to [6258bba8622d9737eadd0bbde8935f1438db37c6]
# 
# patch "packages/libtomcrypt/libtomcrypt_1.17.bb"
#  from [3402d7398b04139518b06b8a2b1b5c3706ff9977]
#    to [35f3eaae8f6022c26e9a249282808e9e8cdf8575]
# 
# patch "packages/swt/swt-gtk.inc"
#  from [63792d964f1f171ba6f802dc502978513888f9d1]
#    to [34ce8d11fb9f91b158bc4c9b563ee476e7e9af97]
# 
# patch "packages/swt/swt3.3-gtk_3.3.1.bb"
#  from [ac1e6656f8358a0ce3928cd18fcdc21d2d36511e]
#    to [1316c4c5234703233997ae43f461c3dbf00edc9f]
# 
# patch "packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb"
#  from [8dd921847bcbe0395c0edf0aefecd834ec3d7191]
#    to [8afa34d71a75484e91ee61f5b889b645a0435a57]
# 
# patch "packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb"
#  from [3916433c0bdcdb906ba537ccf470b67f134ff0bf]
#    to [569de3e1f4555130a36384e36cc7aa658d2aef9d]
# 
# patch "packages/swt/swt3.4-gtk_3.3+3.4M3.bb"
#  from [a779adf603545ff091c4414cb8912b456679c9f6]
#    to [73232c0b9e0b3ec716fdf920c4be653dcb7fd613]
# 
# patch "packages/swt/swt3.4-gtk_3.3+3.4M5.bb"
#  from [49299001965c29d520d50104199531c9d47f72dc]
#    to [0cbecf9ad22346931fc40901ade6bee845011827]
#
============================================================
--- packages/klibc/files/wc.patch	91dc314c8c1ad42f06a34d17214e5f6b6ee17b41
+++ packages/klibc/files/wc.patch	91dc314c8c1ad42f06a34d17214e5f6b6ee17b41
@@ -0,0 +1,236 @@
+Index: klibc-1.5/usr/utils/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/utils/Kbuild	2008-04-14 23:21:57.702294843 +0200
++++ klibc-1.5/usr/utils/Kbuild	2008-04-14 23:24:38.817291977 +0200
+@@ -3,7 +3,7 @@
+ #
+ 
+ progs := chroot dd mkdir mkfifo mknod mount pivot_root umount
+-progs += true false sleep ln nuke minips cat losetup
++progs += true false sleep ln nuke minips cat losetup wc
+ progs += insmod uname halt kill readlink cpio modprobe
+ 
+ static-y := $(addprefix static/, $(progs))
+@@ -56,6 +56,9 @@
+ shared/modprobe-y   := modprobe.o
+ static/losetup-y    := losetup.o
+ shared/losetup-y    := losetup.o
++static/wc-y	    := wc.o
++shared/wc-y	    := wc.o
++
+ # Additionally linked targets
+ always := static/reboot static/poweroff shared/reboot shared/poweroff
+ 
+Index: klibc-1.5/usr/utils/wc.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ klibc-1.5/usr/utils/wc.c	2008-04-14 23:25:15.449292711 +0200
+@@ -0,0 +1,208 @@
++/* vi: set sw=4 ts=4: */
++/*
++ * wc implementation for busybox
++ *
++ * Copyright (C) 2003  Manuel Novoa III  <mjn3 at codepoet.org>
++ *
++ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
++ */
++
++/* BB_AUDIT SUSv3 _NOT_ compliant -- option -m is not currently supported. */
++/* http://www.opengroup.org/onlinepubs/007904975/utilities/wc.html */
++
++/* Mar 16, 2003      Manuel Novoa III   (mjn3 at codepoet.org)
++ *
++ * Rewritten to fix a number of problems and do some size optimizations.
++ * Problems in the previous busybox implementation (besides bloat) included:
++ *  1) broken 'wc -c' optimization (read note below)
++ *  2) broken handling of '-' args
++ *  3) no checking of ferror on EOF returns
++ *  4) isprint() wasn't considered when word counting.
++ *
++ * TODO:
++ *
++ * When locale support is enabled, count multibyte chars in the '-m' case.
++ *
++ * NOTES:
++ *
++ * The previous busybox wc attempted an optimization using stat for the
++ * case of counting chars only.  I omitted that because it was broken.
++ * It didn't take into account the possibility of input coming from a
++ * pipe, or input from a file with file pointer not at the beginning.
++ *
++ * To implement such a speed optimization correctly, not only do you
++ * need the size, but also the file position.  Note also that the
++ * file position may be past the end of file.  Consider the example
++ * (adapted from example in gnu wc.c)
++ *
++ *      echo hello > /tmp/testfile &&
++ *      (dd ibs=1k skip=1 count=0 &> /dev/null; wc -c) < /tmp/testfile
++ *
++ * for which 'wc -c' should output '0'.
++ */
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++#undef isspace
++#undef isprint
++#define isspace(c) ((((c) == ' ') || (((unsigned int)((c) - 9)) <= (13 - 9))))
++#define isprint(c) (((unsigned int)((c) - 0x20)) <= (0x7e - 0x20))
++#define isspace_given_isprint(c) ((c) == ' ')
++
++#define COUNT_T unsigned long
++#define COUNT_FMT "u"
++#define optind 1
++FILE *fopen_or_warn_stdin(const char *filename)
++{
++        FILE *fp = stdin;
++
++        if (filename[0]) {
++                fp = fopen(filename, "r");
++        }
++
++        return fp;
++}
++
++enum {
++	WC_LINES	= 0,
++	WC_WORDS	= 1,
++	WC_CHARS	= 2,
++	WC_LENGTH	= 3
++};
++
++int main(int argc, char **argv)
++{
++	FILE *fp;
++	const char *s, *arg;
++	const char *start_fmt = "%9"COUNT_FMT;
++	const char *fname_fmt = " %s\n";
++	COUNT_T *pcounts;
++	COUNT_T counts[4];
++	COUNT_T totals[4];
++	unsigned linepos;
++	unsigned u;
++	int num_files = 0;
++	int c;
++	signed char status = EXIT_SUCCESS;
++	signed char in_word;
++	unsigned print_type;
++
++	print_type = getopt(argc, argv, "lwcL");
++
++	if (print_type == 0) {
++		print_type = (1 << WC_LINES) | (1 << WC_WORDS) | (1 << WC_CHARS);
++	}
++
++	argv += optind;
++	if (!argv[0]) {
++		*--argv = (char *) "wc";
++		fname_fmt = "\n";
++		if (!((print_type-1) & print_type)) /* exactly one option? */
++			start_fmt = "%"COUNT_FMT;
++	}
++
++	memset(totals, 0, sizeof(totals));
++
++	pcounts = counts;
++
++	while ((arg = *argv++) != 0) {
++		++num_files;
++		fp = fopen_or_warn_stdin(arg);
++		if (!fp) {
++			status = EXIT_FAILURE;
++			continue;
++		}
++
++		memset(counts, 0, sizeof(counts));
++		linepos = 0;
++		in_word = 0;
++
++		do {
++			/* Our -w doesn't match GNU wc exactly... oh well */
++
++			++counts[WC_CHARS];
++			c = getc(fp);
++			if (isprint(c)) {
++				++linepos;
++				if (!isspace_given_isprint(c)) {
++					in_word = 1;
++					continue;
++				}
++			} else if (((unsigned int)(c - 9)) <= 4) {
++				/* \t  9
++				 * \n 10
++				 * \v 11
++				 * \f 12
++				 * \r 13
++				 */
++				if (c == '\t') {
++					linepos = (linepos | 7) + 1;
++				} else {			/* '\n', '\r', '\f', or '\v' */
++				DO_EOF:
++					if (linepos > counts[WC_LENGTH]) {
++						counts[WC_LENGTH] = linepos;
++					}
++					if (c == '\n') {
++						++counts[WC_LINES];
++					}
++					if (c != '\v') {
++						linepos = 0;
++					}
++				}
++			} else if (c == EOF) {
++/*				if (ferror(fp)) {
++					status = EXIT_FAILURE;
++				}
++*/				--counts[WC_CHARS];
++				goto DO_EOF;		/* Treat an EOF as '\r'. */
++			} else {
++				continue;
++			}
++
++			counts[WC_WORDS] += in_word;
++			in_word = 0;
++			if (c == EOF) {
++				break;
++			}
++		} while (1);
++
++		if (totals[WC_LENGTH] < counts[WC_LENGTH]) {
++			totals[WC_LENGTH] = counts[WC_LENGTH];
++		}
++		totals[WC_LENGTH] -= counts[WC_LENGTH];
++
++		if(fp != stdin)
++			fclose(fp);
++
++	OUTPUT:
++		/* coreutils wc tries hard to print pretty columns
++		 * (saves results for all files, find max col len etc...)
++		 * we won't try that hard, it will bloat us too much */
++		s = start_fmt;
++		u = 0;
++		do {
++			if (print_type & (1 << u)) {
++				printf(s, pcounts[u]);
++				s = " %9"COUNT_FMT; /* Ok... restore the leading space. */
++			}
++			totals[u] += pcounts[u];
++		} while (++u < 4);
++		printf(fname_fmt, arg);
++	}
++
++	/* If more than one file was processed, we want the totals.  To save some
++	 * space, we set the pcounts ptr to the totals array.  This has the side
++	 * effect of trashing the totals array after outputting it, but that's
++	 * irrelavent since we no longer need it. */
++	if (num_files > 1) {
++		num_files = 0;				/* Make sure we don't get here again. */
++		arg = "total";
++		pcounts = totals;
++		--argv;
++		goto OUTPUT;
++	}
++
++	fflush(stdout);
++	exit(status);
++}
============================================================
--- packages/opkg/opkg-nogpg_svn.bb	6a28b7179459ce3aa52c1ac8cb85a9de1743d5f2
+++ packages/opkg/opkg-nogpg_svn.bb	6a28b7179459ce3aa52c1ac8cb85a9de1743d5f2
@@ -0,0 +1,10 @@
+require opkg_svn.bb
+
+DEPENDS = "curl"
+PROVIDES += "opkg"
+
+SRCREV = "${SRCREV_pn-opkg}"
+
+EXTRA_OECONF += "--disable-gpg"
+
+DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/klibc/klibc-common.inc	f63bcd79d6bf261ecf2b188db14fc0d05f566d49
+++ packages/klibc/klibc-common.inc	ccb876653934cbf5f4dab36b2e0f872ea6a374cf
@@ -9,6 +9,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux
 	   file://modprobe.patch;patch=1 \
 	   file://losetup.patch;patch=1 \
 	   file://dash_readopt.patch;patch=1 \
+	   file://wc.patch;patch=1 \
 	   "
 S = "${WORKDIR}/klibc-${PV}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
============================================================
--- packages/klibc/klibc-utils-static_1.5.bb	294377bb13d3cf5efd6994870abd0ab9791b2c7b
+++ packages/klibc/klibc-utils-static_1.5.bb	07d4992c0cf89657c8e8886c714616b2908143af
@@ -1,6 +1,6 @@ require klibc-common.inc
 require klibc-common.inc
 
-PR = "r9"
+PR = "r10"
 
 # We only want the static utils. klibc build both. So we install only what we want.				
 do_install() {
@@ -38,6 +38,7 @@ do_install() {
         install -m 755 usr/utils/static/uname ${D}${base_bindir}
 	install -m 755 usr/utils/static/modprobe ${D}${base_bindir}
 	install -m 755 usr/utils/static/losetup ${D}${base_bindir}
+	install -m 755 usr/utils/static/wc ${D}${base_bindir}
         cd ${D}${base_bindir}
 	ln -s gzip gunzip
         ln -s gzip zcat
@@ -60,7 +61,7 @@ PACKAGES = "klibc-utils-static-sh klibc-
 	klibc-utils-static-reboot klibc-utils-static-sleep \
 	klibc-utils-static-true klibc-utils-static-umount \
 	klibc-utils-static-uname klibc-utils-static-modprobe \
-	klibc-utils-static-losetup"
+	klibc-utils-static-losetup klibc-utils-static-wc"
 
 FILES_klibc-utils-static-sh = "${base_bindir}/sh"
 FILES_klibc-utils-static-gzip = "${base_bindir}/gzip ${base_bindir}/gunzip ${base_bindir}/zcat"
@@ -95,3 +96,4 @@ FILES_klibc-utils-static-losetup = "${ba
 FILES_klibc-utils-static-uname = "${base_bindir}/uname"
 FILES_klibc-utils-static-modprobe = "${base_bindir}/modprobe"
 FILES_klibc-utils-static-losetup = "${base_bindir}/losetup"
+FILES_klibc-utils-static-wc = "${base_bindir}/wc"
============================================================
--- packages/klibc/klibc.inc	d53c11c9e1fd6fc8f6ebda72e283e32fce38c4e9
+++ packages/klibc/klibc.inc	8d2b8d491a2f32c56a106fc771c37588ed5e4781
@@ -40,7 +40,8 @@ do_install() {
         install -m 755 usr/utils/shared/uname ${D}${base_bindir}
 	install -m 755 usr/utils/shared/modprobe ${D}${base_bindir}
 	install -m 755 usr/utils/shared/losetup ${D}${base_bindir}
-	
+	install -m 755 usr/utils/shared/wc	${D}${base_bindir}
+
 	install -d ${D}${base_libdir}
 	install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir}
 	cd ${D}${base_libdir}
@@ -74,7 +75,7 @@ PACKAGES = "${PN} klibc-utils-sh klibc-u
         klibc-utils-sleep klibc-utils-true \
         klibc-utils-umount klibc-utils-uname \
         klibc-utils-gzip klibc-utils-modprobe \
-	klibc-utils-losetup"
+	klibc-utils-losetup klibc-utils-wc"
 
 FILES_${PN} = "${base_libdir}/klibc*.so"	
 FILES_klibc-utils-sh = "${base_bindir}/sh"
@@ -110,6 +111,7 @@ FILES_klibc-utils-losetup = "${base_bind
 FILES_klibc-utils-uname = "${base_bindir}/uname"
 FILES_klibc-utils-modprobe = "${base_bindir}/modprobe"
 FILES_klibc-utils-losetup = "${base_bindir}/losetup"
+FILES_klibc-utils-wc = "${base_bindir}/wc"
 
 # Yes we want exactly the klibc that was compiled with the utils
 RDEPENDS_klibc-utils-sh = "${PN} (=${PV}-${PR})"
@@ -144,3 +146,4 @@ RDEPENDS_klibc-utils-losetup = "${PN} (=
 RDEPENDS_klibc-utils-uname = "${PN} (=${PV}-${PR})"
 RDEPENDS_klibc-utils-modprobe = "${PN} (=${PV}-${PR})"
 RDEPENDS_klibc-utils-losetup = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-wc = "${PN} (=${PV}-${PR})"
============================================================
--- packages/klibc/klibc_1.5.bb	7a3e8ba7ef141381c3e8bc1f15829474bcd8e2d8
+++ packages/klibc/klibc_1.5.bb	da0ed0aee0f0a1183a68d18409fede8ae945922a
@@ -1,2 +1,2 @@ require klibc.inc
 require klibc.inc
+PR = "r8"
-PR = "r7"
============================================================
--- packages/libsdl/libsdl-qpe_1.2.9.bb	bc4c99538eb36cd779ec379046f207fb0223ad54
+++ packages/libsdl/libsdl-qpe_1.2.9.bb	8fe7bc6a02c45a082c01486d4d9fb50ff08c7ad5
@@ -12,6 +12,7 @@ SRC_URI += "\
   file://SDL-Akita-1.2.9.patch;patch=1 \
   file://fixlibs-1.2.9.patch;patch=1 \
   file://explicit-extern-C.patch;patch=1 \
+  file://no-PAGE_SIZE.patch;patch=1 \
 "
 
 EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
@@ -26,6 +27,6 @@ do_compile_prepend() {
 do_compile_prepend() {
 	if [ "${PALMTOP_USE_MULTITHREADED_QT}" == "yes" ]
 	then
-		sed -i s,-lqte,-lqte-mt,%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -r53534b02ad19a4d9ac608eedde7747fa84f7f8fc -r0e3c598953a66b65fbda0d8827b027d6e2ae1b84
#
#
#
# delete "packages/linux/linux-davinci/binutils-buildid-arm.patch"
# 
# delete "packages/linux/linux-davinci/davinci-nand.patch"
# 
# add_file "packages/linux/linux-davinci/davinci-sffsdr/sffsdr.patch"
#  content [540f3377225d179721cf1096db5ccc39e1428d80]
# 
# patch "conf/machine/davinci-sffsdr.conf"
#  from [e78c2776ef888446589865c926e40dbbcb5796e9]
#    to [3b4784ac301d7f628129f269d9e9420fe71d44be]
# 
# patch "packages/linux/linux-davinci/davinci-sffsdr/defconfig"
#  from [d76344cf2dccb9b3b92feb9643ac3df9f0182d91]
#    to [4df55e9222bbc1baee2a2743820e24de5b910ac8]
# 
# patch "packages/linux/linux-davinci_2.6.x+git-davinci.bb"
#  from [52f3d3b0d626d28fcb41b051eb1d474d8317f0f1]
#    to [7e87a307c64d6118e078e55369d27faa7c0e55c1]
#
============================================================
--- packages/linux/linux-davinci/davinci-sffsdr/sffsdr.patch	540f3377225d179721cf1096db5ccc39e1428d80
+++ packages/linux/linux-davinci/davinci-sffsdr/sffsdr.patch	540f3377225d179721cf1096db5ccc39e1428d80
@@ -0,0 +1,190 @@
+diff --git a/arch/arm/mach-davinci/board-evm.c b/arch/arm/mach-davinci/board-evm.c
+index 40a5665..e786ffc 100644
+--- a/arch/arm/mach-davinci/board-evm.c
++++ b/arch/arm/mach-davinci/board-evm.c
+@@ -97,10 +97,22 @@ static struct platform_device davinci_evm_norflash_device = {
+ 
+ #if defined(CONFIG_MTD_NAND_DAVINCI) || defined(CONFIG_MTD_NAND_DAVINCI_MODULE)
+ struct mtd_partition davinci_evm_nandflash_partition[] = {
+-	/* 5 MB space at the beginning for bootloader and kernel */
+ 	{
+-		.name		= "NAND filesystem",
+-		.offset		= 5 * SZ_1M,
++		.name		= "Bootloader",
++		.offset		= 0,
++		.size		= 5 * SZ_128K,
++		.mask_flags	= 0,
++	},
++
++	{
++		.name		= "Kernel",
++		.offset		= MTDPART_OFS_APPEND,
++		.size		= SZ_2M,
++		.mask_flags	= 0,
++	},
++	{
++		.name		= "File System",
++		.offset		= MTDPART_OFS_APPEND,
+ 		.size		= MTDPART_SIZ_FULL,
+ 		.mask_flags	= 0,
+ 	}
+diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
+index 7ed58c0..ba506d0 100644
+--- a/arch/arm/tools/mach-types
++++ b/arch/arm/tools/mach-types
+@@ -12,7 +12,7 @@
+ #
+ #   http://www.arm.linux.org.uk/developer/machines/?action=new
+ #
+-# Last update: Sat Jan 26 14:45:34 2008
++# Last update: Fri Apr 11 21:19:16 2008
+ #
+ # machine_is_xxx	CONFIG_xxxx		MACH_TYPE_xxx		number
+ #
+@@ -381,13 +381,13 @@ ks8695p			ARCH_KS8695P		KS8695P			363
+ se4000			ARCH_SE4000		SE4000			364
+ quadriceps		ARCH_QUADRICEPS		QUADRICEPS		365
+ bronco			ARCH_BRONCO		BRONCO			366
+-esl_wireless_tab	ARCH_ESL_WIRELESS_TABLETESL_WIRELESS_TABLET	367
++esl_wireless_tab	ARCH_ESL_WIRELESS_TAB	ESL_WIRELESS_TAB	367
+ esl_sofcomp		ARCH_ESL_SOFCOMP	ESL_SOFCOMP		368
+ s5c7375			ARCH_S5C7375		S5C7375			369
+ spearhead		ARCH_SPEARHEAD		SPEARHEAD		370
+ pantera			ARCH_PANTERA		PANTERA			371
+ prayoglite		ARCH_PRAYOGLITE		PRAYOGLITE		372
+-gumstix			ARCH_GUMSTIK		GUMSTIK			373
++gumstix			ARCH_GUMSTIX		GUMSTIX			373
+ rcube			ARCH_RCUBE		RCUBE			374
+ rea_olv			ARCH_REA_OLV		REA_OLV			375
+ pxa_iphone		ARCH_PXA_IPHONE		PXA_IPHONE		376
+@@ -910,7 +910,7 @@ nadia2vb		MACH_NADIA2VB		NADIA2VB		897
+ r1000			MACH_R1000		R1000			898
+ hw90250			MACH_HW90250		HW90250			899
+ omap_2430sdp		MACH_OMAP_2430SDP	OMAP_2430SDP		900
+-davinci_evm		MACH_DAVINCI_EVM	DAVINCI_EVM		901
++davinci_evm		MACH_DAVINCI_EVM	DAVINCI_EVM		1657
+ omap_tornado		MACH_OMAP_TORNADO	OMAP_TORNADO		902
+ olocreek		MACH_OLOCREEK		OLOCREEK		903
+ palmz72			MACH_PALMZ72		PALMZ72			904
+@@ -1384,6 +1384,7 @@ olip8			MACH_OLIP8		OLIP8			1378
+ ghi270hg		MACH_GHI270HG		GHI270HG		1379
+ davinci_dm6467_evm	MACH_DAVINCI_DM6467_EVM	DAVINCI_DM6467_EVM	1380
+ davinci_dm355_evm	MACH_DAVINCI_DM350_EVM	DAVINCI_DM350_EVM	1381
++ocearm			MACH_OCEARMTEST		OCEARMTEST		1382
+ blackriver		MACH_BLACKRIVER		BLACKRIVER		1383
+ sandgate_wp		MACH_SANDGATEWP		SANDGATEWP		1384
+ cdotbwsg		MACH_CDOTBWSG		CDOTBWSG		1385
+@@ -1463,7 +1464,7 @@ artemis			MACH_ARTEMIS		ARTEMIS			1462
+ htctitan		MACH_HTCTITAN		HTCTITAN		1463
+ qranium			MACH_QRANIUM		QRANIUM			1464
+ adx_wsc2		MACH_ADX_WSC2		ADX_WSC2		1465
+-adx_medinet		MACH_ADX_MEDINET	ADX_MEDINET		1466
++adx_medcom		MACH_ADX_MEDINET	ADX_MEDINET		1466
+ bboard			MACH_BBOARD		BBOARD			1467
+ cambria			MACH_CAMBRIA		CAMBRIA			1468
+ mt7xxx			MACH_MT7XXX		MT7XXX			1469
+@@ -1611,3 +1612,104 @@ kb9263			MACH_KB9263		KB9263			1612
+ mt7108			MACH_MT7108		MT7108			1613
+ smtr2440		MACH_SMTR2440		SMTR2440		1614
+ manao			MACH_MANAO		MANAO			1615
++cm_x300			MACH_CM_X300		CM_X300			1616
++gulfstream_kp		MACH_GULFSTREAM_KP	GULFSTREAM_KP		1617
++lanreadyfn522		MACH_LANREADYFN522	LANREADYFN522		1618
++arma37			MACH_ARMA37		ARMA37			1619
++mendel			MACH_MENDEL		MENDEL			1620
++pelco_iliad		MACH_PELCO_ILIAD	PELCO_ILIAD		1621
++unit2p			MACH_UNIT2P		UNIT2P			1622
++inc20otter		MACH_INC20OTTER		INC20OTTER		1623
++at91sam9g20ek		MACH_AT91SAM9G20EK	AT91SAM9G20EK		1624
++sc_ge2			MACH_STORCENTER		STORCENTER		1625
++smdk6410		MACH_SMDK6410		SMDK6410		1626
++u300			MACH_U300		U300			1627
++u500			MACH_U500		U500			1628
++ds9260			MACH_DS9260		DS9260			1629
++riverrock		MACH_RIVERROCK		RIVERROCK		1630
++scibath			MACH_SCIBATH		SCIBATH			1631
++at91sam7se		MACH_AT91SAM7SE512EK	AT91SAM7SE512EK		1632
++wrt350n_v2		MACH_WRT350N_V2		WRT350N_V2		1633
++multimedia		MACH_MULTIMEDIA		MULTIMEDIA		1634
++marvin			MACH_MARVIN		MARVIN			1635
++x500			MACH_X500		X500			1636
++awlug4lcu		MACH_AWLUG4LCU		AWLUG4LCU		1637
++palermoc		MACH_PALERMOC		PALERMOC		1638
++omap_zoom		MACH_OMAP_3430LABRADOR	OMAP_3430LABRADOR	1639
++ip500			MACH_IP500		IP500			1640
++mx35ads			MACH_MACH_MX35ADS	MACH_MX35ADS		1641
++ase2			MACH_ASE2		ASE2			1642
++mx35evb			MACH_MX35EVB		MX35EVB			1643
++aml_m8050		MACH_AML_M8050		AML_M8050		1644
++mx35_3ds		MACH_MX35_3DS		MX35_3DS		1645
++mars			MACH_MARS		MARS			1646
++ntosd_644xa		MACH_NTOSD_644XA	NTOSD_644XA		1647
++badger			MACH_BADGER		BADGER			1648
++trizeps4wl		MACH_TRIZEPS4WL		TRIZEPS4WL		1649
++trizeps5		MACH_TRIZEPS5		TRIZEPS5		1650
++marlin			MACH_MARLIN		MARLIN			1651
++ts7800			MACH_TS7800		TS7800			1652
++hpipaq214		MACH_HPIPAQ214		HPIPAQ214		1653
++at572d940dcm		MACH_AT572D940DCM	AT572D940DCM		1654
++ne1board		MACH_NE1BOARD		NE1BOARD		1655
++zante			MACH_ZANTE		ZANTE			1656
++sffsdr			MACH_SFFSDR		SFFSDR			1657
++tw2662			MACH_TW2662		TW2662			1658
++vf10xx			MACH_VF10XX		VF10XX			1659
++zoran43xx		MACH_ZORAN43XX		ZORAN43XX		1660
++sonix926		MACH_SONIX926		SONIX926		1661
++celestialsemi		MACH_CELESTIALSEMI	CELESTIALSEMI		1662
++cc9m2443		MACH_CC9M2443		CC9M2443		1663
++tw5334			MACH_TW5334		TW5334			1664
++omap_htcartemis		MACH_HTCARTEMIS		HTCARTEMIS		1665
++nal_hlite		MACH_NAL_HLITE		NAL_HLITE		1666
++htcvogue		MACH_HTCVOGUE		HTCVOGUE		1667
++smartweb		MACH_SMARTWEB		SMARTWEB		1668
++mv86xx			MACH_MV86XX		MV86XX			1669
++mv87xx			MACH_MV87XX		MV87XX			1670
++songyoungho		MACH_SONGYOUNGHO	SONGYOUNGHO		1671
++younghotema		MACH_YOUNGHOTEMA	YOUNGHOTEMA		1672
++pcm037			MACH_PCM037		PCM037			1673
++mmvp			MACH_MMVP		MMVP			1674
++mmap			MACH_MMAP		MMAP			1675
++ptid2410		MACH_PTID2410		PTID2410		1676
++james_926		MACH_JAMES_926		JAMES_926		1677
++fm6000			MACH_FM6000		FM6000			1678
++db88f6281_bp		MACH_DB88F6281_BP	DB88F6281_BP		1680
++rd88f6192_nas		MACH_RD88F6192_NAS	RD88F6192_NAS		1681
++rd88f6281		MACH_RD88F6281		RD88F6281		1682
++db78x00_bp		MACH_DB78X00_BP		DB78X00_BP		1683
++smdk2416		MACH_SMDK2416		SMDK2416		1685
++oce_spider_si		MACH_OCE_SPIDER_SI	OCE_SPIDER_SI		1686
++oce_spider_sk		MACH_OCE_SPIDER_SK	OCE_SPIDER_SK		1687
++rovern6			MACH_ROVERN6		ROVERN6			1688
++pelco_evolution		MACH_PELCO_EVOLUTION	PELCO_EVOLUTION		1689
++wbd111			MACH_WBD111		WBD111			1690
++elaracpe		MACH_ELARACPE		ELARACPE		1691
++mabv3			MACH_MABV3		MABV3			1692
++mv2120			MACH_MV2120		MV2120			1693
++csb737			MACH_CSB737		CSB737			1695
++mx51_3ds		MACH_MX51_3DS		MX51_3DS		1696
++g900			MACH_G900		G900			1697
++apf27			MACH_APF27		APF27			1698
++ggus2000		MACH_GGUS2000		GGUS2000		1699
++omap_2430_mimic		MACH_OMAP_2430_MIMIC	OMAP_2430_MIMIC		1700
++imx27lite		MACH_IMX27LITE		IMX27LITE		1701
++almex			MACH_ALMEX		ALMEX			1702
++control			MACH_CONTROL		CONTROL			1703
++mba2410			MACH_MBA2410		MBA2410			1704
++volcano			MACH_VOLCANO		VOLCANO			1705
++zenith			MACH_ZENITH		ZENITH			1706
++muchip			MACH_MUCHIP		MUCHIP			1707
++magellan		MACH_MAGELLAN		MAGELLAN		1708
++usb_a9260		MACH_USB_A9260		USB_A9260		1709
++usb_a9263		MACH_USB_A9263		USB_A9263		1710
++qil_a9260		MACH_QIL_A9260		QIL_A9260		1711
++cme9210			MACH_CME9210		CME9210			1712
++hczh4			MACH_HCZH4		HCZH4			1713
++spearbasic		MACH_SPEARBASIC		SPEARBASIC		1714
++dep2440			MACH_DEP2440		DEP2440			1715
++hdl_gxr			MACH_HDL_GXR		HDL_GXR			1716
++hdl_gt			MACH_HDL_GT		HDL_GT			1717
++hdl_4g			MACH_HDL_4G		HDL_4G			1718
++s3c6000			MACH_S3C6000		S3C6000			1719
============================================================
--- conf/machine/davinci-sffsdr.conf	e78c2776ef888446589865c926e40dbbcb5796e9
+++ conf/machine/davinci-sffsdr.conf	3b4784ac301d7f628129f269d9e9420fe71d44be
@@ -7,13 +7,17 @@ HOTPLUG = "udev"
 
 HOTPLUG = "udev"
 
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
 PREFERRED_VERSION_u-boot = "git"
 UBOOT_MACHINE = "davinci_sffsdr_config"
 
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
============================================================
--- packages/linux/linux-davinci/davinci-sffsdr/defconfig	d76344cf2dccb9b3b92feb9643ac3df9f0182d91
+++ packages/linux/linux-davinci/davinci-sffsdr/defconfig	4df55e9222bbc1baee2a2743820e24de5b910ac8
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.23-davinci1
-# Sun Feb  3 08:30:51 2008
+# Linux kernel version: 2.6.25-rc8-davinci1
+# Tue Apr 15 07:09:55 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -21,6 +21,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_SUPPORTS_AOUT=y
 CONFIG_ZONE_DMA=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -39,13 +40,20 @@ CONFIG_POSIX_MQUEUE=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 is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_GROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
 CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -54,22 +62,33 @@ CONFIG_KALLSYMS=y
 CONFIG_UID16=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=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_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
@@ -97,6 +116,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_CLASSIC_RCU=y
 
 #
 # System Type
@@ -125,6 +145,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_NS9XXX is not set
 # CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_ORION is not set
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_RPC is not set
@@ -134,6 +155,7 @@ CONFIG_ARCH_DAVINCI=y
 # CONFIG_ARCH_LH7A40X is not set
 CONFIG_ARCH_DAVINCI=y
 # CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_MSM7X00A is not set
 
 #
 # Boot options
@@ -192,10 +214,6 @@ CONFIG_ARM_THUMB=y
 #
 # CONFIG_PCI_SYSCALL is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
 # CONFIG_PCCARD is not set
 
 #
@@ -204,6 +222,7 @@ CONFIG_ARM_THUMB=y
 # CONFIG_TICK_ONESHOT is not set
 # CONFIG_NO_HZ is not set
 # CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 # CONFIG_PREEMPT is not set
 CONFIG_HZ=100
 CONFIG_AEABI=y
@@ -216,6 +235,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
@@ -241,8 +261,7 @@ CONFIG_CMDLINE=""
 #
 # At least one emulation must be selected
 #
-CONFIG_FPE_NWFPE=y
-# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_NWFPE is not set
 # CONFIG_FPE_FASTFPE is not set
 # CONFIG_VFP is not set
 
@@ -257,7 +276,7 @@ CONFIG_BINFMT_ELF=y
 # Power management options
 #
 # CONFIG_PM is not set
-CONFIG_SUSPEND_UP_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
 
 #
 # Networking
@@ -274,6 +293,7 @@ CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -295,6 +315,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
 CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
@@ -322,12 +343,13 @@ CONFIG_NETFILTER=y
 # CONFIG_NETWORK_SECMARK is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
 
 #
 # Core Netfilter Configuration
 #
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NF_CONNTRACK_ENABLED is not set
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
 # CONFIG_NF_CONNTRACK is not set
 # CONFIG_NETFILTER_XTABLES is not set
 
@@ -339,7 +361,7 @@ CONFIG_NETFILTER=y
 # CONFIG_IP_NF_ARPTABLES is not set
 
 #
-# IPv6: Netfilter Configuration (EXPERIMENTAL)
+# IPv6: Netfilter Configuration
 #
 # CONFIG_IP6_NF_QUEUE is not set
 # CONFIG_IP6_NF_IPTABLES is not set
@@ -357,10 +379,6 @@ CONFIG_NETFILTER=y
 # 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
 
 #
@@ -368,6 +386,7 @@ CONFIG_NETFILTER=y
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
@@ -389,9 +408,12 @@ CONFIG_NETFILTER=y
 #
 # Generic Driver Options
 #
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_CONNECTOR is not set
 CONFIG_MTD=y
@@ -399,7 +421,7 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_CONCAT is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
-CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_CMDLINE_PARTS is not set
 # CONFIG_MTD_AFS_PARTS is not set
 
 #
@@ -413,14 +435,13 @@ CONFIG_MTD_BLOCK=y
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
 # CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
 
 #
 # RAM/ROM/Flash chip drivers
 #
-CONFIG_MTD_CFI=y
+# CONFIG_MTD_CFI is not set
 # CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
@@ -431,10 +452,6 @@ CONFIG_MTD_CFI_I2=y
 CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_CFI_I4 is not set
 # CONFIG_MTD_CFI_I8 is not set
-# CONFIG_MTD_CFI_INTELEXT is not set
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_STAA i%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list