Re: [PATCH RFC xenomai-images 4/5] recipes-kernel: Move nfs boot configs to own snippet

On 17.04.26 22:57, Tobias Schaffner wrote:
> Move the kernel config switches that are needed for nfs boot to its own
> snippet. This way they do not have to be maintained individually and are
> also enabled for riscv.
> 
> Signed-off-by: Tobias Schaffner <[email protected]>
> ---
>  recipes-kernel/linux/files/amd64_defconfig | 6 ------
>  recipes-kernel/linux/files/arm64_defconfig | 6 ------
>  recipes-kernel/linux/files/armhf_defconfig | 6 ------
>  recipes-kernel/linux/files/nfs.cfg         | 6 ++++++
>  recipes-kernel/linux/linux-xenomai.inc     | 1 +
>  5 files changed, 7 insertions(+), 18 deletions(-)
>  create mode 100644 recipes-kernel/linux/files/nfs.cfg
> 
> diff --git a/recipes-kernel/linux/files/amd64_defconfig b/recipes-kernel/linux/files/amd64_defconfig
> index 590a1d5..d46064e 100644
> --- a/recipes-kernel/linux/files/amd64_defconfig
> +++ b/recipes-kernel/linux/files/amd64_defconfig
> @@ -1040,8 +1040,6 @@ CONFIG_IP_ADVANCED_ROUTER=y
>  CONFIG_IP_MULTIPLE_TABLES=y
>  CONFIG_IP_ROUTE_MULTIPATH=y
>  CONFIG_IP_ROUTE_VERBOSE=y
> -CONFIG_IP_PNP=y
> -CONFIG_IP_PNP_DHCP=y
>  CONFIG_IP_PNP_BOOTP=y
>  CONFIG_IP_PNP_RARP=y
>  # CONFIG_NET_IPIP is not set
> @@ -3664,14 +3662,10 @@ CONFIG_PSTORE_ZLIB_COMPRESS=y
>  # CONFIG_SYSV_FS is not set
>  # CONFIG_UFS_FS is not set
>  CONFIG_NETWORK_FILESYSTEMS=y
> -CONFIG_NFS_FS=y
>  CONFIG_NFS_V2=y
> -CONFIG_NFS_V3=y
>  CONFIG_NFS_V3_ACL=y
> -CONFIG_NFS_V4=y
>  CONFIG_NFS_V4_1=y
>  CONFIG_NFS_V4_2=y
> -CONFIG_ROOT_NFS=y
>  CONFIG_NFS_ACL_SUPPORT=y
>  CONFIG_NFS_COMMON=y
>  # CONFIG_NFSD is not set
> diff --git a/recipes-kernel/linux/files/arm64_defconfig b/recipes-kernel/linux/files/arm64_defconfig
> index 1dc8b69..84802a3 100644
> --- a/recipes-kernel/linux/files/arm64_defconfig
> +++ b/recipes-kernel/linux/files/arm64_defconfig
> @@ -981,8 +981,6 @@ CONFIG_XFRM=y
>  CONFIG_INET=y
>  CONFIG_IP_MULTICAST=y
>  # CONFIG_IP_ADVANCED_ROUTER is not set
> -CONFIG_IP_PNP=y
> -CONFIG_IP_PNP_DHCP=y
>  CONFIG_IP_PNP_BOOTP=y
>  # CONFIG_IP_PNP_RARP is not set
>  # CONFIG_NET_IPIP is not set
> @@ -5768,11 +5766,8 @@ CONFIG_PSTORE_ZLIB_COMPRESS=y
>  # CONFIG_SYSV_FS is not set
>  # CONFIG_UFS_FS is not set
>  CONFIG_NETWORK_FILESYSTEMS=y
> -CONFIG_NFS_FS=y
>  CONFIG_NFS_V2=y
> -CONFIG_NFS_V3=y
>  # CONFIG_NFS_V3_ACL is not set
> -CONFIG_NFS_V4=y
>  # CONFIG_NFS_SWAP is not set
>  CONFIG_NFS_V4_1=y
>  CONFIG_NFS_V4_2=y
> @@ -5781,7 +5776,6 @@ CONFIG_PNFS_FLEXFILE_LAYOUT=m
>  CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
>  # CONFIG_NFS_V4_1_MIGRATION is not set
>  CONFIG_NFS_V4_SECURITY_LABEL=y
> -CONFIG_ROOT_NFS=y
>  # CONFIG_NFS_USE_LEGACY_DNS is not set
>  CONFIG_NFS_USE_KERNEL_DNS=y
>  # CONFIG_NFSD is not set
> diff --git a/recipes-kernel/linux/files/armhf_defconfig b/recipes-kernel/linux/files/armhf_defconfig
> index ff8908d..c8b46e1 100644
> --- a/recipes-kernel/linux/files/armhf_defconfig
> +++ b/recipes-kernel/linux/files/armhf_defconfig
> @@ -1250,8 +1250,6 @@ CONFIG_XFRM_IPCOMP=m
>  CONFIG_INET=y
>  # CONFIG_IP_MULTICAST is not set
>  # CONFIG_IP_ADVANCED_ROUTER is not set
> -CONFIG_IP_PNP=y
> -CONFIG_IP_PNP_DHCP=y
>  CONFIG_IP_PNP_BOOTP=y
>  CONFIG_IP_PNP_RARP=y
>  # CONFIG_NET_IPIP is not set
> @@ -6723,14 +6721,10 @@ CONFIG_PSTORE_RAM=y
>  # CONFIG_SYSV_FS is not set
>  # CONFIG_UFS_FS is not set
>  CONFIG_NETWORK_FILESYSTEMS=y
> -CONFIG_NFS_FS=y
>  CONFIG_NFS_V2=y
> -CONFIG_NFS_V3=y
>  CONFIG_NFS_V3_ACL=y
> -CONFIG_NFS_V4=y
>  # CONFIG_NFS_SWAP is not set
>  # CONFIG_NFS_V4_1 is not set
> -CONFIG_ROOT_NFS=y
>  # CONFIG_NFS_USE_LEGACY_DNS is not set
>  CONFIG_NFS_USE_KERNEL_DNS=y
>  # CONFIG_NFSD is not set
> diff --git a/recipes-kernel/linux/files/nfs.cfg b/recipes-kernel/linux/files/nfs.cfg
> new file mode 100644
> index 0000000..23d9357
> --- /dev/null
> +++ b/recipes-kernel/linux/files/nfs.cfg
> @@ -0,0 +1,6 @@
> +CONFIG_NFS_FS=y
> +CONFIG_NFS_V3=y
> +CONFIG_NFS_V4=y
> +CONFIG_ROOT_NFS=y
> +CONFIG_IP_PNP=y
> +CONFIG_IP_PNP_DHCP=y
> diff --git a/recipes-kernel/linux/linux-xenomai.inc b/recipes-kernel/linux/linux-xenomai.inc
> index db0abb6..a07811d 100644
> --- a/recipes-kernel/linux/linux-xenomai.inc
> +++ b/recipes-kernel/linux/linux-xenomai.inc
> @@ -22,5 +22,6 @@ XENOMAI_DEBUG ?= "0"
>  
>  SRC_URI += "${@'file://${KERNEL_DEFCONFIG}' if d.getVar('KERNEL_DEFCONFIG') == d.getVar('XENOMAI_DEFCONFIG') else ''}"
>  SRC_URI += "${@'file://common_nodbg.cfg' if d.getVar('XENOMAI_DEBUG') == '0' else ''}"
> +SRC_URI += "file://nfs.cfg"
>  
>  S = "${WORKDIR}/git"

I assume you checked all configs for being identical before & after, right?

Jan

-- 
Siemens AG, Foundational Technologies
Linux Expert Center