From a4f0089c5bf7d37257b244fb08de5e756498c6cd Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sat, 14 Jan 2006 06:10:54 +0000 Subject: slugos: move to ixp4xx-kernel, change nslu2 to more generic ixp4xx in conf - rather than build nslu2-kernel or nas100d-kernel slugos-image now builds ixp4xx-kernel, the generic kernel. ixp4xx is now used as the normal MACHINE override, even though MACHINE itself is still set to nslu2 or nas100d (or ixp4xx). --- packages/linux/ixp4xx-kernel.inc | 2 +- packages/linux/ixp4xx-kernel_2.6.15.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index 233d2a655c..452c8c956b 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -196,7 +196,7 @@ CMDLINE_KERNEL_OPTIONS ?= "${MACH_KERNEL_OPTIONS}" # CMDLINE_ROOT: machine specific boot options - should not be set on a # generic kernel! -CMDLINE_ROOT ?= "init=/linuxrc" +CMDLINE_ROOT ?= "" # CMDLINE_DEBUG: debug options such as noirqdebug, defaults to empty # override in local.conf etc diff --git a/packages/linux/ixp4xx-kernel_2.6.15.bb b/packages/linux/ixp4xx-kernel_2.6.15.bb index 4a7cd96d37..8af2fde408 100644 --- a/packages/linux/ixp4xx-kernel_2.6.15.bb +++ b/packages/linux/ixp4xx-kernel_2.6.15.bb @@ -8,7 +8,7 @@ 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 = "r4.${PR_CONFIG}" +PR = "r5.${PR_CONFIG}" include ixp4xx-kernel.inc -- cgit v1.2.3