Patchwork [meta-qt5,v2] Explicitly disable Debian-style package renaming for nativesdk-qtbase-tools

login
register
mail settings
Submitter Jacob Kroon
Date Feb. 28, 2014, 9:33 a.m.
Message ID <1393580032-3910-1-git-send-email-jacob.kroon@mikrodidakt.se>
Download mbox | patch
Permalink /patch/67691/
State Superseded, archived
Headers show

Comments

Jacob Kroon - Feb. 28, 2014, 9:33 a.m.
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>
---
 recipes-qt/qt5/nativesdk-qtbase.inc | 6 ++++++
 1 file changed, 6 insertions(+)
Otavio Salvador - Feb. 28, 2014, 1:26 p.m.
On Fri, Feb 28, 2014 at 6:33 AM, Jacob Kroon <jacob.kroon@mikrodidakt.se> wrote:
> 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>

Please rework the commitlog as:

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>

and please add my Acked-by.

Patch

diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc
index 3cb9b0e..884b1a6 100644
--- a/recipes-qt/qt5/nativesdk-qtbase.inc
+++ b/recipes-qt/qt5/nativesdk-qtbase.inc
@@ -60,6 +60,12 @@  FILES_${PN}-tools = " \
     ${OE_QMAKE_PATH_BINS}/* \
 "
 
+# qttools binaries are placed in a subdir of bin in order to avoid
+# collisions with qt4. This would trigger debian.bbclass to rename the
+# package, since it doesn't detect binaries in subdirs. Explicitly
+# disable package auto-renaming for the tools-package.
+DEBIAN_NOAUTONAME_${PN}-tools = "1"
+
 QT_CONFIG_FLAGS += " \
     -reduce-relocations \
     -shared \