[oe-commits] org.oe.dev SlugOS 5.0 - replace module-init-tools with busybox

[mwester commit]

SlugOS 5.0 - replace module-init-tools with busybox

Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: 30ae730925a12988661810facbdca0b1b0399934
ViewMTN: http://monotone.openembedded.org/revision/info/30ae730925a12988661810facbdca0b1b0399934
Files:
1
packages/tasks/task-slugos.bb
packages/update-modules/update-modules_1.0.bb
Diffs:

#
# mt diff -r828a0ccb4261a3c48a977f56f50a961b9ddbfe52 -r30ae730925a12988661810facbdca0b1b0399934
#
#
#
# patch "packages/tasks/task-slugos.bb"
#  from [fe69b335fe12d79a158040a4ad67ab291c6c5e87]
#    to [3b4b6bd42f720b35aec589f38a0f20c8bc0b38a3]
# 
# patch "packages/update-modules/update-modules_1.0.bb"
#  from [ecad26ff3e4ce8d15f0e2e0c065189034d9a4eac]
#    to [0af083cf5539038cf89aef22f7ab398448095010]
#
============================================================
--- packages/tasks/task-slugos.bb	fe69b335fe12d79a158040a4ad67ab291c6c5e87
+++ packages/tasks/task-slugos.bb	3b4b6bd42f720b35aec589f38a0f20c8bc0b38a3
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 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_RDEPENDS ?= ""
 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 \
============================================================
--- packages/update-modules/update-modules_1.0.bb	ecad26ff3e4ce8d15f0e2e0c065189034d9a4eac
+++ packages/update-modules/update-modules_1.0.bb	0af083cf5539038cf89aef22f7ab398448095010
@@ -3,7 +3,7 @@ RDEPENDS = "${@base_contains("MACHINE_FE
 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 @@ RDEPENDS_unslung = ""
 # 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 = ""