Merge oe-devel@oe-devel.bkbits.net:openembedded

into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded

2005/02/17 12:41:30-06:00 ti.com!kergoth
Set the kernel version string correctly in the colinux kernel build.

2005/02/17 12:40:42-06:00 ti.com!kergoth
Add hotplug-ng, rename hotplug to linux-hotplug, and move the decision about which /sbin/hotplug binary you use into the hands of the distributions.

BKrev: 4214e59fRUBz9NJWKrkQdsqK0Ps__A

8 files changed, 56 insertions, 0 deletions

diff --git a/conf/distro/colinuxoe.conf b/conf/distro/colinuxoe.conf
index e69de29bb2..eb263e9a98 100644
--- a/conf/distro/colinuxoe.conf
+++ b/conf/distro/colinuxoe.conf
@@ -0,0 +1,18 @@
+#@TYPE: Distribution
+#@NAME: coLinuxoe
+#@DESCRIPTION: Generic OE built distro for the coLinux MACHINE
+
+INHERIT += "package_ipk debian"
+
+# MACHINE decides that linux-colinux is the correct kernel.
+# DISTRO decides whether to build 2.4 or 2.6.  Latest coLinux version
+# (0.6.2) uses 2.6 by default, so we'll be following them.
+# PREFERRED_VERSION_linux-colinux = "2.4.28"
+PREFERRED_VERSION_linux-colinux ?= "2.6.10"
+
+IMAGE_FSTYPES =+ "ext2 ext2.gz"
+
+# Whether to use the old shell hotplug or the new C hotplug is a
+# distribution decision.
+BOOTSTRAP_EXTRA_DEPENDS += "linux-hotplug"
+BOOTSTRAP_EXTRA_RDEPENDS += "linux-hotplug"
diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf
index 7fd483620f..1f9418e52c 100644
--- a/conf/distro/familiar.conf
+++ b/conf/distro/familiar.conf
@@ -5,3 +5,7 @@
 INHERIT += " package_ipk debian"
 TARGET_OS = "linux"
 
+# Whether to use the old shell hotplug or the new C hotplug is a
+# distribution decision.
+BOOTSTRAP_EXTRA_DEPENDS += "linux-hotplug"
+BOOTSTRAP_EXTRA_RDEPENDS += "linux-hotplug"
diff --git a/conf/distro/openmnci.conf b/conf/distro/openmnci.conf
index 93a361a878..2a7665dd1d 100644
--- a/conf/distro/openmnci.conf
+++ b/conf/distro/openmnci.conf
@@ -12,3 +12,8 @@ CVSDATE_ipkg-utils = 20050110
 OEINCLUDELOGS = "yes"
 KERNEL_CONSOLE = "ttyS0"
 TARGET_FPU = "soft"
+
+# Whether to use the old shell hotplug or the new C hotplug is a
+# distribution decision.
+BOOTSTRAP_EXTRA_DEPENDS += "linux-hotplug"
+BOOTSTRAP_EXTRA_RDEPENDS += "linux-hotplug"
diff --git a/conf/distro/opensimpad.conf b/conf/distro/opensimpad.conf
index 3f2ddeaff1..1e92b0af70 100644
--- a/conf/distro/opensimpad.conf
+++ b/conf/distro/opensimpad.conf
@@ -6,3 +6,7 @@ INHERIT += " package_ipk debian"
 TARGET_OS ?= "linux"
 TARGET_FPU ?= "soft"
 
+# Whether to use the old shell hotplug or the new C hotplug is a
+# distribution decision.
+BOOTSTRAP_EXTRA_DEPENDS += "linux-hotplug"
+BOOTSTRAP_EXTRA_RDEPENDS += "linux-hotplug"
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 57abf79f94..60e9976d49 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -24,6 +24,11 @@ module-init-tools"
 
 OPENSLUG_EXTRA_INSTALL += "${OPENSLUG_EXTRA_RDEPENDS}"
 
+# Whether to use the old shell hotplug or the new C hotplug is a
+# distribution decision.
+OPENSLUG_EXTRA_DEPENDS += "linux-hotplug"
+OPENSLUG_EXTRA_RDEPENDS += "linux-hotplug"
+
 BOOTSTRAP_EXTRA_DEPENDS  += "${OPENSLUG_EXTRA_DEPENDS}"
 BOOTSTRAP_EXTRA_RDEPENDS += "${OPENSLUG_EXTRA_RDEPENDS}"
 
diff --git a/conf/distro/openzaurus.conf b/conf/distro/openzaurus.conf
index 4af0dfc85f..be7d4a0d92 100644
--- a/conf/distro/openzaurus.conf
+++ b/conf/distro/openzaurus.conf
@@ -5,3 +5,8 @@
 INHERIT += " package_ipk debian"
 TARGET_OS = "linux"
 TARGET_FPU = "soft"
+
+# Whether to use the old shell hotplug or the new C hotplug is a
+# distribution decision.
+BOOTSTRAP_EXTRA_DEPENDS += "linux-hotplug"
+BOOTSTRAP_EXTRA_RDEPENDS += "linux-hotplug"
diff --git a/conf/distro/switchbox.conf b/conf/distro/switchbox.conf
index bc9100d29b..6c378d059f 100644
--- a/conf/distro/switchbox.conf
+++ b/conf/distro/switchbox.conf
@@ -15,3 +15,8 @@ SWITCHBOX_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/dev
 EXTRA_IMAGECMD_ext2.gz = "-r 0 -i 512 -f ${SWITCHBOX_DEVICE_TABLE}"
 
 USE_NLS = "no"
+
+# Whether to use the old shell hotplug or the new C hotplug is a
+# distribution decision.
+BOOTSTRAP_EXTRA_DEPENDS += "linux-hotplug"
+BOOTSTRAP_EXTRA_RDEPENDS += "linux-hotplug"
diff --git a/conf/distro/wrt54oe.conf b/conf/distro/wrt54oe.conf
index e69de29bb2..e11dafbb63 100644
--- a/conf/distro/wrt54oe.conf
+++ b/conf/distro/wrt54oe.conf
@@ -0,0 +1,10 @@
+#@TYPE: Distribution
+#@NAME: WRT54OE Linux
+#@DESCRIPTION: Distribution configuration for the WRT54 Linux
+
+INHERIT += "package_ipk debian"
+
+# Whether to use the old shell hotplug or the new C hotplug is a
+# distribution decision.
+BOOTSTRAP_EXTRA_DEPENDS += "linux-hotplug"
+BOOTSTRAP_EXTRA_RDEPENDS += "linux-hotplug"