[OE-core] [CONSOLIDATED PULL 00/16] CVE Patches and updates

[Sebastian Wiegand]

  Hi,

On Thursday, 22.05.2014 08:57 +0200, Jacob Kroon wrote:
> Hi,
>
> On Wed, May 21, 2014 at 8:01 PM, Saul Wold <sgw at linux.intel.com 
> <mailto:sgw at linux.intel.com>> wrote:
>
>     Richard,
>
>     Another set of CVE fixes and some Updates.
>
>     Thanks
>             Sau!
>
>     The following changes since commit
>     7decf9dce56868e39902dac5957eb72f6e1e9acd:
>
>       cups: fix for cups not building without avahi (2014-05-21
>     09:08:11 +0100)
>
>     are available in the git repository at:
>
>       git://git.openembedded.org/openembedded-core-contrib
>     <http://git.openembedded.org/openembedded-core-contrib> sgw/stage
>     http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
>
>     Chong Lu (3):
>       flex: Update to 2.5.39 version
>       byacc: Update to 20140422 version
>       guile: Update to 2.0.11 version
>
>     Sebastian Wiegand (1):
>       distro_features_check.bbclass: fix wrong indentation
>
>
> Doesn't this commit, 986db87a3931edce8be79f309d07497e4179a810, only 
> check that the first required distro feature found is available,  and 
> skips checking the remaining ?
>
> Shouldnt we do something like this
>
> diff --git a/meta/classes/distro_features_check.bbclass 
> b/meta/classes/distro_features_check.bbclass
> index 61b11b7..b728bdc 100644
> --- a/meta/classes/distro_features_check.bbclass
> +++ b/meta/classes/distro_features_check.bbclass
> @@ -14,9 +14,9 @@ python () {
>          distro_features = (d.getVar('DISTRO_FEATURES', True) or 
> "").split()
>          for f in required_distro_features:
>              if f in distro_features:
> -                break
> -        else:
> -            raise bb.parse.SkipPackage("missing required distro 
> feature %s (not in DISTRO_FEATURES)" % required_distro_features)
> +                continue
> +            else:
> +                raise bb.parse.SkipPackage("missing required distro 
> feature %s (not in DISTRO_FEATURES)" % required_distro_features)
>
>      conflict_distro_features = d.getVar('CONFLICT_DISTRO_FEATURES', True)
>      if conflict_distro_features:
>
> /Jacob

Reworked and fixed the error message, too.

Search whole list of REQUIRED_DISTRO_FEATURES.
Print only the missing/conflicting feature on error.
---
  meta/classes/distro_features_check.bbclass |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/classes/distro_features_check.bbclass 
b/meta/classes/distro_features_check.bbclass
index 8a0ecb7..1f1d6fb 100644
--- a/meta/classes/distro_features_check.bbclass
+++ b/meta/classes/distro_features_check.bbclass
@@ -14,9 +14,9 @@ python () {
          distro_features = (d.getVar('DISTRO_FEATURES', True) or 
"").split()
          for f in required_distro_features:
              if f in distro_features:
-                break
+                continue
              else:
-                raise bb.parse.SkipPackage("missing required distro 
feature %s (not in DISTRO_FEATURES)" % required_distro_features)
+                raise bb.parse.SkipPackage("missing required distro 
feature '%s' (not in DISTRO_FEATURES)" % f)

      conflict_distro_features = d.getVar('CONFLICT_DISTRO_FEATURES', True)
      if conflict_distro_features:
@@ -24,5 +24,5 @@ python () {
          distro_features = (d.getVar('DISTRO_FEATURES', True) or 
"").split()
          for f in conflict_distro_features:
              if f in distro_features:
-                raise bb.parse.SkipPackage("conflicting distro feature 
%s (in DISTRO_FEATURES)" % conflict_distro_features)
+                raise bb.parse.SkipPackage("conflicting distro feature 
'%s' (in DISTRO_FEATURES)" % f)
  }
-- 

Cheers,
Sebastian