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). --- conf/distro/slugos.conf | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'conf/distro/slugos.conf') diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index 4cc33888d7..fa74e3965c 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -7,8 +7,8 @@ # Explanation of the naming # -# nslu2-dist - the base distro configuration for an NSLU2 -# nslu2-[bl][at][gu] - a specific configuration encoded as follows: +# slugos-dist - the base distro configuration for an NSLU2 +# slugos-[bl][at][gu] - a specific configuration encoded as follows: # # b or l - big or little endian # set ARCH_BYTE_SEX to match @@ -21,10 +21,10 @@ # # The following names are deprecated: # -# openslug - the historical name of a canonical nslu2-bag distro -# also the name of a standard nslu2-bag distro with a package feed -# ucslugc - the historical (and obsolete) name of nslu2-btu -# also the name of a standard nslu2-btu distro with a package feed +# openslug - the historical name of a canonical slugos-bag distro +# also the name of a standard slugos-bag distro with a package feed +# ucslugc - the historical (and obsolete) name of slugos-btu +# also the name of a standard slugos-btu distro with a package feed # #---------------------------------------------------------------------------------- @@ -140,14 +140,14 @@ SLUGOS_EXTRA_RDEPENDS ?= "" # PACKAGE VERSION CONTROL #---------------------------------------------------------------------------------- # Select the correct versions of the compiler tools (note that there -# is also some selection in machine/nslu2.conf) +# is also some selection in machine/${MACHINE}.conf) PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" # compiler/binary/library versions (unslung uses different ones so these -# cannot be in nslu2.conf) +# cannot be in ${MACHINE}.conf) PREFERRED_VERSION_binutils ?= "2.16" PREFERRED_VERSION_binutils-cross ?= "2.16" PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" @@ -157,8 +157,8 @@ 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.15" +PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" +PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.15" # Built-in ethernet modules PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp400-eth" -- cgit v1.2.3