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.

18 files changed, 55 insertions, 59 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
 #-------------------------------------------------------------------------------
diff --git a/packages/ixp425-eth/files/modprobe.conf b/packages/ixp425-eth/files/modprobe.conf
new file mode 100644
index 0000000000..bfcbf916cf
--- /dev/null
+++ b/packages/ixp425-eth/files/modprobe.conf
@@ -0,0 +1,3 @@
+# Add an alias for eth0 to ixp425_eth to cause the S40networking
+# init script to load the ixp425_eth driver on the first boot
+alias eth0 ixp425_eth
diff --git a/packages/ixp425-eth/ixp400-eth-1.4/modprobe.conf b/packages/ixp425-eth/ixp400-eth-1.4/modprobe.conf
new file mode 100644
index 0000000000..9d579eeac1
--- /dev/null
+++ b/packages/ixp425-eth/ixp400-eth-1.4/modprobe.conf
@@ -0,0 +1,3 @@
+# Add an alias for eth0 to ixp400_eth to cause the S40networking
+# init script to load the ixp400_eth driver on the first boot
+alias eth0 ixp400_eth
diff --git a/packages/ixp425-eth/ixp400-eth-1.5/modprobe.conf b/packages/ixp425-eth/ixp400-eth-1.5/modprobe.conf
new file mode 100644
index 0000000000..9d579eeac1
--- /dev/null
+++ b/packages/ixp425-eth/ixp400-eth-1.5/modprobe.conf
@@ -0,0 +1,3 @@
+# Add an alias for eth0 to ixp400_eth to cause the S40networking
+# init script to load the ixp400_eth driver on the first boot
+alias eth0 ixp400_eth
diff --git a/packages/ixp425-eth/ixp400-eth_1.4.bb b/packages/ixp425-eth/ixp400-eth_1.4.bb
index 94024e9b75..6e14f67c0e 100644
--- a/packages/ixp425-eth/ixp400-eth_1.4.bb
+++ b/packages/ixp425-eth/ixp400-eth_1.4.bb
@@ -10,7 +10,8 @@ SRC_URI += "file://2.6.13.patch;patch=1"
 SRC_URI += "file://2.6.14.patch;patch=1"
 SRC_URI += "file://ixp400_pollcontroller.patch;patch=1"
 SRC_URI += "file://2.6.14-mm.patch;patch=1"
-PR = "r7"
+SRC_URI += "file://modprobe.conf"
+PR = "r9"
 
 DEPENDS = "ixp4xx-csr"
 RDEPENDS = "ixp4xx-csr"
@@ -20,6 +21,7 @@ S = "${WORKDIR}"
 COMPATIBLE_HOST = "^arm.*-linux.*"
 
 PROVIDES = "virtual/ixp-eth"
+RPROVIDES = "ixp-eth"
 
 inherit module
 
@@ -53,4 +55,6 @@ do_compile () {
 do_install () {
 	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net
 	install -m 0644 ixp400_eth.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net/
+	install -d ${D}${sysconfdir}/modprobe.d
+	install -m 0644 modprobe.conf ${D}${sysconfdir}/modprobe.d/eth0
 }
diff --git a/packages/ixp425-eth/ixp400-eth_1.5.bb b/packages/ixp425-eth/ixp400-eth_1.5.bb
index f5d2b34070..8d922f81d7 100644
--- a/packages/ixp425-eth/ixp400-eth_1.5.bb
+++ b/packages/ixp425-eth/ixp400-eth_1.5.bb
@@ -18,8 +18,9 @@ SRC_URI += "file://continue-if-qmgr-init-fails.patch;patch=1"
 SRC_URI += "file://netdev_max_backlog.patch;patch=1"
 SRC_URI += "file://debug.patch;patch=1"
 SRC_URI += "file://Makefile.patch;patch=1"
+SRC_URI += "file://modprobe.conf"
 
-PR = "r3"
+PR = "r5"
 
 DEPENDS = "ixp4xx-csr"
 RDEPENDS = "ixp4xx-csr"
@@ -29,6 +30,7 @@ S = "${WORKDIR}"
 COMPATIBLE_HOST = "^arm.*-linux.*"
 
 PROVIDES = "virtual/ixp-eth"
+RPROVIDES = "ixp-eth"
 
 inherit module
 
@@ -84,4 +86,6 @@ do_compile_append () {
 do_install () {
 	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net
 	install -m 0644 ixp400_eth.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net/
+	install -d ${D}${sysconfdir}/modprobe.d
+	install -m 0644 modprobe.conf ${D}${sysconfdir}/modprobe.d/eth0
 }
diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb
index 7f55bcec3b..53e713178a 100644
--- a/packages/ixp425-eth/ixp425-eth_1.1.bb
+++ b/packages/ixp425-eth/ixp425-eth_1.1.bb
@@ -10,7 +10,8 @@ SRC_URI = "http://www.intel.com/design/network/swsup/ixp400LinuxEthernetDriverPa
 	   file://mm4.patch;patch=1"
 SRC_URI += "file://2.6.13.patch;patch=1"
 SRC_URI += "file://2.6.14.patch;patch=1"
-PR = "r12"
+SRC_URI += "file://modprobe.conf"
+PR = "r15"
 
 RDEPENDS = "ixp4xx-csr"
 
@@ -19,6 +20,7 @@ S = "${WORKDIR}"
 COMPATIBLE_HOST = "^armeb-linux.*"
 
 PROVIDES = "virtual/ixp-eth"
+RPROVIDES = "ixp-eth"
 
 inherit module
 
@@ -46,4 +48,6 @@ do_compile () {
 do_install () {
 	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net
 	install -m 0644 ixp425_eth.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net/
+	install -d ${D}${sysconfdir}/modprobe.d
+	install -m 0644 modprobe.conf ${D}${sysconfdir}/modprobe.d/eth0
 }
diff --git a/packages/ixp425-eth/ixp425-eth_1.2.bb b/packages/ixp425-eth/ixp425-eth_1.2.bb
index 9336e1fe6d..3cc9a6c70a 100644
--- a/packages/ixp425-eth/ixp425-eth_1.2.bb
+++ b/packages/ixp425-eth/ixp425-eth_1.2.bb
@@ -8,7 +8,8 @@ SRC_URI += "file://ixp400linuxethernetdriver-1_2-kernel26_hr_20050929.patch;patc
 SRC_URI += "file://makefile.patch;patch=1"
 SRC_URI += "file://2.6.13.patch;patch=1"
 SRC_URI += "file://2.6.14.patch;patch=1"
-PR = "r2"
+SRC_URI += "file://modprobe.conf"
+PR = "r4"
 
 DEPENDS = "ixp4xx-csr"
 RDEPENDS = "ixp4xx-csr"
@@ -18,6 +19,7 @@ S = "${WORKDIR}"
 COMPATIBLE_HOST = "^armeb-linux.*"
 
 PROVIDES = "virtual/ixp-eth"
+RPROVIDES = "ixp-eth"
 
 inherit module
 
@@ -46,4 +48,6 @@ do_compile () {
 do_install () {
 	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net
 	install -m 0644 ixp425_eth.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net/
+	install -d ${D}${sysconfdir}/modprobe.d
+	install -m 0644 modprobe.conf ${D}${sysconfdir}/modprobe.d/eth0
 }
diff --git a/packages/meta/slugos-image.bb b/packages/meta/slugos-image.bb
index ad16b6ae93..6a4db265d8 100644
--- a/packages/meta/slugos-image.bb
+++ b/packages/meta/slugos-image.bb
@@ -4,7 +4,7 @@
 # conf/distro/slugos.conf to get the standard settings).
 #
 LICENSE = "MIT"
-PR = "r17"
+PR = "r18"
 PROVIDES += "${SLUGOS_IMAGENAME}-image"
 
 # SLUGOS_IMAGENAME defines the name of the image to be build, if it
@@ -65,7 +65,7 @@ nslu2_pack_image() {
 
 IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image;"
 
-SLUGOS_IMAGE_DEPENDS = "${@['', 'slugimage-native nslu2-linksys-firmware'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'yes']}"
+DEPENDS = "${@['', 'slugimage-native nslu2-linksys-firmware'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'yes']} virtual/kernel virtual/ixp-eth"
 
 IMAGE_LINGUAS = ""
 # Setting USE_DEVFS prevents *any* entries being created initially
@@ -73,15 +73,8 @@ IMAGE_LINGUAS = ""
 USE_DEVFS = "1"
 
 # CONFIG:
-# SLUGOS_IMAGE_DEPENDS:  set above, do not change
 # SLUGOS_EXTRA_RDEPENDS: set in conf, things to add to the image
-# SLUGOS_EXTRA_DEPENDS:  set in conf, things to build, not added
-#                        to the image.
-# SLUGOS_NATIVE_DEPENDS: set in conf, things to build, intended
-#                        for native (run-on-host) tools
-#
-# SLUGOS_SUPPORT:        set to here, see below, added to build and
-#                        to the image.
+# SLUGOS_SUPPORT:        set to here, see below, added to the image.
 # SLUGOS_KERNEL:         set here, kernel modules added to the image
 #
 # Do not override the last two unless you really know what you
@@ -103,29 +96,20 @@ SLUGOS_SUPPORT ?= "diffutils cpio findutils udev"
 # other than the network to output error messages!)
 SLUGOS_KERNEL ?= "kernel-module-af-packet kernel-module-netconsole"
        
-# The things explicitly included in the following lists are the
-# absolute minimum to have any chance of a bootable system.
-DEPENDS = "${SLUGOS_IMAGE_DEPENDS} \
-	virtual/kernel base-files base-passwd \
-        busybox dropbear hotplug-ng initscripts-slugos netbase \
-        sysvinit tinylogin portmap \
-        virtual/ixp-eth slugos-init \
-	module-init-tools modutils-initscripts \
-        ipkg-collateral ipkg ipkg-link \
-	${SLUGOS_SUPPORT} \
-        ${SLUGOS_EXTRA_DEPENDS} \
-	${SLUGOS_NATIVE_DEPENDS}"
-
-IPKG_INSTALL = "base-files base-passwd \
-        busybox dropbear hotplug-ng initscripts-slugos netbase \
-        update-modules sysvinit tinylogin portmap \
-        ${PREFERRED_PROVIDER_virtual/ixp-eth} slugos-init \
+RDEPENDS = "kernel ixp-eth \
+	base-files base-passwd netbase \
+        busybox hotplug-ng initscripts-slugos slugos-init \
+        update-modules sysvinit tinylogin \
 	module-init-tools modutils-initscripts \
         ipkg-collateral ipkg ipkg-link \
+	portmap \
+	dropbear \
 	${SLUGOS_SUPPORT} \
 	${SLUGOS_KERNEL} \
 	${SLUGOS_EXTRA_RDEPENDS}"
 
+IPKG_INSTALL = "${RDEPENDS}"
+
 inherit image_ipk
 
 python () {
diff --git a/packages/slugos-init/files/modprobe.conf b/packages/slugos-init/files/modprobe.conf
deleted file mode 100644
index 08482e8c6d..0000000000
--- a/packages/slugos-init/files/modprobe.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Add an alias for eth0 to MODULE to cause the S40networking
-# init script to load the MODULE driver on the first boot
-alias eth0 MODULE
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index 4bca35f47f..d22bdde4ad 100644
--- a/packages/slugos-init/slugos-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@ -24,7 +24,6 @@ SRC_URI = "file://linuxrc \
 	   file://conffiles \
 	   file://turnup \
 	   file://reflash \
-	   file://modprobe.conf \
 	   file://links.conf \
 	   file://leds.h \
 	   file://leds.c \
@@ -105,9 +104,6 @@ do_install() {
 
 	# Configuration files
 	install -m 0644 conffiles ${D}${sysconfdir}/default
-	# Change MODULE in modprobe.conf to the correct module name
-	rm -f ${D}${sysconfdir}/modprobe.conf
-	sed 's/MODULE/'"$(echo '${PREFERRED_PROVIDER_virtual/ixp-eth}'|sed 's/-/_/g')"'/g' modprobe.conf >${D}${sysconfdir}/modprobe.conf
 
 	set +ex
 }
@@ -148,4 +144,4 @@ FILES_${PN} = "/"
 
 # It is bad to overwrite /linuxrc as it puts the system back to
 # a flash boot (and the flash has potentially not been upgraded!)
-CONFFILES_${PN} = "${sysconfdir}/modprobe.conf /linuxrc ${sysconfdir}/default/conffiles"
+CONFFILES_${PN} = "/linuxrc ${sysconfdir}/default/conffiles"