Pack of changes to get task-bootstrap works better.

BKrev: 409fd24ePJ42qABkdpYI28oHVuIMmg

7 files changed, 29 insertions, 10 deletions

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 7d90f1e06f..7ad3babb9c 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -21,12 +21,13 @@ mickey@r2d2.tm.informatik.uni-frankfurt.de
 mickeyl@gandalf.tm.informatik.uni-frankfurt.de
 p.osiczko@tetrapyloctomy.org
 pablo@kosmos.(none)
+pb_@gandalf.tm.informatik.uni-frankfurt.de
 ral@alwin.at.home
 schurig@schurig.homelinux.net
+szczepan@home.hrw.one.pl
 szczepan@hrw.local
 tgall@www.rochcivictheatre.org
 timh@host10.kano.org.uk
 wind@spiritship.(none)
 xf005570@cn014xf005570l1.(none)
 xf005570@cn014xf005570w1.
-pb_@gandalf.tm.informatik.uni-frankfurt.de
diff --git a/dropbear/dropbear_0.41.oe b/dropbear/dropbear_0.41.oe
index cde8246f41..352c8d428f 100644
--- a/dropbear/dropbear_0.41.oe
+++ b/dropbear/dropbear_0.41.oe
@@ -4,7 +4,8 @@ DEPENDS = "virtual/libc zlib ncurses"
 PR = "r2"
 
 SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
-	 file://${FILESDIR}/configure.patch;patch=1"
+	 file://${FILESDIR}/configure.patch;patch=1 \
+	 file://${FILESDIR}/initd.patch;patch=1"
 S = "${WORKDIR}/dropbear-${PV}"
 
 inherit autotools update-rc.d
diff --git a/meta/task-bootstrap.oe b/meta/task-bootstrap.oe
index 617e308a2a..7f8d863d17 100644
--- a/meta/task-bootstrap.oe
+++ b/meta/task-bootstrap.oe
@@ -5,12 +5,13 @@ PACKAGES = "${PN}"
 
 DEPENDS = 'virtual/libc base-files base-passwd-3.5.7 \
 	busybox dropbear hotplug ipkg initscripts modutils netbase \
-	resolvconf sysvinit tinylogin lrzsz \
+	modutils-collateral resolvconf sysvinit tinylogin lrzsz \
 	${BOOTSTRAP_EXTRA_DEPENDS}'
 
 RDEPENDS = 'base-files base-passwd busybox \
-	hotplug ipkg initscripts modutils netbase \
-	resolvconf sysvinit sysv-rc tinylogin \
+	hotplug ipkg initscripts modutils-depmod \
+	modutils-collateral netbase \
+	resolvconf sysvinit tinylogin \
 	${BOOTSTRAP_EXTRA_RDEPENDS}'
 
 RRECOMMENDS = 'dropbear lrzsz \
diff --git a/modutils/modutils-collateral.oe b/modutils/modutils-collateral.oe
index d0e055bddd..a9de9433b5 100644
--- a/modutils/modutils-collateral.oe
+++ b/modutils/modutils-collateral.oe
@@ -1,9 +1,8 @@
 DEPENDS = "virtual/libc"
 DESCRIPTION = "modutils configuration files"
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/files"
 
-SRC_URI = "file://${FILESDIR}/modules \
-	   file://${FILESDIR}/modules.conf \
-	   file://${FILESDIR}/modutils"
+SRC_URI = "file://${FILESDIR}/modutils"
 
 INITSCRIPT_NAME = "modutils"
 INITSCRIPT_PARAMS = "start 20 S ."
diff --git a/modutils/modutils-cross_2.4.27.oe b/modutils/modutils-cross_2.4.27.oe
index e69de29bb2..8946d68100 100644
--- a/modutils/modutils-cross_2.4.27.oe
+++ b/modutils/modutils-cross_2.4.27.oe
@@ -0,0 +1,17 @@
+include modutils_${PV}.oe
+inherit cross
+S = "${WORKDIR}/modutils-${PV}"
+DEPENDS = "patcher-native"
+PACKAGES = ""
+
+sbindir = "${prefix}/bin"
+
+EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
+
+do_stage () {
+        oe_runmake install
+}
+
+do_install () {
+        :
+}
diff --git a/modutils/modutils_2.4.27.oe b/modutils/modutils_2.4.27.oe
index 2525ae84a9..892898dc98 100644
--- a/modutils/modutils_2.4.27.oe
+++ b/modutils/modutils_2.4.27.oe
@@ -2,6 +2,7 @@ PR = "r1"
 DESCRIPTION = "These utilities are intended to make a Linux modular kernel \
 manageable for all users, administrators and distribution \
 maintainers."
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/files"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2 \
 	   file://${FILESDIR}/modutils-notest.patch;patch=1 \
diff --git a/sysvinit/sysvinit_2.85.oe b/sysvinit/sysvinit_2.85.oe
index 182a93a3dd..9bc93f0463 100644
--- a/sysvinit/sysvinit_2.85.oe
+++ b/sysvinit/sysvinit_2.85.oe
@@ -5,7 +5,7 @@ DESCRIPTION = "System-V like init.\
  job is to start other programs that are essential to the operation of\
  your system. All processes are descended from init. For more information,\
  see the manual page init(8)."
-PACKAGES = "sysvinit sysv-rc"
+PACKAGES = "sysvinit"
 FILES_${PN} = "/sbin ${bindir} ${sysconfdir}"
 FILES_sysv-rc = "${sbindir}"
 
@@ -48,7 +48,6 @@ do_install () {
 	install -m 0644    ${FILESDIR}/rcS-default	${D}/etc/default/rcS
 	install -m 0755    ${FILESDIR}/rc		${D}/etc/init.d
 	install -m 0755    ${FILESDIR}/rcS		${D}/etc/init.d
-	install -m 0755    ${WORKDIR}/update-rc.d/update-rc.d ${D}/${sbindir}/
 }
 
 do_stage () {