slugos-image: remove spurious DEPENDS in conf

 - this upgrades slugos-image to the new RDEPENDS only
   world, some missing (R)dependencies are corrected
slugos-init: remove virtual/ixp-eth in 0.10
 - this stuff is no longer necessary and the modprobe.conf
   has been moved to the ixp-eth module rather than having
   it incorrectly introduced in a non-dependent module.

8 files changed, 14 insertions, 20 deletions

diff --git a/conf/distro/debianslug-packages.conf b/conf/distro/debianslug-packages.conf
index eaf6b8fe31..451208fd09 100644
--- a/conf/distro/debianslug-packages.conf
+++ b/conf/distro/debianslug-packages.conf
@@ -1,2 +1,2 @@
-SLUGOS_EXTRA_BBFILES=${DEBIANSLUG_EXTRA_BBFILES}
+SLUGOS_EXTRA_BBFILES = "${DEBIANSLUG_EXTRA_BBFILES}"
 include conf/distro/slugos-packages.conf
diff --git a/conf/distro/ludeos-packages.conf b/conf/distro/ludeos-packages.conf
index 312ebf0e5f..7f347e7887 100644
--- a/conf/distro/ludeos-packages.conf
+++ b/conf/distro/ludeos-packages.conf
@@ -1,2 +1,2 @@
-SLUGOS_EXTRA_BBFILES=
+SLUGOS_EXTRA_BBFILES = ""
 include conf/distro/slugos-packages.conf
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index c42c793363..f8722d4b4d 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -1,2 +1,2 @@
-SLUGOS_EXTRA_BBFILES=${OPENSLUG_EXTRA_BBFILES}
+SLUGOS_EXTRA_BBFILES = "${OPENSLUG_EXTRA_BBFILES}"
 include conf/distro/slugos-packages.conf
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 20bb8071c7..85f17b18ac 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -45,7 +45,6 @@ OPENSLUG_REISER_PROGS = "reiserfsprogs"
 # The standard firmware contents and additional packages built as requirements
 # of the firmware are defined here in OPENSLUG_STANDARD_RDEPENDS and
 # OPENSLUG_STANDARD_DEPENDS respectively.
-OPENSLUG_STANDARD_DEPENDS = ""
 OPENSLUG_STANDARD_RDEPENDS = ""
 
 # Support for a variety of file systems is built in to the openslug
@@ -56,18 +55,15 @@ OPENSLUG_STANDARD_RDEPENDS = ""
 # These lines add support for formatting ext2 and ext3 file systems
 # on a hard disk attached to the NSLU2.  ext3 is the standard Linux
 # file system.
-OPENSLUG_STANDARD_DEPENDS += "e2fsprogs"
 OPENSLUG_STANDARD_RDEPENDS += "${OPENSLUG_EXT2_PROGS}"
 
 # These lines add support for formatting reiserfs file systems on
 # a hard disk.
-OPENSLUG_STANDARD_DEPENDS += "reiserfsprogs"
 OPENSLUG_STANDARD_RDEPENDS += "${OPENSLUG_REISER_PROGS}"
 
 # These lines add support for an X/Y/ZModem package called lrzsz
 # (this is of use for people with modified NSLU2 hardware which
 # supports a serial port.)
-OPENSLUG_STANDARD_DEPENDS += "lrzsz"
 OPENSLUG_STANDARD_RDEPENDS += "lrzsz"
 
 # Filesystem selection.  Adding entries here adds the module to the
@@ -112,7 +108,6 @@ kernel-module-nls-utf8 \
 # a bootable, useable, system however they *are* expected to be present
 # in OpenSlug - see nslu2-bag for a more minimal configuration and some
 # more instructions about how to make a non-openslug image.
-SLUGOS_EXTRA_DEPENDS  = "${OPENSLUG_STANDARD_DEPENDS}"
 SLUGOS_EXTRA_RDEPENDS = "${OPENSLUG_STANDARD_RDEPENDS}"
 
 #----------------------------------------------------------------------------------
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index 8eb0b01aa8..4146e4a9a0 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -124,19 +124,16 @@ SLUGOS_FLASH_IMAGE ?= "no"
 # EXTRA PACKAGES
 # --------------
 # SlugOS builds an image with no extra packages - to add packages to the
-# firmware copy this file (to make a new 'distro' configuration file) and change
+# firmware include this file in a new 'distro' configuration file) and set
 # the definition below to include the requirements.
 # NOTE: as built this system will *not* be able to boot off anything other than
 # the flash file system ('turnup' will not work).  You need to add the filesystem
 # modules for your chosen root file system (and any others which will be used).
 # See openslug.conf for a more full-featured system!
+#
+# Everything in this list gets added to the flash image, along with any RDEPENDS
+# it has itself!
 SLUGOS_EXTRA_RDEPENDS ?= ""
-SLUGOS_EXTRA_DEPENDS ?= ""
-
-# These depends define native utilities - they do not get put in the flash.
-# upslug2 (in tmp/work/upslug2-native-*) is the program to write the NSLU2 flash
-# Override this as desired - it makes no difference to the final image.
-SLUGOS_NATIVE_DEPENDS ?= "upslug2-native"
 
 #----------------------------------------------------------------------------------
 # PACKAGE VERSION CONTROL
diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf
index e047fb2e11..a423b1d9fd 100644
--- a/conf/distro/ucslugc-packages.conf
+++ b/conf/distro/ucslugc-packages.conf
@@ -1,2 +1,2 @@
-SLUGOS_EXTRA_BBFILES=${UCSLUGC_EXTRA_BBFILES}
+SLUGOS_EXTRA_BBFILES = "${UCSLUGC_EXTRA_BBFILES}"
 include conf/distro/slugos-packages.conf
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index 359f8e657f..ea6b14f310 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -18,11 +18,7 @@ UCSLUGC_EXTRA_BBFILES ?= ""
 # prefix UCSLUGC_ are used here to default the values of the corresponding NSLU2_
 # setting - either may be set in local.conf to override these values.
 UCSLUGC_EXTRA_RDEPENDS ?= ""
-UCSLUGC_EXTRA_DEPENDS ?= ""
-UCSLUGC_NATIVE_DEPENDS ?= "upslug2-native"
 #
 SLUGOS_EXTRA_RDEPENDS ?= "${UCSLUGC_EXTRA_RDEPENDS}"
-SLUGOS_EXTRA_DEPENDS ?= "${UCSLUGC_EXTRA_DEPENDS}"
-SLUGOS_NATIVE_DEPENDS ?= "${UCSLUGC_NATIVE_DEPENDS}"
 
 include conf/distro/slugos-btu.conf
diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index 8c4e253407..49d47fd498 100644
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -138,6 +138,12 @@ SERIAL_CONSOLE = "115200 ttyS0"
 KERNEL_CONSOLE = "ttyS0,115200n8"
 USE_VT = "0"
 
+# These depends define native utilities - they do not get put in the flash and
+# are not required to build the image.
+# upslug2 (in tmp/work/upslug2-native-*) is the program to write the NSLU2 flash
+# Override this as desired - it makes no difference to the final image.
+EXTRA_IMAGEDEPENDS += "upslug2-native"
+
 #-------------------------------------------------------------------------------
 # Package versions
 #-------------------------------------------------------------------------------