diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-12-01 14:46:35 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-12-01 14:46:35 +0000 |
| commit | 46c11035838a5bcf4b50385ebd549828be84a73e (patch) | |
| tree | 7d2fc1bf04d773ad0eadd69a2146e6c96df81b76 /packages | |
| parent | 269044be2431a2efc5cf31a956e9d6096f575370 (diff) | |
| parent | d5063ac54be0922a20225302409aa87a52fbe48b (diff) | |
merge of '7d861d6a945af531929902d5717003486976079d'
and 'e01f270130b45051b21882abdc8e136007852697'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/images/nslu2-minimal-image.bb | 13 | ||||
| -rw-r--r-- | packages/linux/linux-ixp4xx_2.6.23.8.bb | 6 |
2 files changed, 16 insertions, 3 deletions
diff --git a/packages/images/nslu2-minimal-image.bb b/packages/images/nslu2-minimal-image.bb index 071fc67c08..5a601b2995 100644 --- a/packages/images/nslu2-minimal-image.bb +++ b/packages/images/nslu2-minimal-image.bb @@ -1,5 +1,14 @@ -require minimal-image.bb +# Note that this package is intended to create an *identical* +# kernel and rootfs as the normal minimal-image.bb + +# The only reason for the existence of this .bb file is to +# create the 8MB and 16MB flashable NSLU2 firmware images. -export IMAGE_BASENAME = "nslu2-minimalist-image" +# Please do not add anything other than the following two +# lines to this file, and please do not do anything in +# the nslu2-image.bb class which might affect the kernel +# or rootfs. + +require minimal-image.bb inherit nslu2-image diff --git a/packages/linux/linux-ixp4xx_2.6.23.8.bb b/packages/linux/linux-ixp4xx_2.6.23.8.bb index a6dcca41b5..ab621f310a 100644 --- a/packages/linux/linux-ixp4xx_2.6.23.8.bb +++ b/packages/linux/linux-ixp4xx_2.6.23.8.bb @@ -1,3 +1,7 @@ +# The new ethernet driver included in the 2.6.23 version of the nslu2-linux.org kernel patches +# has problems with providing the correct MAC address on the initial DHCP request. +DEFAULT_PREFERENCE = "-1" + require linux.inc require linux-ixp4xx.inc @@ -8,7 +12,7 @@ KERNEL_RELEASE = "2.6.23.8" #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}" PV = "${KERNEL_RELEASE}+svnr${SRCREV}" -PR = "r0" +PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \ |