diff options
author | Jacob Kroon <jacob.kroon@mikrodidakt.se> | 2014-02-28 10:33:52 +0100 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2014-02-28 10:46:58 -0300 |
commit | cee2a75ad66080a1b8694238ee5cfe2570225e4d (patch) | |
tree | b77336b3461583a954fec10b372c60933540c979 /recipes-qt/qt5 | |
parent | e55d3ef36a98574e7d4535bb03b56c9a05e6578a (diff) | |
download | meta-qt5-cee2a75ad66080a1b8694238ee5cfe2570225e4d.tar.gz |
nativesdk-qtbase-tools: disable Debian-style package renaming
Since commit 8da5017712a7ddcb8488e095b9aa03b0273f23e9, libQt5*.so files
are included in the nativesdk-qtbase-tools package. However, this together
with the fact that the binaries are placed in a subdir "qt5" of bin will
confuse the Debian-style package renaming logic in debian.bbclass, causing the
resulting ipk package to be created as "nativesdk-libqt5core5".
Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase.inc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc index 3cb9b0ee..884b1a62 100644 --- a/recipes-qt/qt5/nativesdk-qtbase.inc +++ b/recipes-qt/qt5/nativesdk-qtbase.inc | |||
@@ -60,6 +60,12 @@ FILES_${PN}-tools = " \ | |||
60 | ${OE_QMAKE_PATH_BINS}/* \ | 60 | ${OE_QMAKE_PATH_BINS}/* \ |
61 | " | 61 | " |
62 | 62 | ||
63 | # qttools binaries are placed in a subdir of bin in order to avoid | ||
64 | # collisions with qt4. This would trigger debian.bbclass to rename the | ||
65 | # package, since it doesn't detect binaries in subdirs. Explicitly | ||
66 | # disable package auto-renaming for the tools-package. | ||
67 | DEBIAN_NOAUTONAME_${PN}-tools = "1" | ||
68 | |||
63 | QT_CONFIG_FLAGS += " \ | 69 | QT_CONFIG_FLAGS += " \ |
64 | -reduce-relocations \ | 70 | -reduce-relocations \ |
65 | -shared \ | 71 | -shared \ |