[PATCH 0/4] Misc updates

[PATCH 0/4] Misc updates

[Tom Rini]

Hey all,

This is the first of two pull requests.  As part of updating siteinfo.bbclass
I did a world build (qemux86) before and after the changes and diff'd the
config.log files.  That showed two classes of problems, both fixed in this
series.  The first is a checksum mismatch and an invalid SRC_URI.  The second
is some implicit DEPENDS in recipes.

The following changes since commit e66c2999afa2b3efbce8bb46c89f9db5e15f35c7:
  Saul Wold (1):
        libx11: ensure nativesdk uses correct DEPENDS and XCB flags

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib trini/misc
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=trini/misc

Tom Rini (4):
  libsamplerate0: Update checksums
  hicolor-icon-theme: Use ${BPN}-${PV} not ${P} to unbreak nativesdk
  groff: Disable x11 support
  libpcre: Add bzip2, zlib and readline to DEPENDS

 meta/recipes-extended/groff/groff_1.20.1.bb        |    1 +
 .../hicolor-icon-theme/hicolor-icon-theme_0.12.bb  |    2 +-
 .../libsamplerate/libsamplerate0_0.1.7.bb          |    4 ++--
 meta/recipes-support/libpcre/libpcre_8.12.bb       |    1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

[PATCH 1/4] libsamplerate0: Update checksums

[Tom Rini]

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
 .../libsamplerate/libsamplerate0_0.1.7.bb          |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.7.bb b/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.7.bb
index d08640f..194f885 100644
--- a/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.7.bb
+++ b/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.7.bb
@@ -9,8 +9,8 @@ PR = "r0"
 SRC_URI = "http://www.mega-nerd.com/SRC/libsamplerate-${PV}.tar.gz \
            file://libsamplerate-0.1.7-macro-quoting.patch"
 
-SRC_URI[md5sum] = "6731a81cb0c622c483b28c0d7f90867d"
-SRC_URI[sha256sum] = "78ed5d9ff1bf162c4a078f6a3e7432a537dd2f22dc58872b081fb01156027fcc"
+SRC_URI[md5sum] = "ad093e60ec44f0a60de8e29983ddbc0f"
+SRC_URI[sha256sum] = "e0a646224a0323ac63f56ef009b2d7fee11452a7b8af139b19ae71d2890dbc9c"
 S = "${WORKDIR}/libsamplerate-${PV}"
 
 inherit autotools pkgconfig
-- 
1.7.0.4

[PATCH 2/4] hicolor-icon-theme: Use ${BPN}-${PV} not ${P} to unbreak nativesdk

[Tom Rini]

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
 .../hicolor-icon-theme/hicolor-icon-theme_0.12.bb  |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb b/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
index 98c0d91..c9d65a2 100644
--- a/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
+++ b/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
@@ -10,7 +10,7 @@ inherit gnome
 
 PR = "r0"
 
-SRC_URI = "http://icon-theme.freedesktop.org/releases/${P}.tar.gz \
+SRC_URI = "http://icon-theme.freedesktop.org/releases/${BPN}-${PV}.tar.gz \
         file://index.theme"
 
 SRC_URI[md5sum] = "55cafbcef8bcf7107f6d502149eb4d87"
-- 
1.7.0.4

[PATCH 3/4] groff: Disable x11 support

[Tom Rini]

groff will build with, or without x11 support depending on if X has
been built already or not.  Disable x11 support for consistency.

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
 meta/recipes-extended/groff/groff_1.20.1.bb |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-extended/groff/groff_1.20.1.bb b/meta/recipes-extended/groff/groff_1.20.1.bb
index e0e198f..7085911 100644
--- a/meta/recipes-extended/groff/groff_1.20.1.bb
+++ b/meta/recipes-extended/groff/groff_1.20.1.bb
@@ -18,6 +18,7 @@ DEPENDS_virtclass-native = ""
 
 inherit autotools
 
+EXTRA_OECONF = "--without-x"
 PARALLEL_MAKE = ""
 
 do_configure_prepend() {
-- 
1.7.0.4

[PATCH 4/4] libpcre: Add bzip2, zlib and readline to DEPENDS

[Tom Rini]

libpcre will build, if found, optional support for bzip2/zlib in
pcregrep and a readline frontend to pcretest.  It will not however
listen to --disable-pcregrep-{libz,libbz2} and will still build
these if found.  So we add bzip2, zlib and readline to DEPENDS to make
sure that we get consistent builds.

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
 meta/recipes-support/libpcre/libpcre_8.12.bb |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-support/libpcre/libpcre_8.12.bb b/meta/recipes-support/libpcre/libpcre_8.12.bb
index 33003c5..9216777 100644
--- a/meta/recipes-support/libpcre/libpcre_8.12.bb
+++ b/meta/recipes-support/libpcre/libpcre_8.12.bb
@@ -17,6 +17,7 @@ SRC_URI[sha256sum] = "c63070d461edc451ec9457f2324e152a531e907d5c5d2d8f8121e725ac
 S = "${WORKDIR}/pcre-${PV}"
 
 PROVIDES = "pcre"
+DEPENDS = "bzip2 zlib readline"
 
 inherit autotools binconfig
 
-- 
1.7.0.4

Re: [PATCH 1/4] libsamplerate0: Update checksums

[Saul Wold]

On 07/13/2011 12:05 PM, Tom Rini wrote:
> Signed-off-by: Tom Rini<tom_rini@mentor.com>
> ---
>   .../libsamplerate/libsamplerate0_0.1.7.bb          |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.7.bb b/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.7.bb
> index d08640f..194f885 100644
> --- a/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.7.bb
> +++ b/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.7.bb
> @@ -9,8 +9,8 @@ PR = "r0"
>   SRC_URI = "http://www.mega-nerd.com/SRC/libsamplerate-${PV}.tar.gz \
>              file://libsamplerate-0.1.7-macro-quoting.patch"
>
> -SRC_URI[md5sum] = "6731a81cb0c622c483b28c0d7f90867d"
> -SRC_URI[sha256sum] = "78ed5d9ff1bf162c4a078f6a3e7432a537dd2f22dc58872b081fb01156027fcc"
> +SRC_URI[md5sum] = "ad093e60ec44f0a60de8e29983ddbc0f"
> +SRC_URI[sha256sum] = "e0a646224a0323ac63f56ef009b2d7fee11452a7b8af139b19ae71d2890dbc9c"
>   S = "${WORKDIR}/libsamplerate-${PV}"
>
>   inherit autotools pkgconfig

Are you sure about this one?  Did you maybe get a bad download from 
someplace?  I just checked the upstream source and it's still the 673 
md5sum.

Sau!

Re: [PATCH 1/4] libsamplerate0: Update checksums

[Tom Rini]

On 07/13/2011 01:48 PM, Saul Wold wrote:
> On 07/13/2011 12:05 PM, Tom Rini wrote:
>> Signed-off-by: Tom Rini<tom_rini@mentor.com>
>> ---
>>   .../libsamplerate/libsamplerate0_0.1.7.bb          |    4 ++--
>>   1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git
>> a/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.7.bb
>> b/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.7.bb
>> index d08640f..194f885 100644
>> --- a/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.7.bb
>> +++ b/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.7.bb
>> @@ -9,8 +9,8 @@ PR = "r0"
>>   SRC_URI = "http://www.mega-nerd.com/SRC/libsamplerate-${PV}.tar.gz \
>>              file://libsamplerate-0.1.7-macro-quoting.patch"
>>
>> -SRC_URI[md5sum] = "6731a81cb0c622c483b28c0d7f90867d"
>> -SRC_URI[sha256sum] =
>> "78ed5d9ff1bf162c4a078f6a3e7432a537dd2f22dc58872b081fb01156027fcc"
>> +SRC_URI[md5sum] = "ad093e60ec44f0a60de8e29983ddbc0f"
>> +SRC_URI[sha256sum] =
>> "e0a646224a0323ac63f56ef009b2d7fee11452a7b8af139b19ae71d2890dbc9c"
>>   S = "${WORKDIR}/libsamplerate-${PV}"
>>
>>   inherit autotools pkgconfig
> 
> Are you sure about this one?  Did you maybe get a bad download from
> someplace?  I just checked the upstream source and it's still the 673
> md5sum.

Alright, crazy.  Locally, I've got a tarball with those checksums,
that's 'valid'.  Re-fetch, it's the normal sums.  Extract both, diff:
http://pastebin.com/5xW2z8Du  So, uh, consider this patch withdrawn.
Need a resend of the series?

-- 
Tom Rini
Mentor Graphics Corporation

Re: [PATCH 0/4] Misc updates

[Richard Purdie]

On Wed, 2011-07-13 at 12:05 -0700, Tom Rini wrote:
> Hey all,
> 
> This is the first of two pull requests.  As part of updating siteinfo.bbclass
> I did a world build (qemux86) before and after the changes and diff'd the
> config.log files.  That showed two classes of problems, both fixed in this
> series.  The first is a checksum mismatch and an invalid SRC_URI.  The second
> is some implicit DEPENDS in recipes.
> 
> The following changes since commit e66c2999afa2b3efbce8bb46c89f9db5e15f35c7:
>   Saul Wold (1):
>         libx11: ensure nativesdk uses correct DEPENDS and XCB flags
> 
> are available in the git repository at:
> 
>   git://git.openembedded.org/openembedded-core-contrib trini/misc
>   http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=trini/misc
> 
> Tom Rini (4):
>   libsamplerate0: Update checksums
>   hicolor-icon-theme: Use ${BPN}-${PV} not ${P} to unbreak nativesdk
>   groff: Disable x11 support
>   libpcre: Add bzip2, zlib and readline to DEPENDS

I merged the last three and ignored the first as discussed.

Cheers,

Richard