Re: [PATCH] Avoid line duplicates when appended from the recipes

[Jan Kiszka <jan.kiszka@siemens.com>]

On 22.02.22 14:52, Uladzimir Bely wrote:
> From: WiseLord <wiselord1983@gmail.com>
> 
> Potentially, using "cat << EOF >> target_file" can kead to duplicated
> lines in the target files.
> 
> This adds simple checks for skipping lines append if they already exist.
> 
> Signed-off-by: WiseLord <wiselord1983@gmail.com>
                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

You likely want to use your real name again ;)

Jan

> ---
>  meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb | 3 ++-
>  meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb      | 3 ++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb b/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb
> index 9c0efaf1..8436dcbd 100644
> --- a/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb
> +++ b/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb
> @@ -21,7 +21,8 @@ OPTEE_BINARIES = "tee-header_v2.stm32 tee-pageable_v2.stm32 tee-pager_v2.stm32"
>  # Set version manually to PV, the tarball does not contain any hint.
>  # Alternative: pull from git and add git as build dependency.
>  dpkg_runbuild_prepend() {
> -    cat << EOF >> ${S}/debian/rules
> +    grep -q "^export TEE_IMPL_VERSION" ${S}/debian/rules ||
> +        cat << EOF >> ${S}/debian/rules
>  
>  export TEE_IMPL_VERSION=${PV}
>  EOF
> diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb b/meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb
> index 28e51c0d..644535e8 100644
> --- a/meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb
> +++ b/meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb
> @@ -25,7 +25,8 @@ LINUX_VERSION_EXTENSION = "-isar"
>  
>  # For testing purposes only
>  dpkg_configure_kernel_append() {
> -cat << EOF | sed -i '/^override_dh_auto_build/ r /dev/stdin' ${S}/debian/rules
> +    grep -q "# CONFIG_MTD is not set" ${S}/debian/rules ||
> +        cat << EOF | sed -i '/^override_dh_auto_build/ r /dev/stdin' ${S}/debian/rules
>  	if ! grep "# CONFIG_MTD is not set" \$(O)/.config && \\
>  	   ! grep "# CONFIG_MTD_UBI is not set" \$(O)/.config; then \\
>  	    grep "# CONFIG_UBIFS_FS is not set" \$(O)/.config || \\

-- 
Siemens AG, Technology
Competence Center Embedded Linux