Fix two build problems on NSLU2.

The nslu2.conf change causes the various packages which were
fixed to a 20050405 CVS date stamp to be floating to the latest
version again.  This has been verified with 20050418 (for all
the packages).

BKrev: 428be52f4cdI_8uGPMlrhxWu6n9ltw

diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index f768e7a..fb3bfd2 100644 (file)
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -15,9 +15,15 @@ SERIAL_CONSOLE = "115200 ttyS0"
 KERNEL_CONSOLE = "ttyS0,115200n8"
 USE_VT = "0"
 
-CVSDATE_gnu-config-native ?= "20050405"
-CVSDATE_ipkg-utils-native ?= "20050405"
-CVSDATE_ipkg-link ?= "20050405"
-CVSDATE_uclibc ?= "20050405"
-CVSDATE_genext2fs ?= "20050405"
-CVSDATE_genext2fs-native ?= "20050405"
\ No newline at end of file
+# These no longer work, the patches have moved ahead.
+#CVSDATE_gnu-config-native ?= "20050405"
+#CVSDATE_ipkg-utils-native ?= "20050405"
+#CVSDATE_ipkg-link ?= "20050405"
+#CVSDATE_uclibc ?= "20050405"
+#CVSDATE_genext2fs ?= "20050405"
+#CVSDATE_genext2fs-native ?= "20050405"
+#NOTE: unslung, openslug and uclibc openslug have been
+# verified using CVS downloads from 20050518, removing
+# the above lines causes the latest CVS source to be
+# used, if things break try using the above lines with
+# 20050518 as the date.

diff --git a/packages/linux/nslu2-kernel.inc b/packages/linux/nslu2-kernel.inc
index efd0451..749fadc 100644 (file)
--- a/packages/linux/nslu2-kernel.inc
+++ b/packages/linux/nslu2-kernel.inc
@@ -148,7 +148,7 @@ python () {
     # bb.note("N2K_SRCURI := %s" % ' '.join(patch_uri))
     bb.data.setVar("N2K_FILESPATH", ':'.join(filepath), d)
     # bb.note("N2K_FILESPATH := %s" % ' '.join(filepath))
-    bb.data.setVar("DEFAULT_PREFERENCE", pref-mmac)
+    bb.data.setVar("DEFAULT_PREFERENCE", pref-mmac, d)
     # bb.note("DEFAULT_PREFERENCE := %s" % pref-mmac)
 }