Following from the meta/packages changes, cleanup conf/machine for incorrect DEPENDS usage. Move certain things into EXTRA_IMAGEDEPENDS. No valid users of EXTRA_BOOTSTRAP_DEPENDS were found so it was removed entirely. Change zaurus-updater not to package as it doesn't provide any.

3 files changed, 0 insertions, 3 deletions

diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf
index 0b31c3c5a3..9cc84e96c4 100644
--- a/conf/distro/familiar.conf
+++ b/conf/distro/familiar.conf
@@ -8,7 +8,6 @@ TARGET_OS = "linux"
 PARALLEL_INSTALL_MODULES = "1"
 UDEV_DEVFS_RULES = "1"
 
-BOOTSTRAP_EXTRA_DEPENDS += "familiar-version"
 BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version"
 
 DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
diff --git a/conf/distro/jlime-shrek.conf b/conf/distro/jlime-shrek.conf
index 2dd9641137..c3f88c5511 100644
--- a/conf/distro/jlime-shrek.conf
+++ b/conf/distro/jlime-shrek.conf
@@ -37,7 +37,6 @@ BBINCLUDELOGS = "yes"
 MODUTILS = "26"
 IMAGE_FSTYPES = "tar.bz2"
 
-BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs ncurses nano virtual/kernel wireless-tools console-tools"
 BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs ncurses nano wireless-tools            \ 
 kernel-module-3c574-cs    kernel-module-3c589-cs    kernel-module-8390        \
 kernel-module-airo-cs     kernel-module-airo        console-tools             \
diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf
index 6f0bca9342..192400b9a1 100644
--- a/conf/distro/openomap.conf
+++ b/conf/distro/openomap.conf
@@ -8,5 +8,4 @@ TARGET_FPU ?= "soft"
 
 # 2.4 vs 2.6 is a distro decision.
 MODUTILS = "26"
-BOOTSTRAP_EXTRA_DEPENDS += "udev"
 BOOTSTRAP_EXTRA_RDEPENDS += "udev"