Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/21 17:35:27-06:00 ti.com!kergoth
Kill the ipkg paths patch, since its busted.

2005/02/21 17:33:13-06:00 ti.com!kergoth
Fix sbindir in native.bbclass and cross.bbclass.  Thanks to Jordan Crouse for reporting.

2005/02/21 17:13:19-06:00 ti.com!kergoth
Add the paths patch to ipkg which fixes it to no longer hardcode the '/usr/lib/ipkg' path, which I forgot to check in from the previous commit.

2005/02/21 17:09:46-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded

2005/02/21 17:09:03-06:00 ti.com!kergoth
Run a sed script against our packages to fix some hardcoded target path
references.  As always when I do things like this, if packages you maintain
were touched by this, please do a sanity check to ensure the sed script didn't
run wild.

2005/02/21 15:49:47-06:00 ti.com!kergoth
Use a HOTPLUG variable to manage which hotplug you prefer, to ensure that hotplug is still included in task-bootstrap even if you dont set DISTRO.

BKrev: 421b2b63X5eoMcSrC7pVcptXK-iFKg

7 files changed, 0 insertions, 35 deletions

diff --git a/conf/distro/colinuxoe.conf b/conf/distro/colinuxoe.conf
index eb263e9a98..7454c0167f 100644
--- a/conf/distro/colinuxoe.conf
+++ b/conf/distro/colinuxoe.conf
@@ -11,8 +11,3 @@ INHERIT += "package_ipk debian"
 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 1f9418e52c..9ef2299331 100644
--- a/conf/distro/familiar.conf
+++ b/conf/distro/familiar.conf
@@ -4,8 +4,3 @@
 
 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 6ebcf2372c..fb46dc203f 100644
--- a/conf/distro/openmnci.conf
+++ b/conf/distro/openmnci.conf
@@ -14,8 +14,3 @@ 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 1e92b0af70..f49a97576d 100644
--- a/conf/distro/opensimpad.conf
+++ b/conf/distro/opensimpad.conf
@@ -5,8 +5,3 @@
 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/openzaurus.conf b/conf/distro/openzaurus.conf
index be7d4a0d92..4af0dfc85f 100644
--- a/conf/distro/openzaurus.conf
+++ b/conf/distro/openzaurus.conf
@@ -5,8 +5,3 @@
 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 ff20708da2..c3013cf858 100644
--- a/conf/distro/switchbox.conf
+++ b/conf/distro/switchbox.conf
@@ -15,8 +15,3 @@ 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 e11dafbb63..fd0924f9e6 100644
--- a/conf/distro/wrt54oe.conf
+++ b/conf/distro/wrt54oe.conf
@@ -3,8 +3,3 @@
 #@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"