diff options
| author |   Bernhard Kaindl <bernhard.kaindl@gmx.net> | 2009-11-22 04:45:40 +0000 |
|---|---|---|
| committer |   Holger Hans Peter Freyther <zecke@selfish.org> | 2010-01-28 14:21:15 +0100 |
| commit | 67f8c8766f4578cfc217b0f2594011086ffe80f1 (patch) | |
| tree | b68a32bdf8d82a74c78dc33eebf072a26e656a3e | |
| parent | b6432162d49e4cb58cb2777c2179a88f5a2ee80b (diff) | |
| download | openembedded-67f8c8766f4578cfc217b0f2594011086ffe80f1.tar.gz | |
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@denix.org>
Signed-off-by: Bernhard Kaindl <bernhard.kaindl@gmx.net>
external-toolchain-generic.bb | 4 ++--
external-toolchain.bb | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
| -rw-r--r-- | recipes/meta/external-toolchain-generic.bb | 4 | ||||
| -rw-r--r-- | 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 73f823f192..c840301aac 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 4c70054b0f..352126396f 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 |