SlugOS 5.0 - replace module-init-tools with busybox

diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb
index 186eab6..0a0dd65 100644 (file)
--- a/packages/tasks/task-slugos.bb
+++ b/packages/tasks/task-slugos.bb
@@ -6,7 +6,7 @@
 DESCRIPTION = "Task packages for the SlugOS distribution"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r19"
+PR = "r20"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
 ALLOW_EMPTY = "1"
@@ -119,6 +119,8 @@ DISTRO_EXTRA_DEPENDS ?= ""
 DEPENDS += "${DISTRO_EXTRA_DEPENDS}"
 
 DISTRO_EXTRA_RDEPENDS ?= ""
+
+## This comment block is temporary, to be removed once SlugOS 5.0 stabilizes
 ##RDEPENDS += "\
 ##     kernel ixp4xx-npe \
 ##     base-files base-passwd netbase \
@@ -138,13 +140,14 @@ DISTRO_EXTRA_RDEPENDS ?= ""
 ## util-linux-* utilities are now replaced by busybox tools.  Also, ipkg
 ## is replaced by a trimmed-down version of opkg (no package signatures,
 ## and it uses the busybox wget command instead of libcurl - MJW
+## SlugOS 5.0 - module-init-tools replaced by busybox as well - MJW
 
 RDEPENDS += "\
        kernel ixp4xx-npe \
        base-files base-passwd netbase \
         busybox initscripts-slugos slugos-init \
         update-modules sysvinit udev \
-       module-init-tools modutils-initscripts \
+       modutils-initscripts \
         opkg-collateral opkg-nogpg-nocurl \
        libgcc \
        beep \

diff --git a/packages/update-modules/update-modules_1.0.bb b/packages/update-modules/update-modules_1.0.bb
index 17f9bb4..0c2d189 100644 (file)
--- a/packages/update-modules/update-modules_1.0.bb
+++ b/packages/update-modules/update-modules_1.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Script to manage module configuration files"
 LICENSE = "GPLv2"
 PACKAGE_ARCH = "all"
 RDEPENDS = "${@base_contains("MACHINE_FEATURES", "kernel26",  "module-init-tools-depmod","modutils-depmod",d)} "
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "file://update-modules"
 
@@ -28,3 +28,10 @@ do_install() {
 # in both a 2.4 kernel distro and a 2.6 kernel distro.  Really, it's
 # not worth the effort to do that, so just overlook the next line.
 RDEPENDS_unslung = ""
+
+# The SlugOS distro is testing the use of the busybox mod* utilities.
+# If that works out, we should create a virtual/update-modules, and
+# let the distros select if they want busybox, or some other package
+# to provide it.  Until then, the following line just removes the
+# unwanted dependencies for SlugOS.
+RDEPENDS_slugos = ""
\ No newline at end of file