From 2f6a64359cc403f24ac9ae077a52efdad5826ba6 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Mon, 2 Jan 2006 01:18:48 +0000 Subject: nslu2-kernel: bug fix kernel release 2.6.15.5 --- conf/distro/slugos.conf | 2 +- packages/linux/nslu2-kernel_2.6.14.4.bb | 42 --------------------------------- packages/linux/nslu2-kernel_2.6.14.5.bb | 42 +++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 packages/linux/nslu2-kernel_2.6.14.4.bb create mode 100644 packages/linux/nslu2-kernel_2.6.14.5.bb diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index 8f78064255..2fd3b06087 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -164,7 +164,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" # Select the correct versions of the kernel and modules (these are the # defaults, override in the conf/distro top-level distro file). PREFERRED_PROVIDER_virtual/kernel ?= "nslu2-kernel" -PREFERRED_VERSION_nslu2-kernel ?= "2.6.14.4" +PREFERRED_VERSION_nslu2-kernel ?= "2.6.14.5" # Built-in ethernet modules PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp400-eth" diff --git a/packages/linux/nslu2-kernel_2.6.14.4.bb b/packages/linux/nslu2-kernel_2.6.14.4.bb deleted file mode 100644 index 823a8b9b1c..0000000000 --- a/packages/linux/nslu2-kernel_2.6.14.4.bb +++ /dev/null @@ -1,42 +0,0 @@ -# Kernel for NSLU2 -# -# Increment PR_CONFIG for changes to the nslu2-kernel specific -# defconfig (do *NOT* increment anything in here for changes -# to other kernel configs!) -PR_CONFIG = "0" -# -# Increment the number below (i.e. the digits after PR) when -# making changes within this file or for changes to the patches -# applied to the kernel. -PR = "r0.${PR_CONFIG}" - -include nslu2-kernel.inc - -# N2K_PATCHES - full list of patches to apply -N2K_PATCHES = "\ - file://90-ixp4xx-pci-le.patch;patch=1 \ - file://10-ixp4xx-copy-from.patch;patch=1 \ - file://10-ixp4xx-le.patch;patch=1 \ - file://10-mtdpart-redboot-fis-byteswap.patch;patch=1 \ - file://15-ixp4xx-writesb-l-w.patch;patch=1 \ - file://18-ixp4xx-io-h-addr.patch;patch=1 \ - file://19-jffs2-force-be.patch;patch=1 \ - file://29-ipv4-route-c-spinlock.patch;patch=1 \ - file://30-i2c-x1205.patch;patch=1 \ - file://50-nslu2-arch.patch;patch=1 \ - file://55-nslu2-rtc.patch;patch=1 \ - file://60-nslu2-beeper.patch;patch=1 \ - file://70-nslu2-io.patch;patch=1 \ - file://75-nslu2-leds.patch;patch=1 \ - file://90-pegasus.patch;patch=1 \ - file://20-timer.patch;patch=1 \ - file://91-maclist.patch;patch=1 \ - file://92-nslu2-maclist.patch;patch=1 \ - file://anonymiser.patch;patch=1 \ -" - -# These options get added to the kernel command line, only put things -# specific to the bootstrap of *this* kernel in here - DISTRO specfic -# config must be in CMDLINE_ROOT (see the full definition of CMDLINE -# in nslu2-kernel.inc) -CMDLINE_KERNEL_OPTIONS = "x1205.hctosys=1" diff --git a/packages/linux/nslu2-kernel_2.6.14.5.bb b/packages/linux/nslu2-kernel_2.6.14.5.bb new file mode 100644 index 0000000000..823a8b9b1c --- /dev/null +++ b/packages/linux/nslu2-kernel_2.6.14.5.bb @@ -0,0 +1,42 @@ +# Kernel for NSLU2 +# +# Increment PR_CONFIG for changes to the nslu2-kernel specific +# defconfig (do *NOT* increment anything in here for changes +# to other kernel configs!) +PR_CONFIG = "0" +# +# Increment the number below (i.e. the digits after PR) when +# making changes within this file or for changes to the patches +# applied to the kernel. +PR = "r0.${PR_CONFIG}" + +include nslu2-kernel.inc + +# N2K_PATCHES - full list of patches to apply +N2K_PATCHES = "\ + file://90-ixp4xx-pci-le.patch;patch=1 \ + file://10-ixp4xx-copy-from.patch;patch=1 \ + file://10-ixp4xx-le.patch;patch=1 \ + file://10-mtdpart-redboot-fis-byteswap.patch;patch=1 \ + file://15-ixp4xx-writesb-l-w.patch;patch=1 \ + file://18-ixp4xx-io-h-addr.patch;patch=1 \ + file://19-jffs2-force-be.patch;patch=1 \ + file://29-ipv4-route-c-spinlock.patch;patch=1 \ + file://30-i2c-x1205.patch;patch=1 \ + file://50-nslu2-arch.patch;patch=1 \ + file://55-nslu2-rtc.patch;patch=1 \ + file://60-nslu2-beeper.patch;patch=1 \ + file://70-nslu2-io.patch;patch=1 \ + file://75-nslu2-leds.patch;patch=1 \ + file://90-pegasus.patch;patch=1 \ + file://20-timer.patch;patch=1 \ + file://91-maclist.patch;patch=1 \ + file://92-nslu2-maclist.patch;patch=1 \ + file://anonymiser.patch;patch=1 \ +" + +# These options get added to the kernel command line, only put things +# specific to the bootstrap of *this* kernel in here - DISTRO specfic +# config must be in CMDLINE_ROOT (see the full definition of CMDLINE +# in nslu2-kernel.inc) +CMDLINE_KERNEL_OPTIONS = "x1205.hctosys=1" -- cgit v1.2.3