merge of a85c8bb53604e3bd7a5ae3d8b5eb3f084798e061

     and fb1746edef94a5e7e29a7b45e8455f288181530c

9 files changed, 42 insertions, 12 deletions

diff --git a/packages/linux/nslu2-kernel/2.6/timer.patch b/packages/linux/nslu2-kernel/2.6/timer.patch
new file mode 100644
index 0000000000..6279746e64
--- /dev/null
+++ b/packages/linux/nslu2-kernel/2.6/timer.patch
@@ -0,0 +1,24 @@
+# Fix for the NSLU2 timer problem (tickadj 10101.01 when it should be 10000)
+# Also contains a fix for the more generate problem on the ixp4xx in that the
+# Intel spec says to use a 33.33MHz crystal, not 33.333333Mhz
+
+--- linux-2.6.12.2/include/asm-arm/arch-ixp4xx/timex.h.orig	2005-08-05 11:02:09.872690723 -0700
++++ linux-2.6.12.2/include/asm-arm/arch-ixp4xx/timex.h	2005-08-05 11:45:08.786971567 -0700
+@@ -7,7 +7,14 @@
+ 
+ /*
+  * We use IXP425 General purpose timer for our timer needs, it runs at 
+- * 66.66... MHz
++ * 66.66 MHz (exactly) by the Intel specification.
+  */
+-#define CLOCK_TICK_RATE (66666666)
+-
++#if 0
++#define CLOCK_TICK_RATE (66660000)
++#else
++/*
++ * Unfortunately the NSLU2 has a 33MHz crystal, so the rate is not the
++ * specified one.
++ */
++#define CLOCK_TICK_RATE (66000000)
++#endif
diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb
index 8b54cdc703..64b5788649 100644
--- a/packages/linux/nslu2-kernel_2.6.12.2.bb
+++ b/packages/linux/nslu2-kernel_2.6.12.2.bb
@@ -1,5 +1,5 @@
 # Kernel for NSLU2
-PR = "r6"
+PR = "r7"
 include nslu2-kernel.inc
 
 # N2K_EXTRA_PATCHES - list of patches to apply (can include
@@ -22,4 +22,5 @@ N2K_PATCHES = "\
 	file://x1205-rtc.c-id.patch;patch=1 \
 	file://mtd-shutdown.patch;patch=1 \
 	file://missing-exports.patch;patch=1 \
+	file://timer.patch;patch=1 \
 "
diff --git a/packages/linux/nslu2-kernel_2.6.12.bb b/packages/linux/nslu2-kernel_2.6.12.bb
index 6cea8a4daa..a8fa808d3a 100644
--- a/packages/linux/nslu2-kernel_2.6.12.bb
+++ b/packages/linux/nslu2-kernel_2.6.12.bb
@@ -1,5 +1,5 @@
 # Kernel for NSLU2
-PR = "r2"
+PR = "r3"
 include nslu2-kernel.inc
 
 # N2K_EXTRA_PATCHES - list of patches to apply (can include
@@ -21,4 +21,5 @@ N2K_PATCHES = "\
 	file://xscale-reset.patch;patch=1 \
 	file://x1205-rtc.c-id.patch;patch=1 \
 	file://mtd-shutdown.patch;patch=1 \
+	file://timer.patch;patch=1 \
 "
diff --git a/packages/meta/ucslugc-packages.bb b/packages/meta/ucslugc-packages.bb
index fdbf0d020e..d705de728d 100644
--- a/packages/meta/ucslugc-packages.bb
+++ b/packages/meta/ucslugc-packages.bb
@@ -110,6 +110,7 @@ UCSLUGC_PACKAGES = "\
 # These packages only build on TARGET_OS=linux, but not TARGET_OS=linux-uclibc.
 # KEEP IN ALPHABETICAL ORDER
 UCSLUGC_BROKEN_PACKAGES = "\
+	iperf \
 	man man-pages \
 	php \
 	psmisc \
@@ -119,7 +120,10 @@ UCSLUGC_BROKEN_PACKAGES = "\
 	"
 
 # These packages will never build because uclibc lacks (and always will lack)
-# appropriate support.  This define is for documentation of this fact!
+# appropriate support.  This define is for documentation of this fact!  The
+# normal cause is that the package uses the "NIS" interfaces (once known as
+# YP - a trademark of BT which SUN used without license - the missing function
+# calls often still have 'yp' in the name).
 UCSLUGC_UNSUPPORTABLE_PACKAGES = "\
 	libpam \
 	nfs-utils \
diff --git a/packages/microcom/microcom_1.02.bb b/packages/microcom/microcom_1.02.bb
index b87ce5e0d5..e0c0512478 100644
--- a/packages/microcom/microcom_1.02.bb
+++ b/packages/microcom/microcom_1.02.bb
@@ -3,7 +3,11 @@ scripting support."
 LICENSE = "GPL"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
-SRC_URI = "http://microcom.port5.com/m102.tar.gz \
+# http://microcom.port5.com/m102.tar.gz is no longer available
+#NOTE: this should probably be converted to pull from sourceforge
+# CVS, because openwrt is just another mirror of a file which no
+# longer seems to exist outside mirrors.  mirror magic.
+SRC_URI = "http://downloads.openwrt.org/sources/m102.tar.gz \
 	   file://make.patch;patch=1"
 S = "${WORKDIR}"
 
diff --git a/packages/ntp/ntp_4.2.0.bb b/packages/ntp/ntp_4.2.0.bb
index 752fd1f266..817c3c32f7 100644
--- a/packages/ntp/ntp_4.2.0.bb
+++ b/packages/ntp/ntp_4.2.0.bb
@@ -7,11 +7,6 @@ SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "ntp"
 PR = "r4"
-# OE core: this is here to prevent this version of ntp from
-# changing OE distros other than openslug.  This code has
-# only been tested on openslug.  Feel free to remove these lines!
-DEFAULT_PREFERENCE = -1
-DEFAULT_PREFERENCE_openslug = 0
 
 SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${P}.tar.gz \
 	file://ntpdc.Makefile.am.maybe-layout.patch;patch=1 \
diff --git a/packages/sysvinit/sysvinit/nslu2/rcS-default b/packages/sysvinit/sysvinit/nslu2/rcS-default
index 7c34294101..d53be762a7 100644
--- a/packages/sysvinit/sysvinit/nslu2/rcS-default
+++ b/packages/sysvinit/sysvinit/nslu2/rcS-default
@@ -19,5 +19,4 @@ EDITMOTD=no
 # Set FSCKFIX to "yes" if you want to add "-y" to the fsck at startup.
 FSCKFIX=yes
 # Set TICKADJ to the correct tick value for this specific machine
-#NSLU2: determined by experiment to be 100/99*10000 usec/tick
-TICKADJ=10101
+#TICKADJ=10000
diff --git a/packages/sysvinit/sysvinit/rcS-default b/packages/sysvinit/sysvinit/rcS-default
index fb22117aae..46e48b9796 100644
--- a/packages/sysvinit/sysvinit/rcS-default
+++ b/packages/sysvinit/sysvinit/rcS-default
@@ -17,3 +17,5 @@ VERBOSE=no
 EDITMOTD=no
 # Set FSCKFIX to "yes" if you want to add "-y" to the fsck at startup.
 FSCKFIX=yes
+# Set TICKADJ to the correct tick value for this specific machine
+#TICKADJ=10000
diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index 73813d293f..e59102d931 100644
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 LICENSE = "GPL"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
-PR = "r17"
+PR = "r18"
 
 # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
 # Set PACKAGE_ARCH appropriately.