From: Rod Whitby Date: Wed, 16 Jan 2008 00:15:44 +0000 (+0000) Subject: linux-ixp4xx: Updated to 2.6.23.14 X-Git-Tag: Release-2010-05/1~7894^2~6^2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e9b42bba2459171ab1e96691a446ae2cc86e0fa;p=openembedded.git linux-ixp4xx: Updated to 2.6.23.14 --- diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index b612b2ffdf..29c04437dd 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -43,7 +43,7 @@ SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" -SRCREV_pn-linux-ixp4xx ?= "957" +SRCREV_pn-linux-ixp4xx ?= "983" SRCREV_pn-linux-openmoko ?= "3801" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc index bdf00d15c9..924fb54f1e 100644 --- a/conf/machine/include/ixp4xx.inc +++ b/conf/machine/include/ixp4xx.inc @@ -7,7 +7,7 @@ MACHINE_FEATURES ?= "kernel26 usbhost ext2 vfat redboot apex" # Select an appropriate default kernel PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx" -PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.7+svnr${SRCREV}" +PREFERRED_VERSION_linux-ixp4xx ?= "2.6.23.14+svnr${SRCREV}" # Add packages required for basic networking support MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe" diff --git a/packages/linux/linux-ixp4xx_2.6.23.12.bb b/packages/linux/linux-ixp4xx_2.6.23.14.bb similarity index 84% rename from packages/linux/linux-ixp4xx_2.6.23.12.bb rename to packages/linux/linux-ixp4xx_2.6.23.14.bb index 14b79ae7cb..b7c7682370 100644 --- a/packages/linux/linux-ixp4xx_2.6.23.12.bb +++ b/packages/linux/linux-ixp4xx_2.6.23.14.bb @@ -1,12 +1,8 @@ -# 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 VANILLA_VERSION = "2.6.23" -KERNEL_RELEASE = "2.6.23.12" +KERNEL_RELEASE = "2.6.23.14" # If you use a rc, you will need to use this: #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}"