ipkg: Stop hacking in /etc/rcS.d, use update-rc.d.bbclass.

* Also, designate start and end of "ipkg configure" run, to diagnose
boot-time hangs.

1 files changed, 11 insertions, 10 deletions

diff --git a/packages/ipkg/ipkg.inc b/packages/ipkg/ipkg.inc
index b1e2f19267..9154572f08 100644
--- a/packages/ipkg/ipkg.inc
+++ b/packages/ipkg/ipkg.inc
@@ -10,28 +10,24 @@ FILES_libipkg = "${libdir}/*.so.*"
 AUTO_LIBNAME_PKGS = "libipkg"
 
 SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+        file://ipkg-configure \
 	file://terse.patch;patch=1"
 
 S = "${WORKDIR}/ipkg/C"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig update-rc.d
 
 # Define a variable to allow distros to run configure earlier.
 # (for example, to enable loading of ethernet kernel modules before networking starts)
 IPKG_INIT_POSITION = "98"
 IPKG_INIT_POSITION_slugos = "41"
 
+INITSCRIPT_NAME = "ipkg-configure"
+INITSCRIPT_PARAMS = "start ${IPKG_INIT_POSITION} S ."
+
+
 pkg_postinst_ipkg () {
 #!/bin/sh
-if [ "x$D" != "x" ]; then
-	install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
-	# this happens at S98 where our good 'ole packages script used to run
-	echo "#!/bin/sh
-ipkg-cl configure
-" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${IPKG_INIT_POSITION}configure
-	chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${IPKG_INIT_POSITION}configure
-fi
-
 update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100
 }
 
@@ -40,6 +36,11 @@ pkg_postrm_ipkg () {
 update-alternatives --remove ipkg ${bindir}/ipkg-cl
 }
 
+do_install_append() {
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/${INITSCRIPT_NAME} ${D}${sysconfdir}/init.d/
+}
+
 do_stage() {
 	oe_libinstall -so libipkg ${STAGING_LIBDIR}
 	install -d ${STAGING_INCDIR}/replace/