Merge packages changes from OE into poky.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@386 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 8 insertions, 2 deletions

diff --git a/openembedded/packages/ipkg/ipkg.inc b/openembedded/packages/ipkg/ipkg.inc
index f535cfbef0..8fc6c9efe0 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 1898c6656e..de6af147b6 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"