[PATCH 0/4] Pending patches from O.S. Systems tree

[PATCH 0/4] Pending patches from O.S. Systems tree

[Otavio Salvador]

The following changes since commit 2a52f806f3789f717219651b97dc64fec3881f7f:

  qmake_base.bbclass: fix lrelease/lupdate binary names (2011-06-02 18:26:19 +0100)

are available in the git repository at:
  git://github.com/OSSystems/oe-core master
  https://github.com/OSSystems/oe-core/tree/master

Otavio Salvador (4):
  xf86-driver-common.inc: remove .la files to avoid unpackaged warning
  gnutls: use INC_PR on 2.12.5 version recipe
  gnutls: add p11tool into gnutls-bin
  package.bbclass: add support to split Qt translation files

 meta/classes/package.bbclass                       |   41 ++++++++++++++++++--
 .../xorg-driver/xf86-driver-common.inc             |    6 ++-
 meta/recipes-support/gnutls/gnutls.inc             |    3 +-
 meta/recipes-support/gnutls/gnutls_2.12.5.bb       |    2 +-
 4 files changed, 45 insertions(+), 7 deletions(-)

-- 
1.7.2.5

[PATCH 1/4] xf86-driver-common.inc: remove .la files to avoid unpackaged warning

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../xorg-driver/xf86-driver-common.inc             |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc b/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc
index 550423b..6ff1391 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc
@@ -5,7 +5,7 @@ SECTION = "x11/drivers"
 LICENSE = "MIT-X"
 
 PE = "1"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "virtual/xserver-xf86 xproto randrproto util-macros"
 
@@ -27,3 +27,7 @@ do_configure_prepend () {
     mv configure.ac.new configure.ac
 }
 
+do_install_append () {
+    # driver's la files are not packaged
+    rm -f ${D}${libdir}/xorg/modules/drivers/*.la
+}
-- 
1.7.2.5

[PATCH 2/4] gnutls: use INC_PR on 2.12.5 version recipe

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-support/gnutls/gnutls_2.12.5.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-support/gnutls/gnutls_2.12.5.bb b/meta/recipes-support/gnutls/gnutls_2.12.5.bb
index b27a065..9d3f5ab 100644
--- a/meta/recipes-support/gnutls/gnutls_2.12.5.bb
+++ b/meta/recipes-support/gnutls/gnutls_2.12.5.bb
@@ -1,6 +1,6 @@
 require gnutls.inc
 
-PR = "r0"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://gnutls-openssl.patch \
             file://configure-fix.patch"
-- 
1.7.2.5

[PATCH 3/4] gnutls: add p11tool into gnutls-bin

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-support/gnutls/gnutls.inc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index 03aed6a..9257880 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gnutls/"
 BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls"
 DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2) libcap"
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 LICENSE = "GPLv3+ & LGPLv2.1+"
 LICENSE_${PN} = "LGPLv2.1+"
@@ -39,6 +39,7 @@ FILES_${PN}-bin = "${bindir}/gnutls-serv \
                    ${bindir}/gnutls-cli \
                    ${bindir}/srptool \
                    ${bindir}/psktool \
+                   ${bindir}/p11tool \
                    ${bindir}/certtool \
                    ${bindir}/gnutls-srpcrypt"
 
-- 
1.7.2.5

[PATCH 4/4] package.bbclass: add support to split Qt translation files

[Otavio Salvador]

There're many Qt applications that provide translation files in '.qm'
format however those weren't being splitted as GetText based
ones.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/classes/package.bbclass |   41 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 1e6a872..e4be20f 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -343,6 +343,8 @@ python package_do_split_locales() {
 		bb.debug(1, "package requested not splitting locales")
 		return
 
+	import re
+
 	packages = (bb.data.getVar('PACKAGES', d, True) or "").split()
 
 	datadir = bb.data.getVar('datadir', d, True)
@@ -358,12 +360,29 @@ python package_do_split_locales() {
 
 	localedir = os.path.join(dvar + datadir, 'locale')
 
-	if not os.path.isdir(localedir):
+	locales = []
+	if os.path.isdir(localedir):
+		locales = os.listdir(localedir)
+
+	# Check of Qt translation files
+	qm_re = re.compile("(.*)\.qm$")
+	qm_files = {}
+	for root, dirs, files in os.walk(dvar):
+		for file in files:
+			qm_file = qm_re.match(file)
+			if qm_file:
+				locale = qm_file.group(1)
+				relpath = os.path.join(root, file).replace(dvar, '', 1)
+				if relpath:
+					if not qm_files.has_key(locale):
+						qm_files[locale] = []
+
+					qm_files[locale].append(relpath)
+
+	if len(locales) == 0 and len(qm_files) == 0:
 		bb.debug(1, "No locale files in this package")
 		return
 
-	locales = os.listdir(localedir)
-
 	# This is *really* broken
 	mainpkg = packages[0]
 	# At least try and patch it up I guess...
@@ -372,13 +391,27 @@ python package_do_split_locales() {
 	if mainpkg.find('-dev'):
 		mainpkg = mainpkg.replace('-dev', '')
 
+	# Queue Qt locales for spliting
+	for l in qm_files.keys():
+		if l not in locales:
+			locales.append(l)
+
+	# Split the locales into different packages
 	summary = bb.data.getVar('SUMMARY', d, True) or pn
 	description = bb.data.getVar('DESCRIPTION', d, True) or "" 
 	for l in locales:
 		ln = legitimize_package_name(l)
 		pkg = pn + '-locale-' + ln
 		packages.append(pkg)
-		bb.data.setVar('FILES_' + pkg, os.path.join(datadir, 'locale', l), d)
+		files = []
+		files.append(os.path.join(datadir, 'locale', l))
+
+		if qm_files.has_key(l):
+			locale_re = re.compile("^.*([a-z]{2}(_[A-Z]{2})?)$")
+			ln = legitimize_package_name(locale_re.match(l).group(1))
+			files += qm_files[l]
+
+		bb.data.setVar('FILES_' + pkg, " ".join(files), d)
 		bb.data.setVar('RDEPENDS_' + pkg, '%s virtual-locale-%s' % (mainpkg, ln), d)
 		bb.data.setVar('RPROVIDES_' + pkg, '%s-locale %s-translation' % (pn, ln), d)
 		bb.data.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l), d)
-- 
1.7.2.5

Re: [PATCH 1/4] xf86-driver-common.inc: remove .la files to avoid unpackaged warning

[Saul Wold]

On 06/02/2011 12:25 PM, Otavio Salvador wrote:
> Signed-off-by: Otavio Salvador<otavio@ossystems.com.br>
> ---
>   .../xorg-driver/xf86-driver-common.inc             |    6 +++++-
>   1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc b/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc
> index 550423b..6ff1391 100644
> --- a/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc
> +++ b/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc
> @@ -5,7 +5,7 @@ SECTION = "x11/drivers"
>   LICENSE = "MIT-X"
>
>   PE = "1"
> -PR = "r0"
> +PR = "r1"
>
>   DEPENDS = "virtual/xserver-xf86 xproto randrproto util-macros"
>
> @@ -27,3 +27,7 @@ do_configure_prepend () {
>       mv configure.ac.new configure.ac
>   }
>
> +do_install_append () {
> +    # driver's la files are not packaged
> +    rm -f ${D}${libdir}/xorg/modules/drivers/*.la
> +}
Would it not be better to package them in the -dev package instead of 
throwing them away?

Sau!

Re: [PATCH 1/4] xf86-driver-common.inc: remove .la files to avoid unpackaged warning

[Otavio Salvador]

On Fri, Jun 3, 2011 at 00:52, Saul Wold <sgw@linux.intel.com> wrote:
> Would it not be better to package them in the -dev package instead of
> throwing them away?

They are not packaged by I remove them to avoid the unshiped warning.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [PATCH 1/4] xf86-driver-common.inc: remove .la files to avoid unpackaged warning

[Phil Blundell]

On Thu, 2011-06-02 at 17:52 -0700, Saul Wold wrote:
> On 06/02/2011 12:25 PM, Otavio Salvador wrote:
> > +do_install_append () {
> > +    # driver's la files are not packaged
> > +    rm -f ${D}${libdir}/xorg/modules/drivers/*.la
> > +}
>
> Would it not be better to package them in the -dev package instead of 
> throwing them away?

Not really.  The .la files for the drivers aren't good for anything: you
aren't ever going to link against them.

p.

Re: [PATCH 0/4] Pending patches from O.S. Systems tree

[Saul Wold]

On 06/02/2011 12:25 PM, Otavio Salvador wrote:
> The following changes since commit 2a52f806f3789f717219651b97dc64fec3881f7f:
>
>    qmake_base.bbclass: fix lrelease/lupdate binary names (2011-06-02 18:26:19 +0100)
>
> are available in the git repository at:
>    git://github.com/OSSystems/oe-core master
>    https://github.com/OSSystems/oe-core/tree/master
>
> Otavio Salvador (4):
>    xf86-driver-common.inc: remove .la files to avoid unpackaged warning
>    gnutls: use INC_PR on 2.12.5 version recipe
>    gnutls: add p11tool into gnutls-bin
These three were merged thanks
>    package.bbclass: add support to split Qt translation files
>
There was some discussion about this patch, please resubmit when you 
have addressed those issues.

Thanks
	Sau!

>   meta/classes/package.bbclass                       |   41 ++++++++++++++++++--
>   .../xorg-driver/xf86-driver-common.inc             |    6 ++-
>   meta/recipes-support/gnutls/gnutls.inc             |    3 +-
>   meta/recipes-support/gnutls/gnutls_2.12.5.bb       |    2 +-
>   4 files changed, 45 insertions(+), 7 deletions(-)
>