Patchwork [1/1] qt4: Update qt4.inc to remove staticdev deps in -dbg packages

login
register
mail settings
Submitter Mark Hatle
Date Sept. 7, 2012, 10:07 p.m.
Message ID <43838ea5c9fde9942d50713c95efbc4585472d28.1347055585.git.mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/36151/
State Accepted
Commit a7c5cec5fc63b4a26d84673460426b35669068dc
Headers show

Comments

Mark Hatle - Sept. 7, 2012, 10:07 p.m.
It appears that the qt4.inc had a copy/paste error relating to creating
a list of staticdev packages, that caused them to show up as dependencies
in the -dbg package.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/recipes-qt/qt4/qt4-embedded.inc |    2 +-
 meta/recipes-qt/qt4/qt4-x11-free.inc |    2 +-
 meta/recipes-qt/qt4/qt4.inc          |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
Paul Eggleton - Sept. 8, 2012, 9:24 p.m.
On Friday 07 September 2012 17:07:11 Mark Hatle wrote:
> It appears that the qt4.inc had a copy/paste error relating to creating
> a list of staticdev packages, that caused them to show up as dependencies
> in the -dbg package.
> 
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> ---
>  meta/recipes-qt/qt4/qt4-embedded.inc |    2 +-
>  meta/recipes-qt/qt4/qt4-x11-free.inc |    2 +-
>  meta/recipes-qt/qt4/qt4.inc          |    2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc
> b/meta/recipes-qt/qt4/qt4-embedded.inc index de1b88e..53eb652 100644
> --- a/meta/recipes-qt/qt4/qt4-embedded.inc
> +++ b/meta/recipes-qt/qt4/qt4-embedded.inc
> @@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application
> framework -- this is SECTION = "libs"
>  HOMEPAGE = "http://qt.nokia.com"
>  DEPENDS += "directfb tslib"
> -INC_PR = "r47"
> +INC_PR = "r48"
> 
>  QT_BASE_LIB  ?= "libqt-embedded"
> 
> diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc
> b/meta/recipes-qt/qt4/qt4-x11-free.inc index e229b85..0ae74f7 100644
> --- a/meta/recipes-qt/qt4/qt4-x11-free.inc
> +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
> @@ -6,7 +6,7 @@ SECTION = "x11/libs"
>  DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext
> libxrender libxrandr libxcursor" PROVIDES += "qt4-x11"
> 
> -INC_PR = "r45"
> +INC_PR = "r46"
> 
>  QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl',
> '-no-opengl', d)} " QT_GLFLAGS_qemux86 = "-opengl"
> diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> index b8c6baf..ba231ba 100644
> --- a/meta/recipes-qt/qt4/qt4.inc
> +++ b/meta/recipes-qt/qt4/qt4.inc
> @@ -61,7 +61,7 @@ python __anonymous () {
>          staticdev_packages.append("%s-staticdev" % pkg)
>      for name in d.getVar("OTHER_PACKAGES", True).split():
>          dbg_packages.append("%s-dbg" % name)
> -        dbg_packages.append("%s-staticdev" % name)
> +        staticdev_packages.append("%s-staticdev" % name)
> 
>      for name in d.getVar("QT_EXTRA_LIBS", True).split():
>          pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt",
> "").replace("_", "-") + "4"

Acked-by: Paul Eggleton <paul.eggleton@linux.intel.com>

Cheers,
Paul

Patch

diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index de1b88e..53eb652 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -2,7 +2,7 @@  DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is
 SECTION = "libs"
 HOMEPAGE = "http://qt.nokia.com"
 DEPENDS += "directfb tslib"
-INC_PR = "r47"
+INC_PR = "r48"
 
 QT_BASE_LIB  ?= "libqt-embedded"
 
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index e229b85..0ae74f7 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -6,7 +6,7 @@  SECTION = "x11/libs"
 DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
 PROVIDES += "qt4-x11"
 
-INC_PR = "r45"
+INC_PR = "r46"
 
 QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
 QT_GLFLAGS_qemux86 = "-opengl"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index b8c6baf..ba231ba 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -61,7 +61,7 @@  python __anonymous () {
         staticdev_packages.append("%s-staticdev" % pkg)
     for name in d.getVar("OTHER_PACKAGES", True).split():
         dbg_packages.append("%s-dbg" % name)
-        dbg_packages.append("%s-staticdev" % name)
+        staticdev_packages.append("%s-staticdev" % name)
 
     for name in d.getVar("QT_EXTRA_LIBS", True).split():
         pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4"