summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2024-09-10 09:38:21 -0400
committerSteve Sakoman <steve@sakoman.com>2024-09-16 06:09:56 -0700
commit9a73329b7dbb5809f0567b0b00e6f078d255bfff (patch)
tree250268c66d4cdd740304a55825d88c323824fd8f /meta
parentd9ce19f496d45c80c55f0bd64f27d0359b107271 (diff)
downloadpoky-9a73329b7dbb5809f0567b0b00e6f078d255bfff.tar.gz
linux-yocto/5.10: fix NFSV3 config warning
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: 16ba1e8f27a685ad639a314d1b2b1b505fb6f4f4) 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.10.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.10.bb22
3 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
index 96208b6731..268b5d1ec1 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -11,8 +11,8 @@ python () {
11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
12} 12}
13 13
14SRCREV_machine ?= "131cb7adf814a294e91b1f130596274dcf946acc" 14SRCREV_machine ?= "3a31ff0840cedf5e78ef3490e604a9f66f9b1f1f"
15SRCREV_meta ?= "a0827028a62288d735501a325eb8dfb9c9f0d701" 15SRCREV_meta ?= "a26c1def6dceccb96ab9a707072d22e75888eda9"
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.10;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
index 5a86306584..d35ac04135 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
15KMETA = "kernel-meta" 15KMETA = "kernel-meta"
16KCONF_BSP_AUDIT_LEVEL = "2" 16KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine:qemuarm ?= "b1e71e9f64f711f24a5b4d1c9b95268d85f55223" 18SRCREV_machine:qemuarm ?= "fe7f23b30d73333007fe54c96cdb579a31da43bf"
19SRCREV_machine ?= "1058d8075ff9a651366d135278effaaf707ee8ba" 19SRCREV_machine ?= "ca19be2d9d77072cfdde806553e729752b0d9241"
20SRCREV_meta ?= "a0827028a62288d735501a325eb8dfb9c9f0d701" 20SRCREV_meta ?= "a26c1def6dceccb96ab9a707072d22e75888eda9"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
23 23
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
index 0a643ebf8a..f20804e7fc 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
@@ -14,17 +14,17 @@ KBRANCH:qemux86 ?= "v5.10/standard/base"
14KBRANCH:qemux86-64 ?= "v5.10/standard/base" 14KBRANCH:qemux86-64 ?= "v5.10/standard/base"
15KBRANCH:qemumips64 ?= "v5.10/standard/mti-malta64" 15KBRANCH:qemumips64 ?= "v5.10/standard/mti-malta64"
16 16
17SRCREV_machine:qemuarm ?= "1b786a40d06acef91fe972e1e0ea0fba35c952f1" 17SRCREV_machine:qemuarm ?= "2524a39d1d5f16980df4f15ef9a7ac2e148795c0"
18SRCREV_machine:qemuarm64 ?= "1a521d8f1fd43a00256c93eedbb1dcb411c3936b" 18SRCREV_machine:qemuarm64 ?= "57e9463c04f9b211dcedd7b92e32cac9b198bccb"
19SRCREV_machine:qemumips ?= "730441c1cf02c3ee9176ffb23fe686ef4162e1ff" 19SRCREV_machine:qemumips ?= "e8d524ff4ca12d884df488db504b35b97f394b78"
20SRCREV_machine:qemuppc ?= "051b2b500b8f91b670d3d65ad0decf4e077c2727" 20SRCREV_machine:qemuppc ?= "0f0b7bfda26ff5ea9790d648fd82777486b181c7"
21SRCREV_machine:qemuriscv64 ?= "0e60e683b3a30c66c24a779c8f928d60b1fbb940" 21SRCREV_machine:qemuriscv64 ?= "03a85a51f33ae656439b764cd94e795a055e665e"
22SRCREV_machine:qemuriscv32 ?= "0e60e683b3a30c66c24a779c8f928d60b1fbb940" 22SRCREV_machine:qemuriscv32 ?= "03a85a51f33ae656439b764cd94e795a055e665e"
23SRCREV_machine:qemux86 ?= "0e60e683b3a30c66c24a779c8f928d60b1fbb940" 23SRCREV_machine:qemux86 ?= "03a85a51f33ae656439b764cd94e795a055e665e"
24SRCREV_machine:qemux86-64 ?= "0e60e683b3a30c66c24a779c8f928d60b1fbb940" 24SRCREV_machine:qemux86-64 ?= "03a85a51f33ae656439b764cd94e795a055e665e"
25SRCREV_machine:qemumips64 ?= "3b07617401af5767816a9d60cd2b40dcb9244a2b" 25SRCREV_machine:qemumips64 ?= "6e5d351f2d183cf91d030fc78b4b176338bcb141"
26SRCREV_machine ?= "0e60e683b3a30c66c24a779c8f928d60b1fbb940" 26SRCREV_machine ?= "03a85a51f33ae656439b764cd94e795a055e665e"
27SRCREV_meta ?= "a0827028a62288d735501a325eb8dfb9c9f0d701" 27SRCREV_meta ?= "a26c1def6dceccb96ab9a707072d22e75888eda9"
28 28
29SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ 29SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
30 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" 30 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"