diff options
| -rw-r--r-- | packages/initscripts/initscripts-slugos_1.0.bb | 8 | ||||
| -rw-r--r-- | packages/module-init-tools/module-init-tools-cross_3.2.2.bb | 4 | ||||
| -rw-r--r-- | packages/module-init-tools/module-init-tools_3.2.2.bb | 2 | ||||
| -rw-r--r-- | packages/slugos-init/files/boot/ram | 5 | ||||
| -rw-r--r-- | packages/tasks/task-slugos.bb | 7 | ||||
| -rw-r--r-- | packages/update-modules/update-modules_1.0.bb | 9 |
6 files changed, 29 insertions, 6 deletions
diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb index 242a55ad7a..b742ad5071 100644 --- a/packages/initscripts/initscripts-slugos_1.0.bb +++ b/packages/initscripts/initscripts-slugos_1.0.bb @@ -7,10 +7,16 @@ include initscripts_${PV}.bb RCONFLICTS = "initscripts" + +# SlugOS uses the busybox makedevs, so until that dependency gets virtualized +# the below lines serve to remove the dependency on the full makedevs package: +DEPENDS = "" +RDEPENDS = "" + # All other standard definitions inherited from initscripts # Except the PR which is hacked here. The format used is # a suffix -PR := "${PR}.13" +PR := "${PR}.14" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/packages/module-init-tools/module-init-tools-cross_3.2.2.bb b/packages/module-init-tools/module-init-tools-cross_3.2.2.bb index 9e6bcd6eee..eb2027b384 100644 --- a/packages/module-init-tools/module-init-tools-cross_3.2.2.bb +++ b/packages/module-init-tools/module-init-tools-cross_3.2.2.bb @@ -4,6 +4,10 @@ inherit cross DEFAULT_PREFERENCE = "0" PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6" +# Remove the RDEPENDS we picked up from the "require"; +# it's simply extraneous for the cross package +RDEPENDS_${PN} = "" + EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}" do_stage () { diff --git a/packages/module-init-tools/module-init-tools_3.2.2.bb b/packages/module-init-tools/module-init-tools_3.2.2.bb index 1c1fa90b04..a56bac7a82 100644 --- a/packages/module-init-tools/module-init-tools_3.2.2.bb +++ b/packages/module-init-tools/module-init-tools_3.2.2.bb @@ -3,7 +3,7 @@ removing kernel modules for Linux (versions 2.5.48 and above). It serves \ the same function that the modutils package serves for Linux 2.4." LICENSE = "GPL" SECTION = "base" -PR = "r4" +PR = "r5" PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" RDEPENDS_${PN} += "module-init-tools-depmod" diff --git a/packages/slugos-init/files/boot/ram b/packages/slugos-init/files/boot/ram index a7c78b39ac..2583edf852 100644 --- a/packages/slugos-init/files/boot/ram +++ b/packages/slugos-init/files/boot/ram @@ -28,9 +28,12 @@ then # filter out boot (with zimage), linuxrc and anything # below /var, keep dev or the boot will fail (note that # nothing is mounted this early in the bootstrap). - find . -mount -print | + find . -xdev -print | sed '\@^./boot/@d;\@^./boot$@d;\@^./linuxrc@d;\@^./var/@d' | cpio -p -d -m -u /mnt + # busybox find with -xdev will not print the name of the + # mountpoint, so create the empty dir manually if required. + test -d /mnt/mnt || mkdir /mnt/mnt # checkmount checks for sh, init and no .recovery plus # either mnt or initrd, mnt must exist! if checkmount /mnt diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb index 186eab6d07..0a0dd65496 100644 --- 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 17f9bb4f45..0c2d1894ac 100644 --- 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 |