Re: [RFC cip-dev][isar-cip-core][PATCH 10/14] Integrate cis-hardening into cip-core-image

On 24.07.26 14:47, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <[email protected]>
> 
> Co-Authored-by: Clara Kowalsky <[email protected]>
> Co-Authored-by: Felix Moessbauer <[email protected]>
> Co-Authored-by: Christoph Steiger <[email protected]>
> Signed-off-by: Quirin Gylstorff <[email protected]>
> ---
>  recipes-core/images/cip-core-image.inc | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/recipes-core/images/cip-core-image.inc b/recipes-core/images/cip-core-image.inc
> index f6162cd..859aee6 100644
> --- a/recipes-core/images/cip-core-image.inc
> +++ b/recipes-core/images/cip-core-image.inc
> @@ -10,7 +10,11 @@
>  #
>  
>  inherit image
> +inherit_defer ${@'cis-hardening' if bb.utils.to_boolean(d.getVar('CIP_CIS_HARDENING')) else ''}
> +inherit_defer ${@'cis-kernel-hardening-validation' if bb.utils.to_boolean(d.getVar('CIP_CIS_HARDENING_VALIDATION')) else ''}
>  
>  IMAGE_INSTALL:append:factory-reset = "factory-reset-helper"
> +IMAGE_INSTALL:append = "${@' cip-cis-rules' if bb.utils.to_boolean(d.getVar('CIP_CIS_HARDENING')) else ''}"
> +IMAGE_INSTALL:append = "${@' cip-cis-validation' if bb.utils.to_boolean(d.getVar('CIP_CIS_HARDENING_VALIDATION')) else ''}"
>  
>  ISAR_RELEASE_CMD = "git -C ${LAYERDIR_cip-core} describe --tags --dirty --always --match 'v[0-9].[0-9]*'"

Hmm, patch 7 could also be moved here, instead of being folded into
patch 6 - if this commit should really be the final arming.

Jan

-- 
Siemens AG, Foundational Technologies
Linux Expert Center