[PATCH 0/2] Misc bugfixes

[PATCH 0/2] Misc bugfixes

[Paul Eggleton]

The following changes since commit cd94dd3d9bba32c3fd55959586128b236d1d4e34:

  security_flags: more relocation issues (2013-12-18 17:23:55 +0000)

are available in the git repository at:

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

Paul Eggleton (2):
  libav: add libpostproc to PROVIDES (for 0.8.x version only)
  classes/insane: restore printing LIC_FILES_CHKSUM checksum if not
    specified

 meta/classes/insane.bbclass                  | 27 ++++++++++++++-------------
 meta/recipes-multimedia/libav/libav_0.8.9.bb |  2 ++
 2 files changed, 16 insertions(+), 13 deletions(-)

-- 
1.8.1.2

[PATCH 1/2] libav: add libpostproc to PROVIDES (for 0.8.x version only)

[Paul Eggleton]

There is a separate libpostproc recipe in meta-oe for use with 9.x and
later versions of libav for those few that need libpostproc; however if
you just add meta-oe and try to build libpostproc without selecting the
libav 9.x version recipe, you'll be building the libpostproc recipe
together with libav 0.8.x, which provides its own libpostproc; this
leads to confusing errors at packaging time. In order to flag up that
these conflict more appropriately, add libpostproc to PROVIDES
explicitly so that you at least get a multiple providers error at the
start of the build.

Fixes [YOCTO #5335].

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-multimedia/libav/libav_0.8.9.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-multimedia/libav/libav_0.8.9.bb b/meta/recipes-multimedia/libav/libav_0.8.9.bb
index ce8b1ef..7c807e8 100644
--- a/meta/recipes-multimedia/libav/libav_0.8.9.bb
+++ b/meta/recipes-multimedia/libav/libav_0.8.9.bb
@@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \
                     file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
+PROVIDES += "libpostproc"
+
 EXTRA_OECONF += " \
     --enable-postproc \
 "
-- 
1.8.1.2

[PATCH 2/2] classes/insane: restore printing LIC_FILES_CHKSUM checksum if not specified

[Paul Eggleton]

OE-Core rev ec8590aa81e201e28e500935d31cd7266114471f (by me)
unintentionally disabled printing the actual checksum value if no
checksum was specified, i.e.:

LIC_FILES_CHKSUM = "file://COPYING;md5="

Printing the actual checksum in this case is really useful when writing
a new recipe, so put this back in.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/insane.bbclass | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index e77e993..55ed91f 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -604,9 +604,6 @@ def package_qa_check_license(workdir, d):
             raise bb.build.FuncFailed( pn + ": LIC_FILES_CHKSUM points to an invalid file: " + srclicfile)
 
         recipemd5 = parm.get('md5', '')
-        if not recipemd5:
-            bb.error(pn + ": md5 checksum is not specified for ", url)
-            return False
         beginline, endline = 0, 0
         if 'beginline' in parm:
             beginline = int(parm['beginline'])
@@ -638,18 +635,22 @@ def package_qa_check_license(workdir, d):
         if recipemd5 == md5chksum:
             bb.note (pn + ": md5 checksum matched for ", url)
         else:
-            bb.error (pn + ": md5 data is not matching for ", url)
-            bb.error (pn + ": The new md5 checksum is ", md5chksum)
-            if beginline:
-                if endline:
-                    srcfiledesc = "%s (lines %d through to %d)" % (srclicfile, beginline, endline)
+            if recipemd5:
+                bb.error(pn + ": md5 data is not matching for ", url)
+                bb.error(pn + ": The new md5 checksum is ", md5chksum)
+                if beginline:
+                    if endline:
+                        srcfiledesc = "%s (lines %d through to %d)" % (srclicfile, beginline, endline)
+                    else:
+                        srcfiledesc = "%s (beginning on line %d)" % (srclicfile, beginline)
+                elif endline:
+                    srcfiledesc = "%s (ending on line %d)" % (srclicfile, endline)
                 else:
-                    srcfiledesc = "%s (beginning on line %d)" % (srclicfile, beginline)
-            elif endline:
-                srcfiledesc = "%s (ending on line %d)" % (srclicfile, endline)
+                    srcfiledesc = srclicfile
+                bb.error(pn + ": Check if the license information has changed in %s to verify that the LICENSE value \"%s\" remains valid" % (srcfiledesc, lic))
             else:
-                srcfiledesc = srclicfile
-            bb.error(pn + ": Check if the license information has changed in %s to verify that the LICENSE value \"%s\" remains valid" % (srcfiledesc, lic))
+                bb.error(pn + ": md5 checksum is not specified for ", url)
+                bb.error(pn + ": The md5 checksum is ", md5chksum)
             sane = False
 
     return sane
-- 
1.8.1.2

[PATCH 0/2] Misc Bugfixes

[nitin.a.kamble]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

The following changes since commit 492a58cabdc053b2312712681dbcffa8270d4ea4:

  self-hosted-image: Update poky revision to point at the 1.2 release branch (2012-04-24 10:21:11 +0100)

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

Nitin A Kamble (2):
  libproxy: fix compilations with gcc 4.7
  quilt: fix perl path in target perl scripts

 meta/recipes-devtools/quilt/quilt_0.51.bb          |   16 ++++++++++-
 .../libproxy/libproxy_fix_for_gcc4.7.patch         |   30 ++++++++++++++++++++
 meta/recipes-support/libproxy/libproxy_0.4.7.bb    |    3 +-
 3 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch

-- 
1.7.7

Re: [PATCH 0/2] Misc Bugfixes

[Saul Wold]

On 04/25/2012 05:00 PM, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble<nitin.a.kamble@intel.com>
>
> The following changes since commit 492a58cabdc053b2312712681dbcffa8270d4ea4:
>
>    self-hosted-image: Update poky revision to point at the 1.2 release branch (2012-04-24 10:21:11 +0100)
>
> are available in the git repository at:
>    git://git.pokylinux.org/poky-contrib nitin/bugfixes
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/bugfixes
>
> Nitin A Kamble (2):
>    libproxy: fix compilations with gcc 4.7
>    quilt: fix perl path in target perl scripts
>
>   meta/recipes-devtools/quilt/quilt_0.51.bb          |   16 ++++++++++-
>   .../libproxy/libproxy_fix_for_gcc4.7.patch         |   30 ++++++++++++++++++++
>   meta/recipes-support/libproxy/libproxy_0.4.7.bb    |    3 +-
>   3 files changed, 47 insertions(+), 2 deletions(-)
>   create mode 100644 meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch
>

Merged into OE-Core

Thanks
	Sau!

[PATCH 0/2] Misc bugfixes

[nitin.a.kamble]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

The following changes since commit 190f6d791d51aaa4cfb9f1cf932bc205ff674fb5:

  runqemu-internal: Add console=tty for qemuppc and NFS (2012-04-06 01:12:47 +0100)

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

Nitin A Kamble (2):
  tclibc-eglibc.inc: make locale packages dependency conditional
  poky-tiny.conf: adjust eglibc options for poky-tiny

 meta-yocto/conf/distro/poky-tiny.conf      |    6 ++++++
 meta/conf/distro/include/tclibc-eglibc.inc |   23 ++++++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

-- 
1.7.7

Re: [PATCH 0/2] Misc bugfixes

[Saul Wold]

On 04/09/2012 03:27 PM, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble<nitin.a.kamble@intel.com>
>
> The following changes since commit 190f6d791d51aaa4cfb9f1cf932bc205ff674fb5:
>
>    runqemu-internal: Add console=tty for qemuppc and NFS (2012-04-06 01:12:47 +0100)
>
> are available in the git repository at:
>    git://git.pokylinux.org/poky-contrib nitin/bugfixes
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/bugfixes
>
> Nitin A Kamble (2):
>    tclibc-eglibc.inc: make locale packages dependency conditional
>    poky-tiny.conf: adjust eglibc options for poky-tiny
>
>   meta-yocto/conf/distro/poky-tiny.conf      |    6 ++++++
>   meta/conf/distro/include/tclibc-eglibc.inc |   23 ++++++++++++++++-------
>   2 files changed, 22 insertions(+), 7 deletions(-)
>

Nitin, in the future two emails and 2 seperate branches for fixes that 
are OE-Core vs Poky.

Merged these into Poky Master and OE-Core as appropriate

Thanks
	Sau!