From 4ed510411862bb30652fda84c3fe744380439cb0 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Thu, 19 May 2005 01:00:31 +0000 Subject: [PATCH] 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 --- conf/machine/nslu2.conf | 18 ++++++++++++------ packages/linux/nslu2-kernel.inc | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index f768e7a109..fb3bfd24d5 100644 --- 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 efd04513a7..749fadce8a 100644 --- 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) } -- 2.39.5