From 59d099b69040aa7ed1b94649128a0c629107db65 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 3 May 2024 14:14:11 -0400 Subject: [PATCH] linux-yocto/5.15: cfg: remove obselete CONFIG_NFSD_V3 option Integrating the following commit(s) to linux-yocto/.: 1/1 [ Author: Bruce Ashfield Email: bruce.ashfield@gmail.com Subject: nfsd: drop CONFIG_NFSD_V3 Date: Tue, 2 Aug 2022 10:52:25 -0400 commit 5f9a62ff7d2808c7b56c0ec90f3b7eae5872afe6 Author: Chuck Lever Date: Sun Feb 6 12:25:47 2022 -0500 NFSD: Remove CONFIG_NFSD_V3 Eventually support for NFSv2 in the Linux NFS server is to be deprecated and then removed. However, NFSv2 is the "always supported" version that is available as soon as CONFIG_NFSD is set. Before NFSv2 support can be removed, we need to choose a different "always supported" version. This patch removes CONFIG_NFSD_V3 so that NFSv3 is always supported, as NFSv2 is today. When NFSv2 support is removed, NFSv3 will become the only "always supported" NFS version. The defconfigs still need to be updated to remove CONFIG_NFSD_V3=y. Signed-off-by: Chuck Lever Signed-off-by: Bruce Ashfield ] (From OE-Core rev: dcbca1aedd9b41e78e00d6b763b2e99886be0780) Signed-off-by: Bruce Ashfield Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index 91bf0350d5..349aa9854d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "f8d4297d452f7c832d90bfb992d90db2e30ffc23" -SRCREV_meta ?= "21fd5becb1ed083a28e57af46709578f83dd2910" +SRCREV_meta ?= "7cdb56640a7854c921c292100445334745d5d534" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 722523ced9..054e17e871 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -15,7 +15,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "7a8fce8cbd9a8a7d68a0c2537141c85d63f6eda3" -SRCREV_meta ?= "21fd5becb1ed083a28e57af46709578f83dd2910" +SRCREV_meta ?= "7cdb56640a7854c921c292100445334745d5d534" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 6784703ce2..c066797436 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -24,7 +24,7 @@ SRCREV_machine:qemux86 ?= "f0d16a142e32a7934da39a12bd983a00e629bb48" SRCREV_machine:qemux86-64 ?= "f0d16a142e32a7934da39a12bd983a00e629bb48" SRCREV_machine:qemumips64 ?= "d34e0789d8d5e0d7ab521889e80967edcac38dc6" SRCREV_machine ?= "f0d16a142e32a7934da39a12bd983a00e629bb48" -SRCREV_meta ?= "21fd5becb1ed083a28e57af46709578f83dd2910" +SRCREV_meta ?= "7cdb56640a7854c921c292100445334745d5d534" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same