From 81813c0e322dc04ce4b069117188d8a54dfddb8c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 22 Dec 2011 17:43:33 +0000 Subject: 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. Signed-off-by: Richard Purdie --- meta/recipes-qt/meta/meta-toolchain-qte.bb | 2 +- meta/recipes-qt/qt4/files/qt-dbus-const.patch | 2 +- meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb | 8 ++++++++ meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb | 8 -------- meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb | 7 +++++++ meta/recipes-qt/tasks/task-qte-toolchain-host-nativesdk.bb | 7 ------- 6 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb delete mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb create mode 100644 meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb delete mode 100644 meta/recipes-qt/tasks/task-qte-toolchain-host-nativesdk.bb (limited to 'meta/recipes-qt') diff --git a/meta/recipes-qt/meta/meta-toolchain-qte.bb b/meta/recipes-qt/meta/meta-toolchain-qte.bb index 735ccd10ab..116db914a1 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 f3de77e3e6..6ee402fdc1 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/nativesdk-qt4-tools_4.8.1.bb b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb new file mode 100644 index 0000000000..e17a8ad808 --- /dev/null +++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb @@ -0,0 +1,8 @@ +require qt4-tools-nativesdk.inc + +PR = "${INC_PR}.1" + +SRC_URI += "file://qmake_pri_fixes.patch" + +SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff" +SRC_URI[sha256sum] = "ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8" diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb deleted file mode 100644 index e17a8ad808..0000000000 --- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require qt4-tools-nativesdk.inc - -PR = "${INC_PR}.1" - -SRC_URI += "file://qmake_pri_fixes.patch" - -SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff" -SRC_URI[sha256sum] = "ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8" 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 0000000000..5098d11388 --- /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 cfa45ef939..0000000000 --- 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" -- cgit v1.2.3