[PATCH 0/3] Dependency fixes

[PATCH 0/3] Dependency fixes

[Paul Eggleton]

Fix three issues due to missing dependency race conditions as shown up on
the autobuilder.

The following changes since commit 7a0cbe6b0e5185aebabedc515b427994bc2a15dc:

  cooker.py: Fix key expansion issues in showVersions (2011-09-19 05:55:37 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib paule/dep-fixes
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=paule/dep-fixes

Paul Eggleton (3):
  libgcrypt: add libcap to DEPENDS
  libgnome-keyring: add libgcrypt to DEPENDS
  freetype: disable bzip2 compressed font support

 .../recipes-gnome/gnome/libgnome-keyring_2.32.0.bb |    4 ++--
 meta/recipes-graphics/freetype/freetype_2.4.6.bb   |    4 ++--
 meta/recipes-support/libgcrypt/libgcrypt.inc       |    2 +-
 meta/recipes-support/libgcrypt/libgcrypt_1.4.6.bb  |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

-- 
1.7.4.1

[PATCH 1/3] libgcrypt: add libcap to DEPENDS

[Paul Eggleton]

We explicitly enable capabilities, so libcap is required. (This fixes a
race condition when libcap happens to be building at the same time as
libgcrypt.)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-support/libgcrypt/libgcrypt.inc      |    2 +-
 meta/recipes-support/libgcrypt/libgcrypt_1.4.6.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc
index 128aed3..989d556 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt.inc
+++ b/meta/recipes-support/libgcrypt/libgcrypt.inc
@@ -8,7 +8,7 @@ LICENSE = "GPLv2+ & LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff"
 
-DEPENDS = "libgpg-error"
+DEPENDS = "libgpg-error libcap"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \
            file://add-pkgconfig-support.patch"
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.4.6.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.4.6.bb
index 22eefd4..aef616c 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.4.6.bb
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.4.6.bb
@@ -1,6 +1,6 @@
 require libgcrypt.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "bfd45922eefb8a24d598af77366220d4"
 SRC_URI[sha256sum] = "996d2874643318c9df835777034a8b7a923d3cd0bee593bab1780305f9de872d"
-- 
1.7.4.1

[PATCH 2/3] libgnome-keyring: add libgcrypt to DEPENDS

[Paul Eggleton]

libgcrypt is a required dependency according to the configure script, so
add it to DEPENDS. (This fixes a race condition when libgcrypt happens
to be building at the same time as libgnome-keyring.)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../recipes-gnome/gnome/libgnome-keyring_2.32.0.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-gnome/gnome/libgnome-keyring_2.32.0.bb b/meta/recipes-gnome/gnome/libgnome-keyring_2.32.0.bb
index 09b6d9c..53e583e 100644
--- a/meta/recipes-gnome/gnome/libgnome-keyring_2.32.0.bb
+++ b/meta/recipes-gnome/gnome/libgnome-keyring_2.32.0.bb
@@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0914b9d3ebaba41ef2e3e0ae16f296cf \
                     file://egg/egg-dh.h;endline=22;md5=1626c16af2a8da1f88324cf3ced33f08"
 
 SECTION = "x11/gnome/libs"
-PR = "r0"
+PR = "r1"
 
 inherit gnome
 
-DEPENDS = "dbus eggdbus"
+DEPENDS = "dbus eggdbus libgcrypt"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
-- 
1.7.4.1

[PATCH 3/3] freetype: disable bzip2 compressed font support

[Paul Eggleton]

If we do not disable this then it is enabled sometimes and disabled at
others depending on whether bzip2 has been built at the time, and worst
case it will cause a race condition if bzip2 is building at the same
time.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-graphics/freetype/freetype_2.4.6.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/freetype/freetype_2.4.6.bb b/meta/recipes-graphics/freetype/freetype_2.4.6.bb
index 8150dd4..94a389a 100644
--- a/meta/recipes-graphics/freetype/freetype_2.4.6.bb
+++ b/meta/recipes-graphics/freetype/freetype_2.4.6.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=28d5381b1bef2649c59f20c20bae4f39
 
 SECTION = "libs"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
            file://no-hardcode.patch"
@@ -28,7 +28,7 @@ inherit autotools pkgconfig binconfig
 LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
 EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
 EXTRA_OEMAKE_virtclass-native = ""
-EXTRA_OECONF = "--without-zlib"
+EXTRA_OECONF = "--without-zlib --without-bzip2"
 
 do_configure() {
 	cd builds/unix
-- 
1.7.4.1

Re: [PATCH 3/3] freetype: disable bzip2 compressed font support

[Henning Heinold]

On Mon, Sep 19, 2011 at 11:58:36AM +0100, Paul Eggleton wrote:
> If we do not disable this then it is enabled sometimes and disabled at
> others depending on whether bzip2 has been built at the time, and worst
> case it will cause a race condition if bzip2 is building at the same
> time.
> 
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
>  meta/recipes-graphics/freetype/freetype_2.4.6.bb |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-graphics/freetype/freetype_2.4.6.bb b/meta/recipes-graphics/freetype/freetype_2.4.6.bb
> index 8150dd4..94a389a 100644
> --- a/meta/recipes-graphics/freetype/freetype_2.4.6.bb
> +++ b/meta/recipes-graphics/freetype/freetype_2.4.6.bb
> @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=28d5381b1bef2649c59f20c20bae4f39
>  
>  SECTION = "libs"
>  
> -PR = "r0"
> +PR = "r1"
>  
>  SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
>             file://no-hardcode.patch"
> @@ -28,7 +28,7 @@ inherit autotools pkgconfig binconfig
>  LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
>  EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
>  EXTRA_OEMAKE_virtclass-native = ""
> -EXTRA_OECONF = "--without-zlib"
> +EXTRA_OECONF = "--without-zlib --without-bzip2"
>  
>  do_configure() {
>  	cd builds/unix

Hi,

wouldn't it been better to let freetype depend on bz2 and libz. It may save some space in particular situations for some
people.

Bye Henning

Re: [PATCH 3/3] freetype: disable bzip2 compressed font support

[Richard Purdie]

On Mon, 2011-09-19 at 13:07 +0200, Henning Heinold wrote:
> On Mon, Sep 19, 2011 at 11:58:36AM +0100, Paul Eggleton wrote:
> > If we do not disable this then it is enabled sometimes and disabled at
> > others depending on whether bzip2 has been built at the time, and worst
> > case it will cause a race condition if bzip2 is building at the same
> > time.
> > 
> > Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> > ---
> >  meta/recipes-graphics/freetype/freetype_2.4.6.bb |    4 ++--
> >  1 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta/recipes-graphics/freetype/freetype_2.4.6.bb b/meta/recipes-graphics/freetype/freetype_2.4.6.bb
> > index 8150dd4..94a389a 100644
> > --- a/meta/recipes-graphics/freetype/freetype_2.4.6.bb
> > +++ b/meta/recipes-graphics/freetype/freetype_2.4.6.bb
> > @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=28d5381b1bef2649c59f20c20bae4f39
> >  
> >  SECTION = "libs"
> >  
> > -PR = "r0"
> > +PR = "r1"
> >  
> >  SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
> >             file://no-hardcode.patch"
> > @@ -28,7 +28,7 @@ inherit autotools pkgconfig binconfig
> >  LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
> >  EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
> >  EXTRA_OEMAKE_virtclass-native = ""
> > -EXTRA_OECONF = "--without-zlib"
> > +EXTRA_OECONF = "--without-zlib --without-bzip2"
> >  
> >  do_configure() {
> >  	cd builds/unix
> 
> Hi,
> 
> wouldn't it been better to let freetype depend on bz2 and libz. It may save some space in particular situations for some
> people.

Likely we should compress the fonts but this patch at least makes the
build deterministic. I'd probably take a further patch allowing
compression although whether it would make the release at this stage I'm
not sure.

Cheers,

Richard

Re: [PATCH 0/3] Dependency fixes

[Richard Purdie]

On Mon, 2011-09-19 at 11:58 +0100, Paul Eggleton wrote:
> Fix three issues due to missing dependency race conditions as shown up on
> the autobuilder.
> 
> The following changes since commit 7a0cbe6b0e5185aebabedc515b427994bc2a15dc:
> 
>   cooker.py: Fix key expansion issues in showVersions (2011-09-19 05:55:37 +0100)
> 
> are available in the git repository at:
>   git://git.pokylinux.org/poky-contrib paule/dep-fixes
>   http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=paule/dep-fixes
> 
> Paul Eggleton (3):
>   libgcrypt: add libcap to DEPENDS
>   libgnome-keyring: add libgcrypt to DEPENDS
>   freetype: disable bzip2 compressed font support

Merged to master, thanks.

Richard

Re: [PATCH 0/3] Dependency fixes

[Paul Eggleton]

On Monday 19 September 2011 11:58:33 Paul Eggleton wrote:
> Fix three issues due to missing dependency race conditions as shown up on
> the autobuilder.
> 
> The following changes since commit
> 7a0cbe6b0e5185aebabedc515b427994bc2a15dc:
> 
>   cooker.py: Fix key expansion issues in showVersions (2011-09-19 05:55:37
> +0100)
> 
> are available in the git repository at:
>   git://git.pokylinux.org/poky-contrib paule/dep-fixes
>   http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=paule/dep-fixes

So despite our discussion only late last week I still managed to post 
something based on a Poky branch this morning. Sorry about that :(

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre