diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-22 17:43:33 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-02 05:52:06 -0700 |
| commit | ad23395cd1f6c0cbfcc6980b6071d589f9f6cde0 (patch) | |
| tree | 9965e27a93c73af1ccf9cdb24c588faabc90370a /meta/recipes-qt | |
| parent | 58a8a38aa294edb74dde70d70a7e5faf49444b78 (diff) | |
| download | ast2050-yocto-poky-ad23395cd1f6c0cbfcc6980b6071d589f9f6cde0.zip ast2050-yocto-poky-ad23395cd1f6c0cbfcc6980b6071d589f9f6cde0.tar.gz | |
nativesdk: Switch to using nativesdk as a prefix, not a suffix
As discussed on the mailing lists, using a suffix to package names is
hard and has lead to many recipes having to do PKGSUFFIX games. Its
looking extremely hard to scale nativesdk much further without hacking
many recipes.
By comparison, using a prefix like multilib does works much better and
doesn't involve "hacking" as many recipes. This change converts nativesdk
to use a prefix using the existing multilib infrastructure.
(From OE-Core rev: 81813c0e322dc04ce4b069117188d8a54dfddb8c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
| -rw-r--r-- | meta/recipes-qt/meta/meta-toolchain-qte.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/files/qt-dbus-const.patch | 2 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb (renamed from meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb) | 0 | ||||
| -rw-r--r-- | meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb | 7 | ||||
| -rw-r--r-- | meta/recipes-qt/tasks/task-qte-toolchain-host-nativesdk.bb | 7 |
5 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-qt/meta/meta-toolchain-qte.bb b/meta/recipes-qt/meta/meta-toolchain-qte.bb index 735ccd1..116db91 100644 --- a/meta/recipes-qt/meta/meta-toolchain-qte.bb +++ b/meta/recipes-qt/meta/meta-toolchain-qte.bb @@ -1,6 +1,6 @@ # Qt Embedded toolchain PR = "r5" -TOOLCHAIN_HOST_TASK = "task-qte-toolchain-host-nativesdk task-cross-canadian-${TRANSLATED_TARGET_ARCH}" +TOOLCHAIN_HOST_TASK = "nativesdk-task-qte-toolchain-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}" TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target" TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-qte-${DISTRO_VERSION}" diff --git a/meta/recipes-qt/qt4/files/qt-dbus-const.patch b/meta/recipes-qt/qt4/files/qt-dbus-const.patch index f3de77e..6ee402f 100644 --- a/meta/recipes-qt/qt4/files/qt-dbus-const.patch +++ b/meta/recipes-qt/qt4/files/qt-dbus-const.patch @@ -1,4 +1,4 @@ -Remove "const" usage that causes compile failure building qt4-tools-nativesdk +Remove "const" usage that causes compile failure building nativesdk-qt4-tools Upstream-Status: Denied [possible retry] diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb index e17a8ad..e17a8ad 100644 --- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb +++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb diff --git a/meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb b/meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb new file mode 100644 index 0000000..5098d11 --- /dev/null +++ b/meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb @@ -0,0 +1,7 @@ +require recipes-core/tasks/nativesdk-task-sdk-host.bb + +DESCRIPTION = "Host packages for Qt Embedded SDK" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +RDEPENDS_${PN} += "nativesdk-qt4-tools" diff --git a/meta/recipes-qt/tasks/task-qte-toolchain-host-nativesdk.bb b/meta/recipes-qt/tasks/task-qte-toolchain-host-nativesdk.bb deleted file mode 100644 index cfa45ef..0000000 --- a/meta/recipes-qt/tasks/task-qte-toolchain-host-nativesdk.bb +++ /dev/null @@ -1,7 +0,0 @@ -require recipes-core/tasks/task-sdk-host-nativesdk.bb - -DESCRIPTION = "Host packages for Qt Embedded SDK" -LICENSE = "MIT" -ALLOW_EMPTY = "1" - -RDEPENDS_${PN} += "qt4-tools-nativesdk" |
