diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2011-08-01 18:58:36 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-02 14:32:11 +0100 |
commit | bb5a3ff0b0331655b44f41d7ca3f8d13066fb083 (patch) | |
tree | dd7befb3eed80fe5bc2830311cba0fa4ba7aac55 /meta | |
parent | 06d4cf01ffff6b358c7dc9f4434aae2714496fd8 (diff) | |
download | poky-bb5a3ff0b0331655b44f41d7ca3f8d13066fb083.tar.gz |
package_ipk: SDK generation workaround
During SDK generation the multilib_sanity_check function is being called,
however it is not available unless we've been called from the image.bbclass.
Disable the check if MULTILIB_CHECK_FILE (also set in image.bbclass) doesn't
exist or is empty.
(From OE-Core rev: 0611cceca1595ea4656ebcb985cbd92bb9774ec8)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/package_ipk.bbclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 3768889e1a..8ecf5111a8 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass | |||
@@ -127,8 +127,10 @@ package_install_internal_ipk() { | |||
127 | fi | 127 | fi |
128 | 128 | ||
129 | package_tryout_install_multilib_ipk | 129 | package_tryout_install_multilib_ipk |
130 | #sanity check | 130 | if [ ! -z "${MULTILIB_CHECK_FILE}" ]; then |
131 | multilib_sanity_check ${target_rootfs} ${multilib_tryout_dirs}|| exit 1 | 131 | #sanity check |
132 | multilib_sanity_check ${target_rootfs} ${multilib_tryout_dirs} || exit 1 | ||
133 | fi | ||
132 | 134 | ||
133 | if [ ! -z "${package_multilib}" ]; then | 135 | if [ ! -z "${package_multilib}" ]; then |
134 | opkg-cl ${ipkg_args} install ${package_multilib} | 136 | opkg-cl ${ipkg_args} install ${package_multilib} |