[meta-integrity][PATCH 1/3] layer.conf: add dependency on meta-security

[meta-integrity][PATCH 1/3] layer.conf: add dependency on meta-security

[Dmitry Eremin-Solenikov]

ima-evm-utils recipe depends on keyutils recipe which is a part of
meta-security layer.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin-solenikov@mentor.com>
---
 meta-integrity/conf/layer.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-integrity/conf/layer.conf b/meta-integrity/conf/layer.conf
index 2f696cf7c332..917aa86e11d7 100644
--- a/meta-integrity/conf/layer.conf
+++ b/meta-integrity/conf/layer.conf
@@ -22,3 +22,5 @@ IMA_EVM_BASE := '${LAYERDIR}'
 OE_TERMINAL_EXPORTS += "IMA_EVM_BASE"
 
 LAYERSERIES_COMPAT_integrity = "warrior"
+# ima-evm-utils depends on keyutils from meta-security
+LAYERDEPENDS_integrity = "core security"
-- 
2.20.1

[meta-integrity][PATCH 2/3] ima-evm-utils: bump version

[Dmitry Eremin-Solenikov]

Currently selected SRCREV (782224f33cd711050cbf6146a12122cd73f9136b)
comes after 1.1 ima-evm-utils release, so bump PV accordingly.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin-solenikov@mentor.com>
---
 .../recipes-security/ima-evm-utils/ima-evm-utils_git.bb         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-integrity/recipes-security/ima-evm-utils/ima-evm-utils_git.bb b/meta-integrity/recipes-security/ima-evm-utils/ima-evm-utils_git.bb
index 623de09c3ad7..6d4f008df334 100644
--- a/meta-integrity/recipes-security/ima-evm-utils/ima-evm-utils_git.bb
+++ b/meta-integrity/recipes-security/ima-evm-utils/ima-evm-utils_git.bb
@@ -6,7 +6,7 @@ DEPENDS += "openssl attr keyutils"
 
 DEPENDS_class-native += "openssl-native keyutils-native"
 
-PV = "1.0+git${SRCPV}"
+PV = "1.1+git${SRCPV}"
 SRCREV = "782224f33cd711050cbf6146a12122cd73f9136b"
 SRC_URI = "git://git.code.sf.net/p/linux-ima/ima-evm-utils"
 
-- 
2.20.1

[meta-integrity][PATCH 3/3] ima-evm-utils: refresh xattr patch

[Dmitry Eremin-Solenikov]

Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin-solenikov@mentor.com>
---
 .../evmctl.c-do-not-depend-on-xattr.h-with-IMA-defines.patch  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-integrity/recipes-security/ima-evm-utils/ima-evm-utils/evmctl.c-do-not-depend-on-xattr.h-with-IMA-defines.patch b/meta-integrity/recipes-security/ima-evm-utils/ima-evm-utils/evmctl.c-do-not-depend-on-xattr.h-with-IMA-defines.patch
index c0bdd9b496de..ffa65dfb00a1 100644
--- a/meta-integrity/recipes-security/ima-evm-utils/ima-evm-utils/evmctl.c-do-not-depend-on-xattr.h-with-IMA-defines.patch
+++ b/meta-integrity/recipes-security/ima-evm-utils/ima-evm-utils/evmctl.c-do-not-depend-on-xattr.h-with-IMA-defines.patch
@@ -23,9 +23,9 @@ diff --git a/src/evmctl.c b/src/evmctl.c
 index c54efbb..23cf54c 100644
 --- a/src/evmctl.c
 +++ b/src/evmctl.c
-@@ -56,6 +56,18 @@
- #include <ctype.h>
+@@ -57,6 +57,18 @@
  #include <termios.h>
+ #include <assert.h>
  
 +/*
 + * linux/xattr.h might be old to have this. Allow compilation on older
-- 
2.20.1

Re: [meta-integrity][PATCH 1/3] layer.conf: add dependency on meta-security

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1162 bytes --]

On Wed, Jul 24, 2019 at 02:23:24PM +0300, Dmitry Eremin-Solenikov wrote:
> ima-evm-utils recipe depends on keyutils recipe which is a part of
> meta-security layer.
> 
> Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin-solenikov@mentor.com>
> ---
>  meta-integrity/conf/layer.conf | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/meta-integrity/conf/layer.conf b/meta-integrity/conf/layer.conf
> index 2f696cf7c332..917aa86e11d7 100644
> --- a/meta-integrity/conf/layer.conf
> +++ b/meta-integrity/conf/layer.conf
> @@ -22,3 +22,5 @@ IMA_EVM_BASE := '${LAYERDIR}'
>  OE_TERMINAL_EXPORTS += "IMA_EVM_BASE"
>  
>  LAYERSERIES_COMPAT_integrity = "warrior"
> +# ima-evm-utils depends on keyutils from meta-security
> +LAYERDEPENDS_integrity = "core security"

keyutils are now in meta-oe:
http://git.openembedded.org/meta-openembedded/commit/?id=415e213ad75ec9a93171c963395a1c4b92c6233b

> -- 
> 2.20.1
> 
> -- 
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]

Re: [meta-integrity][PATCH 1/3] layer.conf: add dependency on meta-security

[Dmitry Eremin-Solenikov]

пн, 29 июл. 2019 г. в 12:49, Martin Jansa <martin.jansa@gmail.com>:
>
> On Wed, Jul 24, 2019 at 02:23:24PM +0300, Dmitry Eremin-Solenikov wrote:
> > ima-evm-utils recipe depends on keyutils recipe which is a part of
> > meta-security layer.
> >
> > Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin-solenikov@mentor.com>
> > ---
> >  meta-integrity/conf/layer.conf | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/meta-integrity/conf/layer.conf b/meta-integrity/conf/layer.conf
> > index 2f696cf7c332..917aa86e11d7 100644
> > --- a/meta-integrity/conf/layer.conf
> > +++ b/meta-integrity/conf/layer.conf
> > @@ -22,3 +22,5 @@ IMA_EVM_BASE := '${LAYERDIR}'
> >  OE_TERMINAL_EXPORTS += "IMA_EVM_BASE"
> >
> >  LAYERSERIES_COMPAT_integrity = "warrior"
> > +# ima-evm-utils depends on keyutils from meta-security
> > +LAYERDEPENDS_integrity = "core security"
>
> keyutils are now in meta-oe:
> http://git.openembedded.org/meta-openembedded/commit/?id=415e213ad75ec9a93171c963395a1c4b92c6233b

Thank you!

-- 
With best wishes
Dmitry