From b4cb437c6595ff8ac13506e502fe04b1a60c4e04 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 9 May 2006 18:38:19 +0000
Subject: Merge packages changes from OE into poky.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@386 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 openembedded/packages/ipkg/ipkg.inc         | 9 +++++++--
 openembedded/packages/ipkg/ipkg_0.99.154.bb | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'openembedded/packages/ipkg')

diff --git a/openembedded/packages/ipkg/ipkg.inc b/openembedded/packages/ipkg/ipkg.inc
index f535cfbef..8fc6c9efe 100644
--- a/openembedded/packages/ipkg/ipkg.inc
+++ b/openembedded/packages/ipkg/ipkg.inc
@@ -16,6 +16,11 @@ S = "${WORKDIR}/ipkg/C"
 
 inherit autotools pkgconfig
 
+# 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"
+
 pkg_postinst_ipkg () {
 #!/bin/sh
 if [ "x$D" != "x" ]; then
@@ -23,8 +28,8 @@ if [ "x$D" != "x" ]; then
 	# this happens at S98 where our good 'ole packages script used to run
 	echo -e "#!/bin/sh
 ipkg-cl configure
-" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
-	chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
+" > ${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
diff --git a/openembedded/packages/ipkg/ipkg_0.99.154.bb b/openembedded/packages/ipkg/ipkg_0.99.154.bb
index 1898c6656..de6af147b 100644
--- a/openembedded/packages/ipkg/ipkg_0.99.154.bb
+++ b/openembedded/packages/ipkg/ipkg_0.99.154.bb
@@ -1 +1,2 @@
 include ipkg.inc
+PR = "r3"
-- 
cgit v1.2.3