[oe-commits] Graeme Gregory : recipes/opkg/files/configure : fix the case where this is no splash installed.
GIT User account
git at amethyst.openembedded.net
Wed Apr 29 13:37:18 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: ac4a2334cf292d5a131b60002753612db5c9bda2
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=ac4a2334cf292d5a131b60002753612db5c9bda2
Author: Graeme Gregory <dp at xora.org.uk>
Date: Wed Apr 29 14:25:14 2009 +0100
recipes/opkg/files/configure : fix the case where this is no splash installed.
recipes/opkg/opkg*.bb : bump PR for affected recipes
---
recipes/opkg/files/configure | 10 ++++++----
recipes/opkg/opkg-nogpg-nocurl_svn.bb | 2 +-
recipes/opkg/opkg-nogpg_svn.bb | 2 +-
recipes/opkg/opkg_svn.bb | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/recipes/opkg/files/configure b/recipes/opkg/files/configure
index 318ccb1..d5dd74d 100644
--- a/recipes/opkg/files/configure
+++ b/recipes/opkg/files/configure
@@ -7,16 +7,18 @@ status_pulse || true
fi
# run configure in bg
-opkg-cl configure &
-PID=$!
-
-if [ -f /etc/default/splashfuncs ]; then
+if [ -f /etc/default/splashfuncs ]; then
+ 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
+else
+ opkg-cl configure
fi
# delete myself
diff --git a/recipes/opkg/opkg-nogpg-nocurl_svn.bb b/recipes/opkg/opkg-nogpg-nocurl_svn.bb
index 60da447..c390174 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 = "r6"
+PR = "r7"
SRCREV = "${SRCREV_pn-opkg}"
diff --git a/recipes/opkg/opkg-nogpg_svn.bb b/recipes/opkg/opkg-nogpg_svn.bb
index c0a4d4a..b6bb4b3 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 = "r12"
+PR = "r13"
SRCREV = "${SRCREV_pn-opkg}"
diff --git a/recipes/opkg/opkg_svn.bb b/recipes/opkg/opkg_svn.bb
index 749fa1e..d286377 100644
--- a/recipes/opkg/opkg_svn.bb
+++ b/recipes/opkg/opkg_svn.bb
@@ -1,6 +1,6 @@
require opkg.inc
-PR = "r12"
+PR = "r13"
PACKAGES =+ "libopkg-dev libopkg"
More information about the Openembedded-commits
mailing list