[oe-commits] Bernhard Kaindl : external-toolchain: Really accept toolchains built by meta-toolchain.bb

[git version control]

Module: openembedded.git
Branch: holger/staging-branch
Commit: 5b4950faccd3e642e29fd9cb22d8b6a0cbc85982
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5b4950faccd3e642e29fd9cb22d8b6a0cbc85982

Author: Bernhard Kaindl <bernhard.kaindl at gmx.net>
Date:   Sun Nov 22 04:45:40 2009 +0000

external-toolchain: Really accept toolchains built by meta-toolchain.bb

external-toolchain-generic,
external-toolchain:

* The current external-toolchain recipes which are documented to accept
  toolchains built by meta-toolchain actually do not accept such because
  they expect ${prefix}/package-status to exist which is provieded by
  the poky toolchains but not the current OE meta-toolchain package.

  Fix this by also looking for ${prefix}/usr/lib/opkg/status, which is the
  package-status file of the OE meta-toolchain package.

* Also change the error message which is shown when neither file is found
  more explicit.

Cc:            Denys Dmytriyenko <denis at denix.org>
Signed-off-by: Bernhard Kaindl <bernhard.kaindl at gmx.net>

 external-toolchain-generic.bb |    4 ++--
 external-toolchain.bb         |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

---

 recipes/meta/external-toolchain-generic.bb |    4 ++--
 recipes/meta/external-toolchain.bb         |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes/meta/external-toolchain-generic.bb b/recipes/meta/external-toolchain-generic.bb
index 73f823f..c840301 100644
--- a/recipes/meta/external-toolchain-generic.bb
+++ b/recipes/meta/external-toolchain-generic.bb
@@ -22,8 +22,8 @@ PR = "r2"
 inherit sdk
 
 do_stage() {
-	if [ ! -e  ${prefix}/package-status ]; then
-		echo "The external toolchain could not be found in ${prefix}!"
+	if [ ! -e ${prefix}/package-status -a ! -e ${prefix}/usr/lib/opkg/status ]; then
+		echo "The package status file of the external toolchain could not be found in ${prefix}!"
 		exit 1
 	fi
 	
diff --git a/recipes/meta/external-toolchain.bb b/recipes/meta/external-toolchain.bb
index 4c70054..3521263 100644
--- a/recipes/meta/external-toolchain.bb
+++ b/recipes/meta/external-toolchain.bb
@@ -21,8 +21,8 @@ PR = "r2"
 inherit sdk
 
 do_stage() {
-	if [ ! -e  ${prefix}/package-status ]; then
-		echo "The external toolchain could not be found in ${prefix}!"
+	if [ ! -e ${prefix}/package-status -a ! -e ${prefix}/usr/lib/opkg/status ]; then
+		echo "The package status file of the external toolchain could not be found in ${prefix}!"
 		exit 1
 	fi