From 6454a46033107d7f70f13961615cb947297602e3 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Thu, 23 Sep 2004 16:43:30 +0000
Subject: Merge

2004/09/21 08:23:12+09:30 (none)!rwhitby
Renamed linux-nslu2 to nslu2-linksys as per discussion with kergoth, and modified nslu2.conf, unslung.conf and openslug.conf to match.

BKrev: 4152fd320fGVJ_PPonCqGohq9t3Kmg
---
 conf/anyu2.conf    | 7 -------
 conf/nslu2.conf    | 2 --
 conf/openslug.conf | 0
 conf/unslung.conf  | 8 ++++++--
 4 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 conf/anyu2.conf
 create mode 100644 conf/openslug.conf

(limited to 'conf')

diff --git a/conf/anyu2.conf b/conf/anyu2.conf
deleted file mode 100644
index 567e104947..0000000000
--- a/conf/anyu2.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#@TYPE: Distribution
-#@NAME: AnyU2
-#@DESCRIPTION: AnyU2 Linux Distribution configuration
-
-INHERIT += " package_ipk debian nslu2_flashimg"
-
-IMAGE_FSTYPE = "ext2.gz"
diff --git a/conf/nslu2.conf b/conf/nslu2.conf
index 191224efaa..8d5ab8ad12 100644
--- a/conf/nslu2.conf
+++ b/conf/nslu2.conf
@@ -5,8 +5,6 @@
 TARGET_ARCH = "armeb"
 IPKG_ARCHS = "all ${TARGET_ARCH} armv5te ${MACHINE}"
 PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-nslu2"
-BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel"
 
 IMAGE_ROOTFS_SIZE_ext2 = "8192"
 IMAGE_ROOTFS_SIZE_ext2.gz = "8192"
diff --git a/conf/openslug.conf b/conf/openslug.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/unslung.conf b/conf/unslung.conf
index 331ce2d3f9..b080b17f3c 100644
--- a/conf/unslung.conf
+++ b/conf/unslung.conf
@@ -1,9 +1,13 @@
 #@TYPE: Distribution
-#@NAME: Unslung Linux
-#@DESCRIPTION: Distribution for packages to be run on the Linksys firmware in the NSLU2
+#@NAME: Unslung
+#@DESCRIPTION: Unslung Linux Distribution for the NSLU2
 
 INHERIT += " package_ipk debian nslu2_flashimg"
+
 IMAGE_FSTYPE = "ext2.gz"
 
+BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel"
+PREFERRED_PROVIDER_virtual/kernel ?= "nslu2-linksys"
+
 PREFERRED_VERSION_glibc ?= "2.2.5"
 PREFERRED_VERSION_glibc-initial ?= "2.2.5"
-- 
cgit v1.2.3