summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2024-05-03 14:14:11 -0400
committerSteve Sakoman <steve@sakoman.com>2024-05-15 09:44:16 -0700
commit59d099b69040aa7ed1b94649128a0c629107db65 (patch)
treefa954dce6c8e91d59b11d55ad1d0214ab53f6ac7 /meta
parente44b0a798ef2714da20ab24684e3412491799d44 (diff)
downloadpoky-59d099b69040aa7ed1b94649128a0c629107db65.tar.gz
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 <chuck.lever@oracle.com> 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 <chuck.lever@oracle.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ] (From OE-Core rev: dcbca1aedd9b41e78e00d6b763b2e99886be0780) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.15.bb2
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 () {
12} 12}
13 13
14SRCREV_machine ?= "f8d4297d452f7c832d90bfb992d90db2e30ffc23" 14SRCREV_machine ?= "f8d4297d452f7c832d90bfb992d90db2e30ffc23"
15SRCREV_meta ?= "21fd5becb1ed083a28e57af46709578f83dd2910" 15SRCREV_meta ?= "7cdb56640a7854c921c292100445334745d5d534"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" 18 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"
15KCONF_BSP_AUDIT_LEVEL = "2" 15KCONF_BSP_AUDIT_LEVEL = "2"
16 16
17SRCREV_machine ?= "7a8fce8cbd9a8a7d68a0c2537141c85d63f6eda3" 17SRCREV_machine ?= "7a8fce8cbd9a8a7d68a0c2537141c85d63f6eda3"
18SRCREV_meta ?= "21fd5becb1ed083a28e57af46709578f83dd2910" 18SRCREV_meta ?= "7cdb56640a7854c921c292100445334745d5d534"
19 19
20PV = "${LINUX_VERSION}+git${SRCPV}" 20PV = "${LINUX_VERSION}+git${SRCPV}"
21 21
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"
24SRCREV_machine:qemux86-64 ?= "f0d16a142e32a7934da39a12bd983a00e629bb48" 24SRCREV_machine:qemux86-64 ?= "f0d16a142e32a7934da39a12bd983a00e629bb48"
25SRCREV_machine:qemumips64 ?= "d34e0789d8d5e0d7ab521889e80967edcac38dc6" 25SRCREV_machine:qemumips64 ?= "d34e0789d8d5e0d7ab521889e80967edcac38dc6"
26SRCREV_machine ?= "f0d16a142e32a7934da39a12bd983a00e629bb48" 26SRCREV_machine ?= "f0d16a142e32a7934da39a12bd983a00e629bb48"
27SRCREV_meta ?= "21fd5becb1ed083a28e57af46709578f83dd2910" 27SRCREV_meta ?= "7cdb56640a7854c921c292100445334745d5d534"
28 28
29# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll 29# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
30# get the <version>/base branch, which is pure upstream -stable, and the same 30# get the <version>/base branch, which is pure upstream -stable, and the same