break out modutils-initscripts from modutils-collateral

BKrev: 40e83bb9hlvKEQNtRm8PvHlM0VE4bQ

diff --git a/meta/task-bootstrap.oe b/meta/task-bootstrap.oe
index d51faf2..a087af6 100644 (file)
--- a/meta/task-bootstrap.oe
+++ b/meta/task-bootstrap.oe
@@ -1,6 +1,6 @@
 DESCRIPTION = "Core packages required for a basic installation"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r3"
+PR = "r4"
 
 ALLOW_EMPTY = 1
 PACKAGES = "${PN}"
@@ -8,11 +8,13 @@ PACKAGES = "${PN}"
 DEPENDS = 'base-files base-passwd-3.5.7 \
        busybox dropbear hotplug ipkg initscripts modutils netbase \
        resolvconf sysvinit tinylogin putty lrzsz portmap \
+       modutils-initscripts \
        ${BOOTSTRAP_EXTRA_DEPENDS}'
 
 RDEPENDS = 'base-files base-passwd busybox \
        hotplug ipkg initscripts modutils-depmod \
        netbase resolvconf sysvinit tinylogin \
+       modutils-initscripts \
        ${BOOTSTRAP_EXTRA_RDEPENDS}'
 
 RRECOMMENDS = 'dropbear lrzsz putty portmap \

diff --git a/modutils/modutils-collateral.oe b/modutils/modutils-collateral.oe
index d73ad63..a94b701 100644 (file)
--- a/modutils/modutils-collateral.oe
+++ b/modutils/modutils-collateral.oe
@@ -1,24 +1,16 @@
 DESCRIPTION = "modutils configuration files"
-FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/files"
+PR = "r1"
 
 SRC_URI = "file://modutils-notest.patch        \
           file://configure.patch \
           file://program_prefix.patch \
           file://modules \
-          file://modules.conf \
-          file://modutils"
-
-INITSCRIPT_NAME = "modutils"
-INITSCRIPT_PARAMS = "start 20 S ."
-
-inherit update-rc.d
+          file://modules.conf"
 
 do_compile () {
 }
 
 do_install () {
-       install -d ${D}/${sysconfdir} ${D}/etc/init.d/
-       install -m 0755 ${WORKDIR}/modutils ${D}/etc/init.d/
        install -m 0644 ${WORKDIR}/modules ${D}/${sysconfdir}/modules
        install -m 0644 ${WORKDIR}/modules.conf ${D}/${sysconfdir}/modules.conf
 }

diff --git a/modutils/modutils-initscripts.oe b/modutils/modutils-initscripts.oe
new file mode 100644 (file)
index 0000000..e69de29