[oe-commits] org.oe.dev merge of '70c98ecabf04e753c02721c28eb68c90f324d6de'
mickeyl commit
openembedded-commits at lists.openembedded.org
Mon Oct 22 17:06:00 UTC 2007
merge of '70c98ecabf04e753c02721c28eb68c90f324d6de'
and 'cebb5151b05a1bb90d6e82d3f2b9883930c5dc35'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 24ea0c0ad0952d90844bd5db868a7191a399b045
ViewMTN: http://monotone.openembedded.org/revision/info/24ea0c0ad0952d90844bd5db868a7191a399b045
Files:
1
packages/gstreamer/gst-plugins-ugly_0.10.5.bb
packages/gstreamer/gst-plugins-ugly_0.10.6.bb
packages/mpeg2dec/mpeg2dec_0.4.0b.bb
packages/busybox/busybox-1.7.2/run_parts.c
packages/openmoko2/openmoko-worldclock2_svn.bb
conf/distro/include/insane-srcrevs.inc
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
conf/machine/i586-generic.conf
conf/machine/i686-generic.conf
packages/busybox/busybox_1.7.2.bb
packages/linux/linux/x86/defconfig
packages/openmoko2/openmoko-dates2_svn.bb
Diffs:
#
# mt diff -r70c98ecabf04e753c02721c28eb68c90f324d6de -r24ea0c0ad0952d90844bd5db868a7191a399b045
#
#
#
# delete "packages/gstreamer/gst-plugins-ugly_0.10.5.bb"
#
# patch "packages/gstreamer/gst-plugins-ugly_0.10.6.bb"
# from [a797c052361775643172a8cb270f3ea30d3da281]
# to [8b11fa9ba4867340cb4c951c7c42cd8789cfc273]
#
# patch "packages/mpeg2dec/mpeg2dec_0.4.0b.bb"
# from [b83c88f1275d81e0d84602ec21961f086ef8f3da]
# to [3e5344f42783243aa599a5b4311baf304d2ace25]
#
============================================================
--- packages/gstreamer/gst-plugins-ugly_0.10.6.bb a797c052361775643172a8cb270f3ea30d3da281
+++ packages/gstreamer/gst-plugins-ugly_0.10.6.bb 8b11fa9ba4867340cb4c951c7c42cd8789cfc273
@@ -1,7 +1,7 @@ require gst-plugins.inc
require gst-plugins.inc
-DEPENDS += "gst-plugins-base"
+DEPENDS += "gst-plugins-base mpeg2dec libsidplay"
+PR = "r2"
+
SRC_URI += "file://cross-compile.patch;patch=1 \
file://gstmad_16bit.patch;patch=1"
-
-PR = "r1"
============================================================
--- packages/mpeg2dec/mpeg2dec_0.4.0b.bb b83c88f1275d81e0d84602ec21961f086ef8f3da
+++ packages/mpeg2dec/mpeg2dec_0.4.0b.bb 3e5344f42783243aa599a5b4311baf304d2ace25
@@ -1,35 +1,18 @@
-DESCRIPTION = "Library and test program for decoding mpeg-2 and mpeg-1 video streams"
+DESCRIPTION = "Libraries and test programs for decoding mpeg-2 and mpeg-1 video streams"
HOMEPAGE = "http://libmpeg2.sourceforge.net/"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "virtual/libsdl"
-PROVIDES += "libmpeg2"
-RPROVIDES += "libmpeg2"
-PR = "r3"
+PR = "r4"
-S = "${WORKDIR}/mpeg2dec-0.4.0"
-
SRC_URI = "http://libmpeg2.sourceforge.net/files/mpeg2dec-${PV}.tar.gz"
+S = "${WORKDIR}/mpeg2dec-0.4.0"
inherit autotools pkgconfig
EXTRA_OECONF = "--enable-shared"
-PACKAGES += "libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev"
-
-FILES_${PN} += "${bindir}/*"
-FILES_libmpeg2 = "${libdir}/libmpeg2.so.*"
-FILES_libmpeg2convert = "${libdir}/libmpeg2convert.so.*"
-FILES_libmpeg2-dev = "${libdir}/libmpeg2.so \
- ${libdir}/libmpeg2.*a \
- ${libdir}/pkgconfig/libmpeg2.pc \
- ${includedir}/mpeg2dec/mpeg2.h"
-FILES_libmpeg2convert-dev = "${libdir}/libmpeg2convert.so \
- ${libdir}/libmpeg2convert.*a \
- ${libdir}/pkgconfig/libmpeg2convert.pc \
- ${includedir}/mpeg2dec/mpeg2convert.h"
-
mpeg2dec_include = "mpeg2.h mpeg2convert.h"
do_stage () {
@@ -41,3 +24,9 @@ do_stage () {
install -m 0644 include/$i ${STAGING_INCDIR}/mpeg2dec/
done
}
+
+PACKAGES += "mpeg2dec libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev"
+
+FILES_${PN} = "${bindir}/*"
+FILES_libmpeg2 = "${libdir}/libmpeg2.so.*"
+FILES_libmpeg2convert = "${libdir}/libmpeg2convert.so.*"
#
# mt diff -rcebb5151b05a1bb90d6e82d3f2b9883930c5dc35 -r24ea0c0ad0952d90844bd5db868a7191a399b045
#
#
#
# add_file "packages/busybox/busybox-1.7.2/run_parts.c"
# content [a89fb7b0e9220d4ab2c61e07fa2886e228697c0a]
#
# add_file "packages/openmoko2/openmoko-worldclock2_svn.bb"
# content [7f86ee9c3bfabf8d397a2efbfb85f67fd61066a7]
#
# patch "conf/distro/include/insane-srcrevs.inc"
# from [b1efedd3d4ef2ad3d5f782c992e368ed4dd7e664]
# to [97d6d52aabb308a34d404adda19b2ebaa26e3d4e]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [377acba46a95e8d0301744e9742074791d93ed2e]
# to [b99885aacfc99f0c86d447df7bcc24bf538272e7]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [b8dab282216e8b7461ee4d70151f83523286afa4]
# to [a95e773bc3e57df2c4a7569056a37d6ef59052af]
#
# patch "conf/machine/i586-generic.conf"
# from [4a887ba9af2a184e828b7bc68cf9011f3824cb2e]
# to [c61d01d967be68b39d6557988891bcf643a627d4]
#
# patch "conf/machine/i686-generic.conf"
# from [1b113798190f2b0c8fa137d2590ac3184044f3fd]
# to [5a12326f2dba2449f2f055cb75623cb21bb5efc6]
#
# patch "packages/busybox/busybox_1.7.2.bb"
# from [e0995507653a71bc95bf32102ed875598938514d]
# to [07cb779f36d353735584d53006f3eede1ea7fd89]
#
# patch "packages/linux/linux/x86/defconfig"
# from [0bc90afc51dce1e7536c70ef6a6fb37e5e486451]
# to [18d877a9d6bedb7fc9cd2a93dc861b26396409b4]
#
# patch "packages/openmoko2/openmoko-dates2_svn.bb"
# from [8f88ccdf9b14939e2753ac9aca30866550e0704a]
# to [7abc97a523f717985d280fba2c7fd30cd7402605]
#
============================================================
--- packages/busybox/busybox-1.7.2/run_parts.c a89fb7b0e9220d4ab2c61e07fa2886e228697c0a
+++ packages/busybox/busybox-1.7.2/run_parts.c a89fb7b0e9220d4ab2c61e07fa2886e228697c0a
@@ -0,0 +1,174 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Mini run-parts implementation for busybox
+ *
+ * Copyright (C) 2007 Bernhard Fischer
+ *
+ * Based on a older version that was in busybox which was 1k big..
+ * Copyright (C) 2001 by Emanuele Aina <emanuele.aina at tiscali.it>
+ *
+ * Based on the Debian run-parts program, version 1.15
+ * Copyright (C) 1996 Jeff Noxon <jeff at router.patch.net>,
+ * Copyright (C) 1996-1999 Guy Maor <maor at debian.org>
+ *
+ *
+ * Licensed under GPL v2 or later, see file LICENSE in this tarball for details.
+ */
+
+/* This is my first attempt to write a program in C (well, this is my first
+ * attempt to write a program! :-) . */
+
+/* This piece of code is heavily based on the original version of run-parts,
+ * taken from debian-utils. I've only removed the long options and a the
+ * report mode. As the original run-parts support only long options, I've
+ * broken compatibility because the BusyBox policy doesn't allow them.
+ * The supported options are:
+ * -t test. Print the name of the files to be executed, without
+ * execute them.
+ * -a ARG argument. Pass ARG as an argument the program executed. It can
+ * be repeated to pass multiple arguments.
+ * -u MASK umask. Set the umask of the program executed to MASK.
+ */
+
+#include <getopt.h>
+
+#include "libbb.h"
+
+struct globals {
+ char **names;
+ int cur;
+ char *cmd[1];
+};
+#define G (*(struct globals*)&bb_common_bufsiz1)
+#define names (G.names)
+#define cur (G.cur )
+#define cmd (G.cmd )
+
+enum { NUM_CMD = (COMMON_BUFSIZE - sizeof(struct globals)) / sizeof(cmd[0]) };
+
+enum {
+ RUN_PARTS_OPT_a = (1 << 0),
+ RUN_PARTS_OPT_u = (1 << 1),
+ RUN_PARTS_OPT_t = (1 << 2),
+ RUN_PARTS_OPT_l = (1 << 3) * ENABLE_FEATURE_RUN_PARTS_FANCY,
+};
+
+#if ENABLE_FEATURE_RUN_PARTS_FANCY
+#define list_mode (option_mask32 & RUN_PARTS_OPT_l)
+#else
+#define list_mode 0
+#endif
+
+/* Is this a valid filename (upper/lower alpha, digits,
+ * underscores, and hyphens only?)
+ */
+static bool invalid_name(const char *c)
+{
+ c = bb_basename(c);
+
+ while (*c && (isalnum(*c) || *c == '_' || *c == '-'))
+ c++;
+
+ return *c; /* TRUE (!0) if terminating NUL is not reached */
+}
+
+static int bb_alphasort(const void *p1, const void *p2)
+{
+ return strcmp(*(char **) p1, *(char **) p2);
+}
+
+static int act(const char *file, struct stat *statbuf, void *args, int depth)
+{
+ if (depth == 1)
+ return TRUE;
+
+ if (depth == 2
+ && ( !(statbuf->st_mode & (S_IFREG | S_IFLNK))
+ || invalid_name(file)
+ || (!list_mode && access(file, X_OK) != 0))
+ ) {
+ return SKIP;
+ }
+
+ names = xrealloc(names, (cur + 2) * sizeof(names[0]));
+ names[cur++] = xstrdup(file);
+ names[cur] = NULL;
+
+ return TRUE;
+}
+
+#if ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS
+static const char runparts_longopts[] ALIGN1 =
+ "arg\0" Required_argument "a"
+ "umask\0" Required_argument "u"
+ "test\0" No_argument "t"
+#if ENABLE_FEATURE_RUN_PARTS_FANCY
+ "list\0" No_argument "l"
+//TODO: "reverse\0" No_argument "r"
+//TODO: "verbose\0" No_argument "v"
+#endif
+ ;
+#endif
+
+int run_parts_main(int argc, char **argv);
+int run_parts_main(int argc, char **argv)
+{
+ const char *umask_p = "22";
+ llist_t *arg_list = NULL;
+ unsigned n;
+ int ret;
+
+#if ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS
+ applet_long_options = runparts_longopts;
+#endif
+ /* We require exactly one argument: the directory name */
+ opt_complementary = "=1:a::";
+ getopt32(argv, "a:u:t"USE_FEATURE_RUN_PARTS_FANCY("l"), &arg_list, &umask_p);
+
+ umask(xstrtou_range(umask_p, 8, 0, 07777));
+
+ n = 1;
+ while (arg_list && n < NUM_CMD) {
+ cmd[n] = arg_list->data;
+ arg_list = arg_list->link;
+ n++;
+ }
+ /* cmd[n] = NULL; - is already zeroed out */
+
+ /* run-parts has to sort executables by name before running them */
+
+ recursive_action(argv[optind],
+ ACTION_RECURSE|ACTION_FOLLOWLINKS,
+ act, /* file action */
+ act, /* dir action */
+ NULL, /* user data */
+ 1 /* depth */
+ );
+
+ if (!names)
+ return 0;
+
+ qsort(names, cur, sizeof(char *), bb_alphasort);
+
+ n = 0;
+ while (1) {
+ char *name = *names++;
+ if (!name)
+ break;
+ if (option_mask32 & (RUN_PARTS_OPT_t | RUN_PARTS_OPT_l)) {
+ puts(name);
+ continue;
+ }
+ cmd[0] = name;
+ ret = wait4pid(spawn(cmd));
+ if (ret == 0)
+ continue;
+ n = 1;
+ if (ret < 0)
+ bb_perror_msg("failed to exec %s", name);
+ else /* ret > 0 */
+ bb_error_msg("%s exited with return code %d", name, ret);
+ }
+
+ return n;
+}
============================================================
--- packages/openmoko2/openmoko-worldclock2_svn.bb 7f86ee9c3bfabf8d397a2efbfb85f67fd61066a7
+++ packages/openmoko2/openmoko-worldclock2_svn.bb 7f86ee9c3bfabf8d397a2efbfb85f67fd61066a7
@@ -0,0 +1,6 @@
+DESCRIPTION = "A World-Clock for OpenMoko"
+SECTION = "openmoko/tools"
+DEPENDS = "libmokoui2 openmoko-dates2"
+PV = "0.1.0+svnr${SRCREV}"
+
+inherit openmoko2
============================================================
--- conf/distro/include/insane-srcrevs.inc b1efedd3d4ef2ad3d5f782c992e368ed4dd7e664
+++ conf/distro/include/insane-srcrevs.inc 97d6d52aabb308a34d404adda19b2ebaa26e3d4e
@@ -24,6 +24,7 @@ SRCREV_pn-oh-puzzles ?= "${AUTOREV}"
SRCREV_pn-matchbox-panel-2 ?= "${AUTOREV}"
SRCREV_pn-neod ?= "${AUTOREV}"
SRCREV_pn-oh-puzzles ?= "${AUTOREV}"
+SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
@@ -70,7 +71,7 @@ SRCREV_pn-openmoko-today2-folders ?= "${
SRCREV_pn-openmoko-today ?= "${AUTOREV}"
SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
-SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
+SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
SRCREV_pn-openocd ?= "${AUTOREV}"
SRCREV_pn-openocd-native ?= "${AUTOREV}"
SRCREV_pn-psplash ?= "${AUTOREV}"
============================================================
--- conf/distro/include/moko-autorev.inc 377acba46a95e8d0301744e9742074791d93ed2e
+++ conf/distro/include/moko-autorev.inc b99885aacfc99f0c86d447df7bcc24bf538272e7
@@ -57,6 +57,7 @@ SRCREV_pn-openmoko-today2-folders ?= "${
SRCREV_pn-openmoko-today ?= "${AUTOREV}"
SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
+SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
SRCREV_pn-openocd ?= "${AUTOREV}"
SRCREV_pn-openocd-native ?= "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcrevs.inc b8dab282216e8b7461ee4d70151f83523286afa4
+++ conf/distro/include/sane-srcrevs.inc a95e773bc3e57df2c4a7569056a37d6ef59052af
@@ -46,18 +46,18 @@ SRCREV_pn-osb-nrcore ?= "126"
SRCREV_pn-osb-jscore ?= "117"
SRCREV_pn-osb-nrcit ?= "125"
SRCREV_pn-osb-nrcore ?= "126"
-SRCREV_pn-openmoko-appearance ?= "3227"
+SRCREV_pn-openmoko-appearance ?= "3239"
SRCREV_pn-openmoko-appmanager ?= "1851"
SRCREV_pn-openmoko-appmanager2 ?= "3090"
SRCREV_pn-openmoko-browser2 ?= "3082"
SRCREV_pn-openmoko-calculator ?= "2404"
-SRCREV_pn-openmoko-calculator2 ?= "2789"
+SRCREV_pn-openmoko-calculator2 ?= "3235"
SRCREV_pn-openmoko-common ?= "397"
SRCREV_pn-openmoko-common2 ?= "2679"
SRCREV_pn-openmoko-contacts ?= "2298"
SRCREV_pn-openmoko-contacts2 ?= "358"
SRCREV_pn-openmoko-dates ?= "467"
-SRCREV_pn-openmoko-dates2 ?= "640"
+SRCREV_pn-openmoko-dates2 ?= "652"
SRCREV_pn-openmoko-dialer ?= "2811"
SRCREV_pn-openmoko-dialer2 ?= "3182"
SRCREV_pn-openmoko-feedreader2 ?= "3080"
@@ -69,7 +69,7 @@ SRCREV_pn-openmoko-libs ?= "2367"
SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3225"
SRCREV_pn-openmoko-keyboard ?= "1631"
SRCREV_pn-openmoko-libs ?= "2367"
-SRCREV_pn-openmoko-mediaplayer2 ?= "3230"
+SRCREV_pn-openmoko-mediaplayer2 ?= "3232"
SRCREV_pn-openmoko-messages ?= "2276"
SRCREV_pn-openmoko-panel-battery ?= "2897"
SRCREV_pn-openmoko-panel-bt ?= "2896"
@@ -96,6 +96,7 @@ SRCREV_pn-openmoko-today2-folders ?= "26
SRCREV_pn-openmoko-today ?= "3056"
SRCREV_pn-openmoko-today2 ?= "3180"
SRCREV_pn-openmoko-today2-folders ?= "2680"
+SRCREV_pn-openmoko-worldclock2 ?= "3241"
SRCREV_pn-openocd ?= "206"
SRCREV_pn-openocd-native ?= "206"
SRCREV_pn-psplash ?= "249"
============================================================
--- conf/machine/i586-generic.conf 4a887ba9af2a184e828b7bc68cf9011f3824cb2e
+++ conf/machine/i586-generic.conf c61d01d967be68b39d6557988891bcf643a627d4
@@ -10,8 +10,9 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER="xserver-kdrive-vesa"
-
KERNEL_IMAGETYPE = "bzImage"
GLIBC_ADDONS = "nptl"
============================================================
--- conf/machine/i686-generic.conf 1b113798190f2b0c8fa137d2590ac3184044f3fd
+++ conf/machine/i686-generic.conf 5a12326f2dba2449f2f055cb75623cb21bb5efc6
@@ -9,6 +9,8 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER="xserver-kdrive-vesa"
KERNEL_IMAGETYPE = "bzImage"
============================================================
--- packages/busybox/busybox_1.7.2.bb e0995507653a71bc95bf32102ed875598938514d
+++ packages/busybox/busybox_1.7.2.bb 07cb779f36d353735584d53006f3eede1ea7fd89
@@ -1,6 +1,6 @@ require busybox.inc
require busybox.inc
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
@@ -14,7 +14,8 @@ SRC_URI = "http://www.busybox.net/downlo
file://syslog \
file://syslog.conf \
file://udhcpscript.patch;patch=1 \
- file://umount.busybox"
+ file://umount.busybox \
+ file://run_parts.c"
SRC_URI += "http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-ash.patch;patch=1 \
@@ -26,6 +27,7 @@ do_configure () {
EXTRA_OEMAKE_append = " V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
do_configure () {
+ cp ${WORKDIR}/run_parts.c ${S}/debianutils/
install -m 0644 ${WORKDIR}/defconfig ${S}/.config
cml1_do_configure
}
============================================================
--- packages/linux/linux/x86/defconfig 0bc90afc51dce1e7536c70ef6a6fb37e5e486451
+++ packages/linux/linux/x86/defconfig 18d877a9d6bedb7fc9cd2a93dc861b26396409b4
@@ -1,15 +1,19 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Sun Jun 3 12:26:50 2007
+# Linux kernel version: 2.6.21
+# Mon Oct 22 10:56:59 2007
#
CONFIG_X86_32=y
CONFIG_GENERIC_TIME=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
CONFIG_LOCKDEP_SUPPORT=y
CONFIG_STACKTRACE_SUPPORT=y
CONFIG_SEMAPHORE_SLEEPERS=y
CONFIG_X86=y
CONFIG_MMU=y
+CONFIG_ZONE_DMA=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_BUG=y
@@ -33,6 +37,7 @@ CONFIG_SYSVIPC=y
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
CONFIG_POSIX_MQUEUE=y
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_TASKSTATS is not set
@@ -43,6 +48,7 @@ CONFIG_SYSFS_DEPRECATED=y
# CONFIG_CPUSETS is not set
CONFIG_SYSFS_DEPRECATED=y
# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
@@ -101,6 +107,9 @@ 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=y
CONFIG_X86_PC=y
# CONFIG_X86_ELAN is not set
@@ -137,7 +146,6 @@ CONFIG_X86_CMPXCHG=y
# CONFIG_MVIAC3_2 is not set
CONFIG_X86_GENERIC=y
CONFIG_X86_CMPXCHG=y
-CONFIG_X86_XADD=y
CONFIG_X86_L1_CACHE_SHIFT=7
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -196,6 +204,7 @@ CONFIG_RESOURCES_64BIT=y
CONFIG_SPARSEMEM_STATIC=y
CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_RESOURCES_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
# CONFIG_HIGHPTE is not set
# CONFIG_MATH_EMULATION is not set
CONFIG_MTRR=y
@@ -228,11 +237,11 @@ CONFIG_ACPI=y
# ACPI (Advanced Configuration and Power Interface) Support
#
CONFIG_ACPI=y
+CONFIG_ACPI_PROCFS=y
CONFIG_ACPI_AC=y
CONFIG_ACPI_BATTERY=y
CONFIG_ACPI_BUTTON=y
CONFIG_ACPI_VIDEO=m
-# CONFIG_ACPI_HOTKEY is not set
CONFIG_ACPI_FAN=y
# CONFIG_ACPI_DOCK is not set
CONFIG_ACPI_PROCESSOR=y
@@ -240,6 +249,7 @@ CONFIG_ACPI_IBM=m
# CONFIG_ACPI_ASUS is not set
CONFIG_ACPI_IBM=m
# CONFIG_ACPI_IBM_DOCK is not set
+CONFIG_ACPI_IBM_BAY=y
# CONFIG_ACPI_TOSHIBA is not set
CONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
@@ -325,7 +335,6 @@ CONFIG_HOTPLUG_PCI_SHPC=m
CONFIG_HOTPLUG_PCI_ACPI_IBM=m
# CONFIG_HOTPLUG_PCI_CPCI is not set
CONFIG_HOTPLUG_PCI_SHPC=m
-# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
#
# Executable file formats
@@ -349,22 +358,39 @@ CONFIG_XFRM=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_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE 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_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
+CONFIG_IP_ROUTE_MULTIPATH_RR=m
+CONFIG_IP_ROUTE_MULTIPATH_RANDOM=m
+CONFIG_IP_ROUTE_MULTIPATH_WRANDOM=m
+CONFIG_IP_ROUTE_MULTIPATH_DRR=m
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+# CONFIG_IP_PIMSM_V1 is not set
+# CONFIG_IP_PIMSM_V2 is not set
+CONFIG_ARPD=y
# 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_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=y
CONFIG_INET_XFRM_MODE_TRANSPORT=y
CONFIG_INET_XFRM_MODE_TUNNEL=y
CONFIG_INET_XFRM_MODE_BEET=y
@@ -379,70 +405,380 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
# IP: Virtual Server Configuration
#
# 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_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_E%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list