[oe-commits] org.oe.dev ipkg: Stop hacking in /etc/rcS.d, use update-rc.d.bbclass.
pfalcon commit
openembedded-commits at lists.openembedded.org
Sun Dec 2 18:07:18 UTC 2007
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.
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: e42d427effcc4411e7e58ecb81f587be6dbb6162
ViewMTN: http://monotone.openembedded.org/revision/info/e42d427effcc4411e7e58ecb81f587be6dbb6162
Files:
1
packages/ipkg/files/ipkg-configure
packages/ipkg/ipkg.inc
packages/ipkg/ipkg_0.99.163.bb
Diffs:
#
# mt diff -rfe0992753b30f43be0407eacefd0a4c6fb8045bd -re42d427effcc4411e7e58ecb81f587be6dbb6162
#
#
#
# add_file "packages/ipkg/files/ipkg-configure"
# content [38012e0e1b7b0690b187e43e83c2e33fbc0bc9e8]
#
# patch "packages/ipkg/ipkg.inc"
# from [d30b7883173e0c568eca20df33d213945f55d864]
# to [fc113df6d214da7a33273c7512dac5215da76f90]
#
# patch "packages/ipkg/ipkg_0.99.163.bb"
# from [eb539f2d4afc5f5d3617816a1d41afb6953cd070]
# to [3a58f561fcf234def5a100e624f4c721f8694641]
#
============================================================
--- packages/ipkg/files/ipkg-configure 38012e0e1b7b0690b187e43e83c2e33fbc0bc9e8
+++ packages/ipkg/files/ipkg-configure 38012e0e1b7b0690b187e43e83c2e33fbc0bc9e8
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo "Starting to configure packages..."
+ipkg-cl configure
+echo "Finished to configure packages."
============================================================
--- packages/ipkg/ipkg.inc d30b7883173e0c568eca20df33d213945f55d864
+++ packages/ipkg/ipkg.inc fc113df6d214da7a33273c7512dac5215da76f90
@@ -10,28 +10,24 @@ SRC_URI = "${HANDHELDS_CVS};module=famil
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 @@ update-alternatives --remove ipkg ${bind
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/
============================================================
--- packages/ipkg/ipkg_0.99.163.bb eb539f2d4afc5f5d3617816a1d41afb6953cd070
+++ packages/ipkg/ipkg_0.99.163.bb 3a58f561fcf234def5a100e624f4c721f8694641
@@ -1,9 +1,10 @@ include ipkg.inc
include ipkg.inc
-PR = "r5"
+PR = "r6"
S = "${WORKDIR}/ipkg-${PV}"
SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \
+ file://ipkg-configure \
file://terse.patch;patch=1 \
file://is-processing.patch;patch=1 \
file://1-pkg-parse--Optimize-inefficient-parsing.patch;patch=1 \
More information about the Openembedded-commits
mailing list