diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-05-02 11:24:49 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-05-02 09:29:56 +0000 |
| commit | 15b0cecfcc3b780f83e559af5394a1610ed04796 (patch) | |
| tree | afa93b801390e3f95326ce0a960a290c5df7255d /classes | |
| parent | 126c788b1a9d5b71ee876fb12b41ba594a75321b (diff) | |
Add dependency to p7zip-native
Instead of depending on 7z from host, build it natively where
needed.
Change-Id: Ic15f607d0eb10c6f0af01134be3236c577aeb2bb
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/populate_b2qt_sdk.bbclass | 2 | ||||
| -rw-r--r-- | classes/qbsp-image.bbclass | 2 | ||||
| -rw-r--r-- | classes/qbsp.bbclass | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/classes/populate_b2qt_sdk.bbclass b/classes/populate_b2qt_sdk.bbclass index 5bd09027..fc64842a 100644 --- a/classes/populate_b2qt_sdk.bbclass +++ b/classes/populate_b2qt_sdk.bbclass @@ -46,6 +46,8 @@ replace_sysroot_symlink() { done } +do_populate_sysroot[depends] += "p7zip-native:do_populate_sysroot" + fakeroot tar_sdk_sdkmingw32() { replace_sysroot_symlink ${SDK_OUTPUT}${SDKTARGETSYSROOT} ${SDK_OUTPUT}${SDKTARGETSYSROOT} replace_sysroot_symlink ${SDK_OUTPUT}${SDKPATHNATIVE} ${SDK_OUTPUT}${SDKPATHNATIVE} diff --git a/classes/qbsp-image.bbclass b/classes/qbsp-image.bbclass index 9ea3cd8d..b8da7673 100644 --- a/classes/qbsp-image.bbclass +++ b/classes/qbsp-image.bbclass @@ -29,6 +29,8 @@ QBSP_IMAGE_CONTENT ??= "" +do_image_complete[depends] += "p7zip-native:do_populate_sysroot" + fakeroot do_qbsp_image () { if [ -z "${QBSP_IMAGE_CONTENT}" ]; then exit 0 diff --git a/classes/qbsp.bbclass b/classes/qbsp.bbclass index fd6d14cd..8beb55f7 100644 --- a/classes/qbsp.bbclass +++ b/classes/qbsp.bbclass @@ -42,6 +42,7 @@ SRC_URI = "\ INHIBIT_DEFAULT_DEPS = "1" do_qbsp[depends] += "\ + p7zip-native:do_populate_sysroot \ installer-framework:do_populate_sysroot \ ${QBSP_SDK_TASK}:do_populate_sdk \ ${QBSP_IMAGE_TASK}:do_image_complete \ |