Patchwork [meta-qt5] Disable Debian-style package renaming for nativesdk-qtbase-tools

login
register
mail settings
Submitter Jacob Kroon
Date Feb. 21, 2014, 10:29 p.m.
Message ID <1393021765-4399-1-git-send-email-jacob.kroon@mikrodidakt.se>
Download mbox | patch
Permalink /patch/67139/
State Accepted, archived
Headers show

Comments

Jacob Kroon - Feb. 21, 2014, 10:29 p.m.
Since commit 8da5017712a7ddcb8488e095b9aa03b0273f23e9, libQt5*.so files
are included in the nativesdk-qtbase-tools package. However this
seems to enable Debian-style renaming, causing the resulting ipk package
to be created as "nativesdk-libqt5core5".

Explicitly disable renaming for nativesdk-qtbase-tools package.

Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
---
 recipes-qt/qt5/nativesdk-qtbase.inc | 2 ++
 1 file changed, 2 insertions(+)
Jacob Kroon - Feb. 24, 2014, 3:19 p.m.
On Fri, Feb 21, 2014 at 11:29 PM, Jacob Kroon <jacob.kroon@mikrodidakt.se>wrote:

> Since commit 8da5017712a7ddcb8488e095b9aa03b0273f23e9, libQt5*.so files
> are included in the nativesdk-qtbase-tools package. However this
> seems to enable Debian-style renaming, causing the resulting ipk package
> to be created as "nativesdk-libqt5core5".
>
> Explicitly disable renaming for nativesdk-qtbase-tools package.
>
> Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
> ---
>  recipes-qt/qt5/nativesdk-qtbase.inc | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc
> b/recipes-qt/qt5/nativesdk-qtbase.inc
> index 3cb9b0e..e87624b 100644
> --- a/recipes-qt/qt5/nativesdk-qtbase.inc
> +++ b/recipes-qt/qt5/nativesdk-qtbase.inc
> @@ -60,6 +60,8 @@ FILES_${PN}-tools = " \
>      ${OE_QMAKE_PATH_BINS}/* \
>  "
>
> +DEBIAN_NOAUTONAME_${PN}-tools = "1"
> +
>  QT_CONFIG_FLAGS += " \
>      -reduce-relocations \
>      -shared \
> --
> 1.8.5.3
>
>
Now that I think of it, would it be a better idea to somehow handle this in
debian.bbclass ? Or would that break too many existing package names..

  -- Jacob
Jacob Kroon - Feb. 24, 2014, 9:39 p.m.
On Mon, Feb 24, 2014 at 4:19 PM, Jacob Kroon <jacob.kroon@gmail.com> wrote:

> On Fri, Feb 21, 2014 at 11:29 PM, Jacob Kroon <jacob.kroon@mikrodidakt.se>wrote:
>
>> Since commit 8da5017712a7ddcb8488e095b9aa03b0273f23e9, libQt5*.so files
>> are included in the nativesdk-qtbase-tools package. However this
>> seems to enable Debian-style renaming, causing the resulting ipk package
>> to be created as "nativesdk-libqt5core5".
>>
>> Explicitly disable renaming for nativesdk-qtbase-tools package.
>>
>> Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
>> ---
>>  recipes-qt/qt5/nativesdk-qtbase.inc | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc
>> b/recipes-qt/qt5/nativesdk-qtbase.inc
>> index 3cb9b0e..e87624b 100644
>> --- a/recipes-qt/qt5/nativesdk-qtbase.inc
>> +++ b/recipes-qt/qt5/nativesdk-qtbase.inc
>> @@ -60,6 +60,8 @@ FILES_${PN}-tools = " \
>>      ${OE_QMAKE_PATH_BINS}/* \
>>  "
>>
>> +DEBIAN_NOAUTONAME_${PN}-tools = "1"
>> +
>>  QT_CONFIG_FLAGS += " \
>>      -reduce-relocations \
>>      -shared \
>> --
>> 1.8.5.3
>>
>>
> Now that I think of it, would it be a better idea to somehow handle this
> in debian.bbclass ? Or would that break too many existing package names..
>
> Looking closer at debian.bbclass, it seems that the function
auto_libname() fails to detect that "nativesdk-qtbase-tools" contains
binaries,
since the actual binaries are installed under "bin/qt5/" not "bin/", and
the regexp used for detecteding binaries is ".*/s?bin$", which won't
produce any matches.

  -- Jacob

Patch

diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc
index 3cb9b0e..e87624b 100644
--- a/recipes-qt/qt5/nativesdk-qtbase.inc
+++ b/recipes-qt/qt5/nativesdk-qtbase.inc
@@ -60,6 +60,8 @@  FILES_${PN}-tools = " \
     ${OE_QMAKE_PATH_BINS}/* \
 "
 
+DEBIAN_NOAUTONAME_${PN}-tools = "1"
+
 QT_CONFIG_FLAGS += " \
     -reduce-relocations \
     -shared \