opkg: only ping splash when splashfuncs are present

5 files changed, 23 insertions, 17 deletions

diff --git a/recipes/opkg/files/configure b/recipes/opkg/files/configure
index 1a8c3149b5..318ccb19c3 100644
--- a/recipes/opkg/files/configure
+++ b/recipes/opkg/files/configure
@@ -2,17 +2,22 @@
 # get splash funcs
 if [ -f /etc/default/splashfuncs ]; then
   . /etc/default/splashfuncs
-fi
 ## tell boot status to "pulsate" really long busy cycle here
 status_pulse || true
+fi
+
 # run configure in bg
 opkg-cl configure &
 PID=$!
-# while configure still running loop
-while test -d /proc/$PID; do
-# tick to splash so it doesn't time out
-  status_tick || true
-  sleep 1
-done
+
+if [ -f /etc/default/splashfuncs ]; then
+  # while configure still running loop
+  while test -d /proc/$PID; do
+  # tick to splash so it doesn't time out
+    status_tick || true
+    sleep 1
+  done
+fi
+
 # delete myself
 rm -f /etc/rcS.d/S98configure
diff --git a/recipes/opkg/opkg-nogpg-nocurl_svn.bb b/recipes/opkg/opkg-nogpg-nocurl_svn.bb
index 6f8b446ead..60da447696 100644
--- a/recipes/opkg/opkg-nogpg-nocurl_svn.bb
+++ b/recipes/opkg/opkg-nogpg-nocurl_svn.bb
@@ -11,7 +11,7 @@ SRC_URI += " \
 	    file://opkg_wget_nogpg_03_fix_tmpdirs.patch;patch=1 \
 	    file://opkg_wget_nogpg_04_default_tmpdir.patch;patch=1 \
 	   "
-PR = "r5"
+PR = "r6"
 
 SRCREV = "${SRCREV_pn-opkg}"
 
diff --git a/recipes/opkg/opkg-nogpg_svn.bb b/recipes/opkg/opkg-nogpg_svn.bb
index 641c7be451..c0a4d4a6e8 100644
--- a/recipes/opkg/opkg-nogpg_svn.bb
+++ b/recipes/opkg/opkg-nogpg_svn.bb
@@ -3,7 +3,7 @@ require opkg_svn.bb
 DEPENDS = "curl"
 PROVIDES += "opkg"
 
-PR = "r11"
+PR = "r12"
 
 SRCREV = "${SRCREV_pn-opkg}"
 
diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc
index be8287734b..e986c8deb6 100644
--- a/recipes/opkg/opkg.inc
+++ b/recipes/opkg/opkg.inc
@@ -7,10 +7,18 @@ PV = "0.1.6+svnr${SRCREV}"
 
 SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
 	file://opkg_unarchive.patch;patch=1;maxrev=201"
+
+SRC_URI += "file://configure"
+
 S = "${WORKDIR}/trunk"
 
 inherit autotools pkgconfig
 
+do_install_prepend() {
+  install -d ${D}${sysconfdir}/rcS.d
+  install -m 0755 ${WORKDIR}/configure ${D}${sysconfdir}/rcS.d/S98configure
+}
+
 do_stage() {
 	autotools_stage_all
 }
diff --git a/recipes/opkg/opkg_svn.bb b/recipes/opkg/opkg_svn.bb
index bc9af61dce..749fa1e975 100644
--- a/recipes/opkg/opkg_svn.bb
+++ b/recipes/opkg/opkg_svn.bb
@@ -1,6 +1,6 @@
 require opkg.inc
 
-PR = "r11"
+PR = "r12"
 
 PACKAGES =+ "libopkg-dev libopkg"
 
@@ -12,13 +12,6 @@ FILES_libopkg = "${libdir}/*.so.*"
 OPKG_INIT_POSITION = "98"
 OPKG_INIT_POSITION_slugos = "41"
 
-SRC_URI += "file://configure"
-
-do_install_prepend() {
-  install -d ${D}${sysconfdir}/rcS.d
-  install -m 0755 ${WORKDIR}/configure ${D}${sysconfdir}/rcS.d/S98configure
-}
-
 pkg_postinst_${PN} () {
   update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100
 }