Re: [RFC 14/15] linux-mainline: Move cfg fragment test to debian/rules

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

On 26.07.21 15:46, Anton Mikanovich wrote:
> Perform all config fragments checking in Debian way.
> 

As always: A commit message documents the "why", not so much the "what".

> Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
> ---
>  .../linux/linux-mainline_5.4.70.bb               | 16 +++++++++-------
>  1 file changed, 9 insertions(+), 7 deletions(-)
> 
> 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 980e137..28e51c0 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,11 +25,13 @@ LINUX_VERSION_EXTENSION = "-isar"
>  
>  # For testing purposes only
>  dpkg_configure_kernel_append() {
> -    if ! grep "# CONFIG_MTD is not set" ${S}/${KERNEL_BUILD_DIR}/.config && \
> -       ! grep "# CONFIG_MTD_UBI is not set" ${S}/${KERNEL_BUILD_DIR}/.config; then
> -        grep "# CONFIG_UBIFS_FS is not set" ${S}/${KERNEL_BUILD_DIR}/.config || \
> -            bbfatal "Self-check failed: CONFIG_UBIFS_FS still enabled"
> -    fi
> -    grep "CONFIG_ROOT_NFS=y" ${S}/${KERNEL_BUILD_DIR}/.config || \
> -        bbfatal "Self-check failed: CONFIG_ROOT_NFS not enabled"
> +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 || \\
> +	        (echo "Self-check failed: CONFIG_UBIFS_FS still enabled" && exit 1); \\
> +	fi
> +	grep "CONFIG_ROOT_NFS=y" \$(O)/.config || \\
> +	    (echo "Self-check failed: CONFIG_ROOT_NFS not enabled" && exit 1)
> +EOF
>  }
> 

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux