diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2005-11-22 22:09:20 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-11-22 22:09:20 +0000 |
| commit | 55b467902c672d54e8c3751521589c13bae78071 (patch) | |
| tree | 61a7d78636fbda7930bbc8851b1294b2384063b9 | |
| parent | b9ffed91a607ceb3ab1761060e9cc1c176149b86 (diff) | |
| parent | 007b0f12cdf14948583d8c80bca970c115d70a69 (diff) | |
merge of 2d9229c5d5599b6452b58e1bd6237f75be857428
and 57be2e37d8f61e00f3da6c2d5362490f4071a500
34 files changed, 519 insertions, 247 deletions
diff --git a/conf/distro/ludeos.conf b/conf/distro/ludeos.conf index ff4951578f..4544281607 100644 --- a/conf/distro/ludeos.conf +++ b/conf/distro/ludeos.conf @@ -15,6 +15,7 @@ FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-bag/cross/$ FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-bag/native/${DISTRO_FEED}" PREFERRED_PROVIDER_virtual/kernel = "nas100d-kernel" +PREFERRED_VERSION_nas100d-kernel ?= "2.6.15-rc1" # This removes the dependency on upslug2-native. SLUGOS_NATIVE_DEPENDS = "" diff --git a/packages/cherokee/.mtn2git_empty b/packages/cherokee/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/cherokee/.mtn2git_empty diff --git a/packages/cherokee/cherokee_0.4.29.bb b/packages/cherokee/cherokee_0.4.29.bb new file mode 100644 index 0000000000..0d2eb3dcfb --- /dev/null +++ b/packages/cherokee/cherokee_0.4.29.bb @@ -0,0 +1,24 @@ +# Cherokee web server +DESCRIPTION = "Cherokee Web Server fast and secure" +LICENSE = "GPL" +DEPENDS = "openssl pcre" +SRC_URI = "http://www.0x50.org/download/0.4/${PV}/${P}.tar.gz \ + file://configure.patch;patch=1 \ + file://Makefile.in.patch;patch=1 \ + file://Makefile.cget.patch;patch=1 \ + file://util.patch;patch=1" + +inherit autotools + +LEAD_SONAME = "libcherokee-base" + +EXTRA_OECONF = "--enable-tls=openssl --disable-static --disable-nls" + +do_configure() { + gnu-configize + oe_runconf +} + +do_install_prepend () { + $BUILD_CC -DHAVE_SYS_STAT_H -o cherokee_replace cherokee_replace.c +} diff --git a/packages/cherokee/files/.mtn2git_empty b/packages/cherokee/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/cherokee/files/.mtn2git_empty diff --git a/packages/cherokee/files/Makefile.cget.patch b/packages/cherokee/files/Makefile.cget.patch new file mode 100644 index 0000000000..bb6b2141b3 --- /dev/null +++ b/packages/cherokee/files/Makefile.cget.patch @@ -0,0 +1,23 @@ + +# +# Patch managed by http://www.xwaves.net +# + +--- cherokee-0.4.29/cget/Makefile.in~Makefile.cget ++++ cherokee-0.4.29/cget/Makefile.in +@@ -56,6 +56,7 @@ + cget_OBJECTS = $(am_cget_OBJECTS) + am__DEPENDENCIES_1 = + cget_DEPENDENCIES = ../cherokee/libcherokee-client.la \ ++ ../cherokee/libcherokee-base.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -286,6 +287,7 @@ + + cget_LDADD = \ + ../cherokee/libcherokee-client.la \ ++../cherokee/libcherokee-base.la \ + $(TLS_LIBS) \ + $(PTHREAD_LIBS) \ + $(PTHREAD_CFLAGS) diff --git a/packages/cherokee/files/Makefile.in.patch b/packages/cherokee/files/Makefile.in.patch new file mode 100644 index 0000000000..9d278121b4 --- /dev/null +++ b/packages/cherokee/files/Makefile.in.patch @@ -0,0 +1,33 @@ + +# +# Patch managed by http://www.xwaves.net +# + +--- cherokee-0.4.29/cherokee/Makefile.in~Makefile ++++ cherokee-0.4.29/cherokee/Makefile.in +@@ -403,11 +403,11 @@ + am_cherokee_admin_OBJECTS = cherokee_admin.$(OBJEXT) + cherokee_admin_OBJECTS = $(am_cherokee_admin_OBJECTS) + cherokee_admin_DEPENDENCIES = libcherokee-config.la \ +- libcherokee-base.la libcherokee-client.la ++ libcherokee-base.la libcherokee-client.la libcherokee-server.la + am_cherokee_logrotate_OBJECTS = cherokee_logrotate.$(OBJEXT) + cherokee_logrotate_OBJECTS = $(am_cherokee_logrotate_OBJECTS) + cherokee_logrotate_DEPENDENCIES = libcherokee-config.la \ +- libcherokee-base.la libcherokee-client.la ++ libcherokee-base.la libcherokee-client.la libcherokee-server.la + binSCRIPT_INSTALL = $(INSTALL_SCRIPT) + SCRIPTS = $(bin_SCRIPTS) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -1343,9 +1343,9 @@ + + cherokee_LDFLAGS = -export-dynamic + cherokee_logrotate_SOURCES = cherokee_logrotate.c +-cherokee_logrotate_LDADD = libcherokee-config.la libcherokee-base.la libcherokee-client.la ++cherokee_logrotate_LDADD = libcherokee-config.la libcherokee-base.la libcherokee-client.la libcherokee-server.la + cherokee_admin_SOURCES = cherokee_admin.c +-cherokee_admin_LDADD = libcherokee-config.la libcherokee-base.la libcherokee-client.la ++cherokee_admin_LDADD = libcherokee-config.la libcherokee-base.la libcherokee-client.la libcherokee-server.la + + #noinst_PROGRAMS = cherokee_modules cherokee_base64 cherokee_headers cherokee_fastcgi + diff --git a/packages/cherokee/files/configure.patch b/packages/cherokee/files/configure.patch new file mode 100644 index 0000000000..9c34d961ac --- /dev/null +++ b/packages/cherokee/files/configure.patch @@ -0,0 +1,127 @@ + +# +# Patch managed by http://www.xwaves.net +# + +--- cherokee-0.4.29/configure~configure ++++ cherokee-0.4.29/configure +@@ -28929,59 +28929,8 @@ + if test "x$have_epoll_include" = "xyes"; then + echo "$as_me:$LINENO: checking for epoll system call" >&5 + echo $ECHO_N "checking for epoll system call... $ECHO_C" >&6 +- +- if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +- #include <stdint.h> +- #include <sys/param.h> +- #include <sys/types.h> +- #include <sys/syscall.h> +- #include <sys/epoll.h> +- #include <unistd.h> +- +- int epoll_create (int size) { +- return (syscall(__NR_epoll_create, size)); +- } +- +- int main (int argc, char **argv) { +- int epfd; +- epfd = epoll_create(256); +- exit (epfd == -1 ? 1 : 0); +- } +- +-_ACEOF +-rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- have_epoll=yes +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi ++have_epoll=yes ++ + echo "$as_me:$LINENO: result: $have_epoll" >&5 + echo "${ECHO_T}$have_epoll" >&6 + fi +@@ -32593,55 +32542,9 @@ + # Is sendfile broken? + echo "$as_me:$LINENO: checking if sendfile works" >&5 + echo $ECHO_N "checking if sendfile works... $ECHO_C" >&6 +-if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <errno.h> +- int main() { +- int o = 0; +- if (-1 == sendfile(0, 0, &o, 0) && errno == ENOSYS) return -1; +- return 0; +- } +-_ACEOF +-rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +-( exit $ac_status ) +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_SENDFILE_BROKEN 1 +-_ACEOF +- +-fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi ++echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6 + + # readdir_r() + diff --git a/packages/cherokee/files/util.patch b/packages/cherokee/files/util.patch new file mode 100644 index 0000000000..5319f18190 --- /dev/null +++ b/packages/cherokee/files/util.patch @@ -0,0 +1,19 @@ + +# +# Patch managed by http://www.xwaves.net +# + +--- cherokee-0.4.29/cherokee/util.c~util ++++ cherokee-0.4.29/cherokee/util.c +@@ -348,9 +348,9 @@ + + + +-#if defined(HAVE_PTHREAD) && !defined(HAVE_READDIR_R) ++/*#if defined(HAVE_PTHREAD) && !defined(HAVE_READDIR_R)*/ + static pthread_mutex_t readdir_mutex = PTHREAD_MUTEX_INITIALIZER; +-#endif ++/*#endif*/ + + /* The readdir subroutine is reentrant when an application program + * uses different DirectoryPointer parameter values (returned from the diff --git a/packages/dbh/dbh_1.0-18.bb b/packages/dbh/dbh_1.0-18.bb index a84bd95dd4..9bcf45c06c 100644 --- a/packages/dbh/dbh_1.0-18.bb +++ b/packages/dbh/dbh_1.0-18.bb @@ -4,6 +4,8 @@ DESCRIPTION ="Disk based hashes is a method to create multidimensional binary tr HOMEPAGE = "http://dbh.sourceforge.net" LICENSE = "GPL" SECTION = "libs" +PR = "r1" + SRC_URI = "${SOURCEFORGE_MIRROR}/dbh/dbh_${PV}.tar.bz2 \ file://${FILESDIR}/configure.patch;patch=1" @@ -16,5 +18,5 @@ do_stage() { install -m 644 src/dbh_functions.h ${STAGING_INCDIR} install -m 644 src/dbh.h ${STAGING_INCDIR} - oe_libinstall -C src/.libs libdbh-1.0 ${STAGING_LIBDIR} + oe_libinstall -C src/.libs libdbh ${STAGING_LIBDIR} } diff --git a/packages/initscripts/initscripts-1.0/akita/keymap-2.6.map b/packages/initscripts/initscripts-1.0/akita/keymap-2.6.map index dc7fa37401..6fc3a9a9cf 100644 --- a/packages/initscripts/initscripts-1.0/akita/keymap-2.6.map +++ b/packages/initscripts/initscripts-1.0/akita/keymap-2.6.map @@ -30,7 +30,7 @@ keycode 13 = keycode 14 = BackSpace altgr keycode 14 = Delete keycode 15 = Tab - shift keycode 65 = Caps_Lock + altgr keycode 15 = Caps_Lock keycode 16 = q keycode 17 = w altgr keycode 17 = asciicircum diff --git a/packages/initscripts/initscripts-1.0/borzoi/keymap-2.6.map b/packages/initscripts/initscripts-1.0/borzoi/keymap-2.6.map index dc7fa37401..6fc3a9a9cf 100644 --- a/packages/initscripts/initscripts-1.0/borzoi/keymap-2.6.map +++ b/packages/initscripts/initscripts-1.0/borzoi/keymap-2.6.map @@ -30,7 +30,7 @@ keycode 13 = keycode 14 = BackSpace altgr keycode 14 = Delete keycode 15 = Tab - shift keycode 65 = Caps_Lock + altgr keycode 15 = Caps_Lock keycode 16 = q keycode 17 = w altgr keycode 17 = asciicircum diff --git a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map index dc7fa37401..6fc3a9a9cf 100755 --- a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map +++ b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map @@ -30,7 +30,7 @@ keycode 13 = keycode 14 = BackSpace altgr keycode 14 = Delete keycode 15 = Tab - shift keycode 65 = Caps_Lock + altgr keycode 15 = Caps_Lock keycode 16 = q keycode 17 = w altgr keycode 17 = asciicircum diff --git a/packages/initscripts/initscripts-1.0/spitz/keymap-2.6.map b/packages/initscripts/initscripts-1.0/spitz/keymap-2.6.map index dc7fa37401..6fc3a9a9cf 100644 --- a/packages/initscripts/initscripts-1.0/spitz/keymap-2.6.map +++ b/packages/initscripts/initscripts-1.0/spitz/keymap-2.6.map @@ -30,7 +30,7 @@ keycode 13 = keycode 14 = BackSpace altgr keycode 14 = Delete keycode 15 = Tab - shift keycode 65 = Caps_Lock + altgr keycode 15 = Caps_Lock keycode 16 = q keycode 17 = w altgr keycode 17 = asciicircum diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 2ad0197a75..c5332f23cf 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r58" +PR = "r59" SRC_URI = "file://halt \ file://ramdisk \ diff --git a/packages/ixp425-eth/ixp400-eth_1.5.bb b/packages/ixp425-eth/ixp400-eth_1.5.bb index 9564210917..86fef76c1d 100644 --- a/packages/ixp425-eth/ixp400-eth_1.5.bb +++ b/packages/ixp425-eth/ixp400-eth_1.5.bb @@ -59,7 +59,7 @@ EXTRA_OEMAKE = "'PWD=${S}' \ # This is to check for unresolved symbol errors and ensure the build # fails, an error here probably means too much as been deconfigured # out of ixp4xx-csr. -KCONFIG_FILE = "${STAGING_KERNEL_DIR}/config-${KERNEL_VERSION}" +KCONFIG_FILE = "${STAGING_KERNEL_DIR}/kernel-config" do_compile_append () { . '${KCONFIG_FILE}' echo "MODPOST: checking that all symbols are resolved" diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.bb index 65282c4aa3..6da973b0d7 100644 --- a/packages/ixp4xx/ixp4xx-csr_2.1.bb +++ b/packages/ixp4xx/ixp4xx-csr_2.1.bb @@ -82,7 +82,7 @@ EXTRA_OEMAKE = "'AR=${AR}' \ MAKE_TARGETS = "lib/${IX_TARGET}/ixp400.o" -KCONFIG_FILE = "${STAGING_KERNEL_DIR}/config-${KERNEL_VERSION}" +KCONFIG_FILE = "${STAGING_KERNEL_DIR}/kernel-config" do_stage () { install -d ${STAGING_INCDIR}/linux/ixp4xx-csr install -m 0644 src/include/*.h ${STAGING_INCDIR}/linux/ixp4xx-csr/ diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-c7x0 index 15aaa98910..447b32a7d5 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-c7x0 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.14-git3 -# Wed Nov 2 15:14:36 2005 +# Linux kernel version: 2.6.15-rc2 +# Mon Nov 21 10:53:30 2005 # CONFIG_ARM=y CONFIG_MMU=y @@ -64,6 +64,23 @@ CONFIG_OBSOLETE_MODPARM=y CONFIG_KMOD=y # +# Block layer +# + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=m +CONFIG_IOSCHED_CFQ=m +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" + +# # System Type # # CONFIG_ARCH_CLPS7500 is not set @@ -85,6 +102,7 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_LH7A40X is not set # CONFIG_ARCH_OMAP is not set # CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_REALVIEW is not set # CONFIG_ARCH_IMX is not set # CONFIG_ARCH_H720X is not set # CONFIG_ARCH_AAEC2000 is not set @@ -107,6 +125,7 @@ CONFIG_MACH_HUSKY=y CONFIG_PXA25x=y # CONFIG_PXA_KEYS is not set CONFIG_PXA_SHARP_C7xx=y +CONFIG_PXA_SSP=y # # Processor Type @@ -149,7 +168,7 @@ CONFIG_PCMCIA_PXA2XX=y # Kernel Features # CONFIG_PREEMPT=y -# CONFIG_NO_IDLE_HZ is not set +CONFIG_NO_IDLE_HZ=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -209,6 +228,8 @@ CONFIG_BINFMT_MISC=m # Power management options # CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set CONFIG_APM=y # @@ -256,6 +277,10 @@ CONFIG_INET6_TUNNEL=m CONFIG_IPV6_TUNNEL=m CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set + +# +# Core Netfilter Configuration +# # CONFIG_NETFILTER_NETLINK is not set # @@ -377,6 +402,10 @@ CONFIG_IP6_NF_RAW=m # CONFIG_NET_DIVERT 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 CONFIG_NET_CLS_ROUTE=y @@ -480,6 +509,11 @@ CONFIG_FW_LOADER=y # CONFIG_DEBUG_DRIVER is not set # +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# # Memory Technology Devices (MTD) # CONFIG_MTD=y @@ -498,6 +532,7 @@ CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set # CONFIG_NFTL is not set # CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set # # RAM/ROM/Flash chip drivers @@ -553,6 +588,11 @@ CONFIG_MTD_NAND_SHARPSL=y # CONFIG_MTD_NAND_NANDSIM is not set # +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# # Parallel port support # # CONFIG_PARPORT is not set @@ -572,19 +612,6 @@ CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_RAM is not set CONFIG_BLK_DEV_RAM_COUNT=16 # CONFIG_CDROM_PKTCDVD 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" # CONFIG_ATA_OVER_ETH is not set # @@ -651,6 +678,7 @@ CONFIG_SCSI_MULTI_LUN=y # # SCSI low-level drivers # +# CONFIG_ISCSI_TCP is not set # CONFIG_SCSI_SATA is not set # CONFIG_SCSI_DEBUG is not set @@ -772,8 +800,9 @@ CONFIG_PPP=m # CONFIG_PPP_FILTER is not set CONFIG_PPP_ASYNC=m # CONFIG_PPP_SYNC_TTY is not set -# CONFIG_PPP_DEFLATE is not set +CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m +# CONFIG_PPP_MPPE is not set # CONFIG_PPPOE is not set # CONFIG_SLIP is not set # CONFIG_SHAPER is not set @@ -820,7 +849,6 @@ CONFIG_TOUCHSCREEN_CORGI=y # CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_MK712 is not set -# CONFIG_TOUCHSCREEN_WM97XX is not set CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m @@ -878,11 +906,14 @@ CONFIG_SA1100_RTC=y # PCMCIA character devices # # CONFIG_SYNCLINK_CS is not set +# CONFIG_CARDMAN_4000 is not set +# CONFIG_CARDMAN_4040 is not set # CONFIG_RAW_DRIVER is not set # # TPM devices # +# CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set # @@ -919,7 +950,6 @@ CONFIG_I2C_PXA=y # CONFIG_SENSORS_RTC8564 is not set # CONFIG_SENSORS_MAX6875 is not set # CONFIG_RTC_X1205_I2C is not set -# CONFIG_MAX7310 is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -928,41 +958,7 @@ CONFIG_I2C_PXA=y # # Hardware Monitoring support # -CONFIG_HWMON=y -# CONFIG_HWMON_VID is not set -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -# CONFIG_SENSORS_ADM1031 is not set -# CONFIG_SENSORS_ADM9240 is not set -# CONFIG_SENSORS_ASB100 is not set -# CONFIG_SENSORS_ATXP1 is not set -# CONFIG_SENSORS_DS1621 is not set -# CONFIG_SENSORS_FSCHER is not set -# CONFIG_SENSORS_FSCPOS is not set -# CONFIG_SENSORS_GL518SM is not set -# CONFIG_SENSORS_GL520SM is not set -# CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_LM63 is not set -# CONFIG_SENSORS_LM75 is not set -# CONFIG_SENSORS_LM77 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM80 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_LM87 is not set -# CONFIG_SENSORS_LM90 is not set -# CONFIG_SENSORS_LM92 is not set -# CONFIG_SENSORS_MAX1619 is not set -# CONFIG_SENSORS_PC87360 is not set -# CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SMSC47B397 is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83792D is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set -# CONFIG_HWMON_DEBUG_CHIP is not set +# CONFIG_HWMON is not set # # Misc devices @@ -973,9 +969,8 @@ CONFIG_HWMON=y # # -# SoC drivers +# Multi-Function Devices # -# CONFIG_SOC is not set # # Multimedia devices @@ -993,7 +988,10 @@ CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_SAA5246A is not set # CONFIG_VIDEO_SAA5249 is not set # CONFIG_TUNER_3036 is not set +# CONFIG_VIDEO_EM28XX is not set # CONFIG_VIDEO_OVCAMCHIP is not set +# CONFIG_VIDEO_AUDIO_DECODER is not set +# CONFIG_VIDEO_DECODER is not set # # Radio Adapters @@ -1015,9 +1013,9 @@ CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_MACMODES is not set # CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_TILEBLITTING is not set +# CONFIG_FB_S1D13XXX is not set # CONFIG_FB_PXA is not set CONFIG_FB_W100=y -# CONFIG_FB_S1D13XXX is not set # CONFIG_FB_VIRTUAL is not set # @@ -1058,6 +1056,8 @@ CONFIG_SOUND=y # Advanced Linux Sound Architecture # CONFIG_SND=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_AC97_BUS=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_SEQUENCER=m @@ -1068,7 +1068,6 @@ CONFIG_SND_PCM_OSS=m # CONFIG_SND_SEQUENCER_OSS is not set CONFIG_SND_VERBOSE_PRINTK=y CONFIG_SND_DEBUG=y -# CONFIG_SND_DEBUG_MEMORY is not set # CONFIG_SND_DEBUG_DETECT is not set # @@ -1079,8 +1078,6 @@ CONFIG_SND_DEBUG=y # CONFIG_SND_MTPAV is not set # CONFIG_SND_SERIAL_U16550 is not set # CONFIG_SND_MPU401 is not set -CONFIG_SND_AC97_CODEC=m -CONFIG_SND_AC97_BUS=m # # ALSA ARM devices @@ -1123,43 +1120,32 @@ CONFIG_SND_PXA2xx_SOC_CORGI=m # CONFIG_SND_SOC_WM8753 is not set CONFIG_SND_SOC_WM8731=m # CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8971 is not set # # Open Sound System # CONFIG_SOUND_PRIME=m +# CONFIG_OBSOLETE_OSS_DRIVER is not set # CONFIG_SOUND_MSNDCLAS is not set # CONFIG_SOUND_MSNDPIN is not set CONFIG_SOUND_OSS=m # CONFIG_SOUND_TRACEINIT is not set # CONFIG_SOUND_DMAP is not set # CONFIG_SOUND_AD1816 is not set -# CONFIG_SOUND_SGALAXY is not set # CONFIG_SOUND_ADLIB is not set # CONFIG_SOUND_ACI_MIXER is not set -# CONFIG_SOUND_CS4232 is not set -# CONFIG_SOUND_SSCAPE is not set -# CONFIG_SOUND_GUS is not set # CONFIG_SOUND_VMIDI is not set # CONFIG_SOUND_TRIX is not set # CONFIG_SOUND_MSS is not set # CONFIG_SOUND_MPU401 is not set -# CONFIG_SOUND_NM256 is not set -# CONFIG_SOUND_MAD16 is not set # CONFIG_SOUND_PAS is not set # CONFIG_SOUND_PSS is not set -CONFIG_SOUND_CORGI=m # CONFIG_SOUND_SB is not set -# CONFIG_SOUND_AWE32_SYNTH is not set -# CONFIG_SOUND_WAVEFRONT is not set -# CONFIG_SOUND_MAUI is not set -# CONFIG_SOUND_YM3812 is not set -# CONFIG_SOUND_OPL3SA1 is not set # CONFIG_SOUND_OPL3SA2 is not set # CONFIG_SOUND_UART6850 is not set # CONFIG_SOUND_AEDSP16 is not set # CONFIG_SOUND_TVMIXER is not set -# CONFIG_SOUND_AD1980 is not set # # USB support @@ -1209,7 +1195,6 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_SDDR09 is not set # CONFIG_USB_STORAGE_SDDR55 is not set # CONFIG_USB_STORAGE_JUMPSHOT is not set -# CONFIG_USB_STORAGE_ONETOUCH is not set # # USB Input Devices @@ -1287,6 +1272,7 @@ CONFIG_USB_MON=y CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y # CONFIG_USB_SERIAL_AIRPRIME is not set +# CONFIG_USB_SERIAL_ANYDATA is not set CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m @@ -1318,7 +1304,6 @@ CONFIG_USB_SERIAL_KEYSPAN=m CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m -# CONFIG_USB_SERIAL_NOKIA_DKU2 is not set CONFIG_USB_SERIAL_PL2303=m # CONFIG_USB_SERIAL_HP4X is not set CONFIG_USB_SERIAL_SAFE=m @@ -1443,6 +1428,7 @@ CONFIG_RAMFS=y CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_SUMMARY=y CONFIG_JFFS2_COMPRESSION_OPTIONS=y CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y @@ -1476,7 +1462,7 @@ CONFIG_RPCSEC_GSS_KRB5=m CONFIG_SMB_FS=m CONFIG_SMB_NLS_DEFAULT=y CONFIG_SMB_NLS_REMOTE="cp437" -# CONFIG_CIFS is not set +CONFIG_CIFS=m # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-collie b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-collie index 5dbd118cf1..354d0c2854 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-collie +++ b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-collie @@ -153,7 +153,7 @@ CONFIG_PCMCIA_SA1100=y # # CONFIG_SMP is not set CONFIG_PREEMPT=y -# CONFIG_NO_IDLE_HZ is not set +CONFIG_NO_IDLE_HZ=y CONFIG_ARCH_DISCONTIGMEM_ENABLE=y CONFIG_SELECT_MEMORY_MODEL=y # CONFIG_FLATMEM_MANUAL is not set @@ -381,8 +381,8 @@ CONFIG_BLK_DEV_INITRD=y # CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y +CONFIG_IOSCHED_DEADLINE=m +CONFIG_IOSCHED_CFQ=m CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_DEADLINE is not set # CONFIG_DEFAULT_CFQ is not set @@ -511,7 +511,7 @@ CONFIG_PPP=m # CONFIG_PPP_FILTER is not set CONFIG_PPP_ASYNC=m # CONFIG_PPP_SYNC_TTY is not set -# CONFIG_PPP_DEFLATE is not set +CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m # CONFIG_PPPOE is not set # CONFIG_SLIP is not set @@ -661,41 +661,7 @@ CONFIG_I2C_ALGOBIT=m # # Hardware Monitoring support # -CONFIG_HWMON=y -# CONFIG_HWMON_VID is not set -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -# CONFIG_SENSORS_ADM1031 is not set -# CONFIG_SENSORS_ADM9240 is not set -# CONFIG_SENSORS_ASB100 is not set -# CONFIG_SENSORS_ATXP1 is not set -# CONFIG_SENSORS_DS1621 is not set -# CONFIG_SENSORS_FSCHER is not set -# CONFIG_SENSORS_FSCPOS is not set -# CONFIG_SENSORS_GL518SM is not set -# CONFIG_SENSORS_GL520SM is not set -# CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_LM63 is not set -# CONFIG_SENSORS_LM75 is not set -# CONFIG_SENSORS_LM77 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM80 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_LM87 is not set -# CONFIG_SENSORS_LM90 is not set -# CONFIG_SENSORS_LM92 is not set -# CONFIG_SENSORS_MAX1619 is not set -# CONFIG_SENSORS_PC87360 is not set -# CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SMSC47B397 is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83792D is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set -# CONFIG_HWMON_DEBUG_CHIP is not set +# CONFIG_HWMON is not set # # Misc devices @@ -893,6 +859,7 @@ CONFIG_JFFS2_FS_WRITEBUFFER=y # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y +CONFIG_JFFS2_SUMMARY=y # CONFIG_JFFS2_RUBIN is not set CONFIG_CRAMFS=y # CONFIG_VXFS_FS is not set diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-cxx00 b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-cxx00 index 9665ac548e..2e03cc17cf 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-cxx00 +++ b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-cxx00 @@ -148,7 +148,7 @@ CONFIG_PCMCIA_PXA2XX=y # Kernel Features # CONFIG_PREEMPT=y -# CONFIG_NO_IDLE_HZ is not set +CONFIG_NO_IDLE_HZ=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -565,8 +565,8 @@ CONFIG_BLK_DEV_RAM_COUNT=16 # CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y +CONFIG_IOSCHED_DEADLINE=m +CONFIG_IOSCHED_CFQ=m CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_DEADLINE is not set # CONFIG_DEFAULT_CFQ is not set @@ -759,7 +759,7 @@ CONFIG_PPP=m # CONFIG_PPP_FILTER is not set CONFIG_PPP_ASYNC=m # CONFIG_PPP_SYNC_TTY is not set -# CONFIG_PPP_DEFLATE is not set +CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m # CONFIG_PPPOE is not set # CONFIG_SLIP is not set @@ -915,41 +915,7 @@ CONFIG_MAX7310=y # # Hardware Monitoring support # -CONFIG_HWMON=y -# CONFIG_HWMON_VID is not set -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -# CONFIG_SENSORS_ADM1031 is not set -# CONFIG_SENSORS_ADM9240 is not set -# CONFIG_SENSORS_ASB100 is not set -# CONFIG_SENSORS_ATXP1 is not set -# CONFIG_SENSORS_DS1621 is not set -# CONFIG_SENSORS_FSCHER is not set -# CONFIG_SENSORS_FSCPOS is not set -# CONFIG_SENSORS_GL518SM is not set -# CONFIG_SENSORS_GL520SM is not set -# CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_LM63 is not set -# CONFIG_SENSORS_LM75 is not set -# CONFIG_SENSORS_LM77 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM80 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_LM87 is not set -# CONFIG_SENSORS_LM90 is not set -# CONFIG_SENSORS_LM92 is not set -# CONFIG_SENSORS_MAX1619 is not set -# CONFIG_SENSORS_PC87360 is not set -# CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SMSC47B397 is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83792D is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set -# CONFIG_HWMON_DEBUG_CHIP is not set +# CONFIG_HWMON is not set # # Misc devices @@ -1386,6 +1352,7 @@ CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_SUMMARY=y CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y CONFIG_JFFS2_RUBIN=y @@ -1418,7 +1385,7 @@ CONFIG_RPCSEC_GSS_KRB5=m CONFIG_SMB_FS=m CONFIG_SMB_NLS_DEFAULT=y CONFIG_SMB_NLS_REMOTE="cp437" -# CONFIG_CIFS is not set +CONFIG_CIFS=m # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-ipaq-pxa270 b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-ipaq-pxa270 index b51668e17d..fe4cf247c1 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-ipaq-pxa270 +++ b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-ipaq-pxa270 @@ -72,8 +72,8 @@ CONFIG_OBSOLETE_MODPARM=y # CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y +CONFIG_IOSCHED_DEADLINE=m +CONFIG_IOSCHED_CFQ=m CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_DEADLINE is not set # CONFIG_DEFAULT_CFQ is not set @@ -158,7 +158,7 @@ CONFIG_PCMCIA_PXA2XX=y # Kernel Features # CONFIG_PREEMPT=y -# CONFIG_NO_IDLE_HZ is not set +CONFIG_NO_IDLE_HZ=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -554,7 +554,7 @@ CONFIG_PPP=m # CONFIG_PPP_FILTER is not set CONFIG_PPP_ASYNC=m # CONFIG_PPP_SYNC_TTY is not set -# CONFIG_PPP_DEFLATE is not set +CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m # CONFIG_PPP_MPPE is not set # CONFIG_PPPOE is not set @@ -671,9 +671,7 @@ CONFIG_LEGACY_PTY_COUNT=256 # # Hardware Monitoring support # -CONFIG_HWMON=y -# CONFIG_HWMON_VID is not set -# CONFIG_HWMON_DEBUG_CHIP is not set +CONFIG_HWMON is not set # # Misc devices @@ -831,6 +829,7 @@ CONFIG_JFFS2_FS_WRITEBUFFER=y # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y +CONFIG_JFFS2_SUMMARY=y # CONFIG_JFFS2_RUBIN is not set CONFIG_CRAMFS=y # CONFIG_VXFS_FS is not set diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-poodle index 32464ac018..34e9ddfb86 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-poodle +++ b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-poodle @@ -259,8 +259,8 @@ CONFIG_INITRAMFS_SOURCE="" # CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y +CONFIG_IOSCHED_DEADLINE=m +CONFIG_IOSCHED_CFQ=m # CONFIG_ATA_OVER_ETH is not set # @@ -412,7 +412,7 @@ CONFIG_PPP=m # CONFIG_PPP_FILTER is not set CONFIG_PPP_ASYNC=m # CONFIG_PPP_SYNC_TTY is not set -# CONFIG_PPP_DEFLATE is not set +CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m # CONFIG_PPPOE is not set # CONFIG_SLIP is not set @@ -716,6 +716,7 @@ CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_NAND=y # CONFIG_JFFS2_FS_NOR_ECC is not set CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_SUMMARY=y CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y CONFIG_JFFS2_RUBIN=y diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-tosa index 60c49c6dec..0c39ed8544 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-tosa +++ b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-tosa @@ -150,7 +150,7 @@ CONFIG_PCMCIA_PXA2XX=y # Kernel Features # CONFIG_PREEMPT=y -# CONFIG_NO_IDLE_HZ is not set +CONFIG_NO_IDLE_HZ=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -558,9 +558,9 @@ CONFIG_BLK_DEV_RAM_COUNT=16 # IO Schedulers # CONFIG_IOSCHED_NOOP=y -# CONFIG_IOSCHED_AS is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=m +CONFIG_IOSCHED_CFQ=m # CONFIG_ATA_OVER_ETH is not set # @@ -747,7 +747,7 @@ CONFIG_PPP=m # CONFIG_PPP_FILTER is not set CONFIG_PPP_ASYNC=m # CONFIG_PPP_SYNC_TTY is not set -# CONFIG_PPP_DEFLATE is not set +CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m # CONFIG_PPP_MPPE is not set # CONFIG_PPPOE is not set @@ -904,41 +904,7 @@ CONFIG_I2C_PXA=y # # Hardware Monitoring support # -CONFIG_HWMON=y -# CONFIG_HWMON_VID is not set -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -# CONFIG_SENSORS_ADM1031 is not set -# CONFIG_SENSORS_ADM9240 is not set -# CONFIG_SENSORS_ASB100 is not set -# CONFIG_SENSORS_ATXP1 is not set -# CONFIG_SENSORS_DS1621 is not set -# CONFIG_SENSORS_FSCHER is not set -# CONFIG_SENSORS_FSCPOS is not set -# CONFIG_SENSORS_GL518SM is not set -# CONFIG_SENSORS_GL520SM is not set -# CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_LM63 is not set -# CONFIG_SENSORS_LM75 is not set -# CONFIG_SENSORS_LM77 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM80 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_LM87 is not set -# CONFIG_SENSORS_LM90 is not set -# CONFIG_SENSORS_LM92 is not set -# CONFIG_SENSORS_MAX1619 is not set -# CONFIG_SENSORS_PC87360 is not set -# CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SMSC47B397 is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83792D is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set -# CONFIG_HWMON_DEBUG_CHIP is not set +# CONFIG_HWMON is not set # # Misc devices @@ -1372,6 +1338,7 @@ CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_SUMMARY=y CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y CONFIG_JFFS2_RUBIN=y diff --git a/packages/linux/nas100d-kernel.inc b/packages/linux/nas100d-kernel.inc index 72af498439..f8da5d3059 100644 --- a/packages/linux/nas100d-kernel.inc +++ b/packages/linux/nas100d-kernel.inc @@ -171,10 +171,8 @@ KERNEL_IMAGETYPE = "zImage" # contains the things for a specific kernel. # CMDLINE_KERNEL_OPTIONS ?= "reboot=s" CMDLINE_KERNEL_OPTIONS ?= -CMDLINE_ROOT ?= "root=/dev/mtdblock3 rw rootfstype=jffs2 mem=64M@0x00000000 init=/linuxrc" -# Add distro specific debug (or non-debug) options to this -# CMDLINE_DEBUG ?= "noirqdebug" -CMDLINE_DEBUG ?= +CMDLINE_ROOT = "root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M@0x00000000 init=/linuxrc" +CMDLINE_DEBUG = CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_KERNEL_OPTIONS} ${CMDLINE_DEBUG} ${CMDLINE_CONSOLE}" # Add the architecture compiler flags to KERNEL_CC and KERNEL_LD as diff --git a/packages/linux/nas100d-kernel/2.6.15/60-nas100d-ide.patch b/packages/linux/nas100d-kernel/2.6.15/60-nas100d-ide.patch index 9f5d164356..afd7d9c750 100644 --- a/packages/linux/nas100d-kernel/2.6.15/60-nas100d-ide.patch +++ b/packages/linux/nas100d-kernel/2.6.15/60-nas100d-ide.patch @@ -1,17 +1,18 @@ - drivers/ide/pci/aec62xx.c | 51 +++++++++++++++++++++++++++++++++++++++++++--- - drivers/ide/setup-pci.c | 12 +++++++++- - 2 files changed, 59 insertions(+), 4 deletions(-) + drivers/ide/pci/aec62xx.c | 67 +++++++++++++++++++++++++++++++++++++++++++--- + drivers/ide/setup-pci.c | 12 +++++++- + 2 files changed, 75 insertions(+), 4 deletions(-) ---- linux-nas100d.orig/drivers/ide/pci/aec62xx.c 2005-11-12 15:38:03.000000000 +0100 -+++ linux-nas100d/drivers/ide/pci/aec62xx.c 2005-11-13 01:45:26.000000000 +0100 -@@ -145,6 +145,15 @@ static int aec6210_tune_chipset (ide_dri +--- linux-nas100d.orig/drivers/ide/pci/aec62xx.c 2005-11-21 20:49:50.000000000 +0100 ++++ linux-nas100d/drivers/ide/pci/aec62xx.c 2005-11-21 22:15:21.000000000 +0100 +@@ -145,6 +145,16 @@ static int aec6210_tune_chipset (ide_dri unsigned long flags; local_irq_save(flags); + +#ifdef CONFIG_MACH_NAS100D + printk(KERN_INFO "aec62xx: nas100d tuning\n"); -+ pci_write_config_byte(hwif->pci_dev, PCI_LATENCY_TIMER, 0x90); ++ pci_write_config_word(hwif->pci_dev, PCI_COMMAND, PCI_COMMAND_IO | PCI_COMMAND_MASTER); ++ pci_write_config_byte(hwif->pci_dev, PCI_LATENCY_TIMER, 0x80); + /* Enable burst mode & force 2 ports enable */ + pci_read_config_byte(hwif->pci_dev, 0x4a, &tmp0); + pci_write_config_byte(hwif->pci_dev, 0x4a, tmp0 | 0x80); @@ -20,7 +21,25 @@ /* 0x40|(2*drive->dn): Active, 0x41|(2*drive->dn): Recovery */ pci_read_config_word(dev, 0x40|(2*drive->dn), &d_conf); tmp0 = pci_bus_clock_list(speed, BUSCLOCK(dev)); -@@ -263,7 +272,7 @@ static int aec62xx_irq_timeout (ide_driv +@@ -206,9 +216,17 @@ static int config_chipset_for_dma (ide_d + { + u8 speed = ide_dma_speed(drive, aec62xx_ratemask(drive)); + ++#ifdef CONFIG_MACH_NAS100D ++ ide_hwif_t *hwif= HWIF(drive); ++ u8 unit = (drive->select.b.unit & 0x01); ++#endif + if (!(speed)) + return 0; + ++#ifdef CONFIG_MACH_NAS100D ++ outb((inb(hwif->dma_base+2) & ~(1<<(5+unit))), hwif->dma_base+2); ++#endif ++ + (void) aec62xx_tune_chipset(drive, speed); + return ide_dma_enable(drive); + } +@@ -263,7 +281,7 @@ static int aec62xx_irq_timeout (ide_driv case PCI_DEVICE_ID_ARTOP_ATP865: case PCI_DEVICE_ID_ARTOP_ATP865R: printk(" AEC62XX time out "); @@ -29,7 +48,7 @@ { int i = 0; u8 reg49h = 0; -@@ -277,7 +286,7 @@ static int aec62xx_irq_timeout (ide_driv +@@ -277,7 +295,7 @@ static int aec62xx_irq_timeout (ide_driv default: break; } @@ -38,7 +57,7 @@ { ide_hwif_t *hwif = HWIF(drive); struct pci_dev *dev = hwif->pci_dev; -@@ -299,6 +308,14 @@ static unsigned int __devinit init_chips +@@ -299,6 +317,14 @@ static unsigned int __devinit init_chips { int bus_speed = system_bus_clock(); @@ -53,7 +72,7 @@ if (dev->resource[PCI_ROM_RESOURCE].start) { pci_write_config_dword(dev, PCI_ROM_ADDRESS, dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE); printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, dev->resource[PCI_ROM_RESOURCE].start); -@@ -312,12 +329,35 @@ static unsigned int __devinit init_chips +@@ -312,12 +338,35 @@ static unsigned int __devinit init_chips return dev->irq; } @@ -89,7 +108,7 @@ if (hwif->pci_dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF) { hwif->serialized = hwif->channel; hwif->no_dsc = 1; -@@ -360,7 +400,7 @@ static void __devinit init_dma_aec62xx(i +@@ -360,11 +409,18 @@ static void __devinit init_dma_aec62xx(i } else { u8 ata66 = 0; pci_read_config_byte(hwif->pci_dev, 0x49, &ata66); @@ -98,7 +117,18 @@ hwif->udma_four = (ata66&(hwif->channel?0x02:0x01))?0:1; } -@@ -427,6 +467,9 @@ static ide_pci_device_t aec62xx_chipsets + ide_setup_dma(hwif, dmabase, 8); ++#ifdef CONFIG_MACH_NAS100D ++ { ++ u8 dma_stat = hwif->INB(hwif->dma_status); ++ dma_stat |= (1 << 4); ++ hwif->OUTB(dma_stat, hwif->dma_status); ++ } ++#endif + } + + static int __devinit init_setup_aec62xx(struct pci_dev *dev, ide_pci_device_t *d) +@@ -427,6 +483,9 @@ static ide_pci_device_t aec62xx_chipsets .init_dma = init_dma_aec62xx, .channels = 2, .autodma = AUTODMA, @@ -108,7 +138,7 @@ .bootable = OFF_BOARD, },{ /* 4 */ .name = "AEC6X80R", -@@ -454,6 +497,8 @@ static int __devinit aec62xx_init_one(st +@@ -454,6 +513,8 @@ static int __devinit aec62xx_init_one(st { ide_pci_device_t *d = &aec62xx_chipsets[id->driver_data]; @@ -117,8 +147,8 @@ return d->init_setup(dev, d); } ---- linux-nas100d.orig/drivers/ide/setup-pci.c 2005-11-12 15:38:03.000000000 +0100 -+++ linux-nas100d/drivers/ide/setup-pci.c 2005-11-13 01:36:30.000000000 +0100 +--- linux-nas100d.orig/drivers/ide/setup-pci.c 2005-11-21 20:49:50.000000000 +0100 ++++ linux-nas100d/drivers/ide/setup-pci.c 2005-11-21 22:01:22.000000000 +0100 @@ -602,10 +602,20 @@ void ide_pci_setup_ports(struct pci_dev if ((d->flags & IDEPCI_FLAG_FORCE_PDC) && (secondpdc++==1) && (port==1)) diff --git a/packages/linux/nas100d-kernel/2.6.15/90-ixp4xx-nslu2.patch b/packages/linux/nas100d-kernel/2.6.15/90-ixp4xx-nslu2.patch new file mode 100644 index 0000000000..c106f7c957 --- /dev/null +++ b/packages/linux/nas100d-kernel/2.6.15/90-ixp4xx-nslu2.patch @@ -0,0 +1,132 @@ +ixp4xx updates: + - Handle reads that don't start on a half-word boundary. + - Make it work when CPU is in little-endian mode. + +Signed-off-by: John Bowler <jbowler@acm.org> +Signed-off-by: Alessandro Zummo <a.zummo@towertech.it> +Signed-off-by: David Vrabel <dvrabel@arcom.com> + +Index: linux-2.6-working/drivers/mtd/maps/ixp4xx.c +=================================================================== +--- linux-2.6-working.orig/drivers/mtd/maps/ixp4xx.c 2005-11-16 15:19:34.000000000 +0000 ++++ linux-2.6-working/drivers/mtd/maps/ixp4xx.c 2005-11-16 16:06:54.000000000 +0000 +@@ -34,10 +34,55 @@ + + #include <linux/reboot.h> + ++/* ++ * Read/write a 16 bit word from flash address 'addr'. ++ * ++ * When the cpu is in little-endian mode it swizzles the address lines ++ * ('address coherency') so we need to undo the swizzling to ensure commands ++ * and the like end up on the correct flash address. ++ * ++ * To further complicate matters, due to the way the expansion bus controller ++ * handles 32 bit reads, the byte stream ABCD is stored on the flash as: ++ * D15 D0 ++ * +---+---+ ++ * | A | B | 0 ++ * +---+---+ ++ * | C | D | 2 ++ * +---+---+ ++ * This means that on LE systems each 16 bit word must be swapped. Note that ++ * this requires CONFIG_MTD_CFI_BE_BYTE_SWAP to be enabled to 'unswap' the CFI ++ * data and other flash commands which are always in D7-D0. ++ */ + #ifndef __ARMEB__ ++#ifndef CONFIG_MTD_CFI_BE_BYTE_SWAP ++# error CONFIG_MTD_CFI_BE_BYTE_SWAP required ++#endif ++ ++static inline u16 flash_read16(void __iomem *addr) ++{ ++ return be16_to_cpu(__raw_readw((void __iomem *)((unsigned long)addr ^ 0x2))); ++} ++ ++static inline void flash_write16(u16 d, void __iomem *addr) ++{ ++ __raw_writew(cpu_to_be16(d), (void __iomem *)((unsigned long)addr ^ 0x2)); ++} ++ + #define BYTE0(h) ((h) & 0xFF) + #define BYTE1(h) (((h) >> 8) & 0xFF) ++ + #else ++ ++static inline u16 flash_read16(const void __iomem *addr) ++{ ++ return __raw_readw(addr); ++} ++ ++static inline void flash_write16(u16 d, void __iomem *addr) ++{ ++ __raw_writew(d, addr); ++} ++ + #define BYTE0(h) (((h) >> 8) & 0xFF) + #define BYTE1(h) ((h) & 0xFF) + #endif +@@ -45,7 +90,7 @@ + static map_word ixp4xx_read16(struct map_info *map, unsigned long ofs) + { + map_word val; +- val.x[0] = le16_to_cpu(readw(map->virt + ofs)); ++ val.x[0] = flash_read16(map->virt + ofs); + return val; + } + +@@ -57,19 +102,28 @@ + static void ixp4xx_copy_from(struct map_info *map, void *to, + unsigned long from, ssize_t len) + { +- int i; + u8 *dest = (u8 *) to; + void __iomem *src = map->virt + from; +- u16 data; + +- for (i = 0; i < (len / 2); i++) { +- data = le16_to_cpu(readw(src + 2*i)); +- dest[i * 2] = BYTE0(data); +- dest[i * 2 + 1] = BYTE1(data); ++ if (len <= 0) ++ return; ++ ++ if (from & 1) { ++ *dest++ = BYTE1(flash_read16(src)); ++ src++; ++ --len; + } + +- if (len & 1) +- dest[len - 1] = BYTE0(le16_to_cpu(readw(src + 2*i))); ++ while (len >= 2) { ++ u16 data = flash_read16(src); ++ *dest++ = BYTE0(data); ++ *dest++ = BYTE1(data); ++ src += 2; ++ len -= 2; ++ } ++ ++ if (len > 0) ++ *dest++ = BYTE0(flash_read16(src)); + } + + /* +@@ -79,7 +133,7 @@ + static void ixp4xx_probe_write16(struct map_info *map, map_word d, unsigned long adr) + { + if (!(adr & 1)) +- writew(cpu_to_le16(d.x[0]), map->virt + adr); ++ flash_write16(d.x[0], map->virt + adr); + } + + /* +@@ -87,7 +141,7 @@ + */ + static void ixp4xx_write16(struct map_info *map, map_word d, unsigned long adr) + { +- writew(cpu_to_le16(d.x[0]), map->virt + adr); ++ flash_write16(d.x[0], map->virt + adr); + } + + struct ixp4xx_flash_info { diff --git a/packages/linux/nas100d-kernel/2.6.15/defconfig b/packages/linux/nas100d-kernel/2.6.15/defconfig index 939a5d437e..f0d28ccd2b 100644 --- a/packages/linux/nas100d-kernel/2.6.15/defconfig +++ b/packages/linux/nas100d-kernel/2.6.15/defconfig @@ -966,7 +966,7 @@ CONFIG_I2C_DEBUG_CORE=n CONFIG_I2C_DEBUG_ALGO=n CONFIG_I2C_DEBUG_BUS=n CONFIG_I2C_DEBUG_CHIP=y -CONFIG_RTC_PCF8563_I2C=m +CONFIG_RTC_PCF8563_I2C=y # # Hardware Monitoring support diff --git a/packages/linux/nas100d-kernel_2.6.15-rc1.bb b/packages/linux/nas100d-kernel_2.6.15-rc1.bb index ddb969277f..3155a5ecd0 100644 --- a/packages/linux/nas100d-kernel_2.6.15-rc1.bb +++ b/packages/linux/nas100d-kernel_2.6.15-rc1.bb @@ -25,6 +25,7 @@ N1K_PATCHES = "\ file://50-nas100d-arch.patch;patch=1 \ file://60-nas100d-ide.patch;patch=1 \ file://60-nas100d-i2c.patch;patch=1 \ + file://90-ixp4xx-nslu2.patch;patch=1 \ " include nas100d-kernel.inc diff --git a/packages/linux/nslu2-kernel_2.6.15-rc1.bb b/packages/linux/nslu2-kernel_2.6.15-rc2.bb index ca938dbaac..d2b55c8e7b 100644 --- a/packages/linux/nslu2-kernel_2.6.15-rc1.bb +++ b/packages/linux/nslu2-kernel_2.6.15-rc2.bb @@ -8,14 +8,13 @@ PR_CONFIG = "0" # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches # applied to the kernel. -PR = "r2.${PR_CONFIG}" +PR = "r0.${PR_CONFIG}" include nslu2-kernel.inc # N2K_PATCHES - full list of patches to apply N2K_PATCHES = "\ file://00-memory-h-page-shift.patch;patch=1 \ - file://01-i2c-ixp4xx.patch;patch=1 \ file://10-mtdpart-redboot-fis-byteswap.patch;patch=1 \ file://19-jffs2-force-be.patch;patch=1 \ file://55-rtc-x1205.patch;patch=1 \ diff --git a/packages/logrotate-script/logrotate-script_cvs.bb b/packages/logrotate-script/logrotate-script_cvs.bb index a9dd380596..da05f25a7d 100644 --- a/packages/logrotate-script/logrotate-script_cvs.bb +++ b/packages/logrotate-script/logrotate-script_cvs.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" LICENSE = "GPL" -SRC_URI = "svn://meshcube.org/svn/scripts;module=logrotate" +SRC_URI = "http://meshcube.org/download/logrotate_${CVSDATE}.tgz" S = "${WORKDIR}/${PN}" do_install() { diff --git a/packages/ntp/ntp_4.2.0.bb b/packages/ntp/ntp_4.2.0.bb index 5f4c2a8262..e4988c2be7 100644 --- a/packages/ntp/ntp_4.2.0.bb +++ b/packages/ntp/ntp_4.2.0.bb @@ -6,11 +6,10 @@ HOMEPAGE = "http://ntp.isc.org/bin/view/Main/WebHome" SECTION = "console/network" PRIORITY = "optional" LICENSE = "ntp" -PR = "r6" +PR = "r7" SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${P}.tar.gz \ file://ntpdc.Makefile.am.maybe-layout.patch;patch=1 \ - file://gcc4.patch;patch=1 \ file://ipv6only-workaround.patch;patch=1 \ file://ntpd \ file://ntp.conf \ diff --git a/packages/nylon/nylon-scripts_cvs.bb b/packages/nylon/nylon-scripts_cvs.bb index efb0c47530..f791afd7a5 100644 --- a/packages/nylon/nylon-scripts_cvs.bb +++ b/packages/nylon/nylon-scripts_cvs.bb @@ -6,9 +6,9 @@ PRIORITY = "optional" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" LICENSE = "GPLv2" PV = "cvs${CVSDATE}" -PR = "r1" +PR = "r2" -SRC_URI = "svn://meshcube.org/svn/scripts;module=${PN};proto=http" +SRC_URI = "http://meshcube.org/download/${PN}_${CVSDATE}.tgz" S = "${WORKDIR}/${PN}" do_install() { @@ -20,8 +20,6 @@ if test "x$D" != "x"; then exit 1 else update-rc.d -s hostap defaults 14 - update-rc.d -s bridge defaults 15 - update-rc.d -s ipaliases defaults 16 update-rc.d -s firewall defaults 20 update-rc.d -s routing defaults 20 update-rc.d -s emergency-ip defaults 98 @@ -56,4 +54,4 @@ update-rc.d flash-backup remove update-rc.d dummydate remove } -CONFFILES_${PN} = "/etc/nylon/backup.list /etc/nylon/bridge.conf /etc/nylon/configip.conf /etc/nylon/hostap.conf /etc/nylon/interfaces.conf /etc/nylon/macfilter.list /etc/nylon/route.list" +CONFFILES_${PN} = "/etc/nylon/backup.list /etc/nylon/hostap.conf /etc/nylon/interfaces.conf /etc/nylon/route.list" diff --git a/packages/nylon/nylon-statistics.bb b/packages/nylon/nylon-statistics.bb index 90da9bf5b9..ba63d62671 100644 --- a/packages/nylon/nylon-statistics.bb +++ b/packages/nylon/nylon-statistics.bb @@ -7,7 +7,7 @@ LICENSE = "GPLv2" PV = "cvs${CVSDATE}" PR = "r1" -SRC_URI = "svn://meshcube.org/svn/application;module=${PN};proto=http" +SRC_URI = "http://meshcube.org/download/${PN}_${CVSDATE}.tgz" S = "${WORKDIR}/${PN}" do_install() { diff --git a/packages/nylon/yamonenv.bb b/packages/nylon/yamonenv.bb index db3aa6f001..6853bd56ed 100644 --- a/packages/nylon/yamonenv.bb +++ b/packages/nylon/yamonenv.bb @@ -5,7 +5,7 @@ MAINTAINER = "Michael Stickel <michael.stickel@4g-systems.biz>" LICENSE = "GPL" PV = "cvs${CVSDATE}" -SRC_URI = "svn://meshcube.org/svn/application;module=${PN};proto=http" +SRC_URI = "http://meshcube.org/download/${PN}_${CVSDATE}.tgz" S = "${WORKDIR}/${PN}" do_install() { diff --git a/packages/sudo/sudo_1.6.8p8.bb b/packages/sudo/sudo_1.6.8p12.bb index cc8ae4081c..f9d55411f8 100644 --- a/packages/sudo/sudo_1.6.8p8.bb +++ b/packages/sudo/sudo_1.6.8p12.bb @@ -5,4 +5,3 @@ SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ file://noexec-link.patch;patch=1" include sudo.inc -PR = "r4" |