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

5 files changed, 11 insertions, 10 deletions

diff --git a/packages/meta/nylon-feed.bb b/packages/meta/nylon-feed.bb
index a1cb515b8e..f5b803f58e 100644
--- a/packages/meta/nylon-feed.bb
+++ b/packages/meta/nylon-feed.bb
@@ -19,7 +19,7 @@ gnupg \
 hostap-modules \
 hostap-utils \
 hostap-daemon \
-hotplug \
+linux-hotplug \
 htb-init \
 ifplugd \
 initscripts \
diff --git a/packages/meta/nylon-image-standard.bb b/packages/meta/nylon-image-standard.bb
index b6b18d18b4..2542e16f7a 100644
--- a/packages/meta/nylon-image-standard.bb
+++ b/packages/meta/nylon-image-standard.bb
@@ -6,7 +6,7 @@ NYLON_STANDARD = "\
 	bridge-utils \
 	dnsmasq \
 	hostap-utils \
-	hotplug \
+	linux-hotplug \
 	ifplugd iproute2 iptables \
 	mobilemesh \
 	nylon-scripts \
diff --git a/packages/meta/openslug-image.bb b/packages/meta/openslug-image.bb
index 561bef4665..3324f20574 100644
--- a/packages/meta/openslug-image.bb
+++ b/packages/meta/openslug-image.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 
 IMAGE_BASENAME = "openslug"
 
@@ -9,14 +9,14 @@ OPENSLUG_HIDDEN_PACKAGES = "ipkg-native ipkg-utils-native fakeroot-native ${PATC
 	virtual/libc makedevs-native mtd-utils-native slugimage-native nslu2-linksys-firmware nslu2-switchbox-firmware "
 
 DEPENDS = "base-files base-passwd-3.5.7 \
-        busybox dropbear hotplug initscripts netbase \
+        busybox dropbear initscripts netbase \
         sysvinit tinylogin lrzsz portmap \
         ixp4xx-csr ixp425-eth openslug-init \
         ipkg-collateral ipkg ipkg-link \
         ${OPENSLUG_EXTRA_DEPENDS}"
 
 IPKG_INSTALL = "base-files base-passwd \
-        busybox dropbear hotplug initscripts netbase \
+        busybox dropbear initscripts netbase \
         update-modules sysvinit tinylogin lrzsz portmap \
         ixp4xx-csr ixp425-eth  openslug-init \
         ipkg-collateral ipkg ipkg-link \
diff --git a/packages/meta/task-bootstrap-unionroot.bb b/packages/meta/task-bootstrap-unionroot.bb
index 2e2108d08c..2226d8251c 100644
--- a/packages/meta/task-bootstrap-unionroot.bb
+++ b/packages/meta/task-bootstrap-unionroot.bb
@@ -3,6 +3,7 @@ MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
 PROVIDES = "task-bootstrap"
 PN = "task-bootstrap"
 PV = "1.0unionroot"
+PR = "r1"
 DEFAULT_PREFERENCE = "-1"
 
 # The BOOTSTRAP_EXTRA_ variables are often manipulated by the
@@ -35,7 +36,7 @@ def bootstrap_modutils_rdepends(d):
         return ' '.join(r)
 
 DEPENDS = 'base-files base-passwd-3.5.7 \
-	busybox dropbear hotplug initscripts modutils netbase \
+	busybox dropbear initscripts modutils netbase \
 	sysvinit tinylogin portmap \
 	modutils-initscripts \
 	${BOOTSTRAP_EXTRA_DEPENDS} \
@@ -46,7 +47,7 @@ DEPENDS = 'base-files base-passwd-3.5.7 \
 	unionroot-utils'
 
 RDEPENDS = 'base-files base-passwd busybox \
-	hotplug initscripts \
+	initscripts \
 	netbase sysvinit sysvinit-pidof tinylogin \
 	modutils-initscripts \
 	${BOOTSTRAP_EXTRA_RDEPENDS} \
diff --git a/packages/meta/task-bootstrap.bb b/packages/meta/task-bootstrap.bb
index 811fa8cbf3..87f23f39fb 100644
--- a/packages/meta/task-bootstrap.bb
+++ b/packages/meta/task-bootstrap.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Core packages required for a basic installation"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r19"
+PR = "r20"
 
 # The BOOTSTRAP_EXTRA_ variables are often manipulated by the
 # MACHINE .conf files, so adjust PACKAGE_ARCH accordingly.
@@ -32,14 +32,14 @@ def bootstrap_modutils_rdepends(d):
         return ' '.join(r)
 
 DEPENDS = 'base-files base-passwd-3.5.7 \
-	busybox dropbear hotplug initscripts modutils netbase \
+	busybox dropbear initscripts modutils netbase \
 	sysvinit tinylogin portmap \
 	modutils-initscripts \
 	${BOOTSTRAP_EXTRA_DEPENDS} \
 	${@bootstrap_modutils_depends(d)}'
 
 RDEPENDS = 'base-files base-passwd busybox \
-	hotplug initscripts \
+	initscripts \
 	netbase sysvinit sysvinit-pidof tinylogin \
 	modutils-initscripts \
 	${BOOTSTRAP_EXTRA_RDEPENDS} \