diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-06-07 09:59:31 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-06-18 16:34:40 +0100 |
| commit | b23a467255ad1b5e73c5afb9163634229f66e5a6 (patch) | |
| tree | bf694778b612baa77a1cb8a4fd078313615e386a | |
| parent | 001a2245cf8518abf059c51ae68ac7ee26dd98d4 (diff) | |
| download | poky-b23a467255ad1b5e73c5afb9163634229f66e5a6.tar.gz | |
linux-yocto/5.15: bpf: explicitly disable unpriv eBPF by default
Integrating the following commit(s) to linux-yocto/.:
5371fc3b2a2 bpf: explicitly disable unpriv eBPF by default
(From OE-Core rev: 8f04684552b541d5a099ce8894e8bc67b898b68b)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3da9b7882a397b204f63fac5fef04d79ba0a01f2)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.15.bb | 22 |
3 files changed, 15 insertions, 15 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 6bfb8deb1e..5f58eece6f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.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 | ||
| 14 | SRCREV_machine ?= "b028c4baada43d48014d4350dd66debe7e4cf362" | 14 | SRCREV_machine ?= "3cc07a80d507ab4fd25ad3adafe07d83bdcef401" |
| 15 | SRCREV_meta ?= "37891dc371e83a3451781dd81a8a85cccd60084b" | 15 | SRCREV_meta ?= "eddfd0e846eee9307c95c40d706725afbedab285" |
| 16 | 16 | ||
| 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_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 0cf2d68d56..144c20e271 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | |||
| @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" | |||
| 14 | KMETA = "kernel-meta" | 14 | KMETA = "kernel-meta" |
| 15 | KCONF_BSP_AUDIT_LEVEL = "2" | 15 | KCONF_BSP_AUDIT_LEVEL = "2" |
| 16 | 16 | ||
| 17 | SRCREV_machine ?= "7b1fe61102fd6efc26373305417cd683687eb7a0" | 17 | SRCREV_machine ?= "8037a6211ac7e61fae9eb3a33a54d72b373edee8" |
| 18 | SRCREV_meta ?= "37891dc371e83a3451781dd81a8a85cccd60084b" | 18 | SRCREV_meta ?= "eddfd0e846eee9307c95c40d706725afbedab285" |
| 19 | 19 | ||
| 20 | PV = "${LINUX_VERSION}+git${SRCPV}" | 20 | PV = "${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 206cc0692d..1666b8cc13 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb | |||
| @@ -13,17 +13,17 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" | |||
| 13 | KBRANCH:qemux86-64 ?= "v5.15/standard/base" | 13 | KBRANCH:qemux86-64 ?= "v5.15/standard/base" |
| 14 | KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" | 14 | KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" |
| 15 | 15 | ||
| 16 | SRCREV_machine:qemuarm ?= "5a68f2d15d17f0f3c397e7f8c83f3f664f7037e5" | 16 | SRCREV_machine:qemuarm ?= "149e76317b407ceac4da56d9df79e6e58e2a4dd6" |
| 17 | SRCREV_machine:qemuarm64 ?= "00e666e6154fcdf52268f2a5a612b96afad073b0" | 17 | SRCREV_machine:qemuarm64 ?= "1bf709cb1641eb13a64d0bd4145e61e56805af6b" |
| 18 | SRCREV_machine:qemumips ?= "fb9e75076deade31754b7ad644952d63137e616b" | 18 | SRCREV_machine:qemumips ?= "8cc914d3021787d6c48fd1b25f15feb32c5be2cd" |
| 19 | SRCREV_machine:qemuppc ?= "49f6567f3b85a843e8b6042a79c58aab0bdbd0c9" | 19 | SRCREV_machine:qemuppc ?= "59e013f100ad1887cf28cd51912df011ae95ae92" |
| 20 | SRCREV_machine:qemuriscv64 ?= "cc9695f5fd3b520464eb2ded66950734f308525c" | 20 | SRCREV_machine:qemuriscv64 ?= "77aa9e489eafdd700df399b2e47a0ff313a91870" |
| 21 | SRCREV_machine:qemuriscv32 ?= "cc9695f5fd3b520464eb2ded66950734f308525c" | 21 | SRCREV_machine:qemuriscv32 ?= "77aa9e489eafdd700df399b2e47a0ff313a91870" |
| 22 | SRCREV_machine:qemux86 ?= "cc9695f5fd3b520464eb2ded66950734f308525c" | 22 | SRCREV_machine:qemux86 ?= "77aa9e489eafdd700df399b2e47a0ff313a91870" |
| 23 | SRCREV_machine:qemux86-64 ?= "cc9695f5fd3b520464eb2ded66950734f308525c" | 23 | SRCREV_machine:qemux86-64 ?= "77aa9e489eafdd700df399b2e47a0ff313a91870" |
| 24 | SRCREV_machine:qemumips64 ?= "1ad01ab47ec056d4126798f6d57a33b65b2be49c" | 24 | SRCREV_machine:qemumips64 ?= "a0ae7ea1f60a75210784c684fb577b26a172f7db" |
| 25 | SRCREV_machine ?= "cc9695f5fd3b520464eb2ded66950734f308525c" | 25 | SRCREV_machine ?= "77aa9e489eafdd700df399b2e47a0ff313a91870" |
| 26 | SRCREV_meta ?= "37891dc371e83a3451781dd81a8a85cccd60084b" | 26 | SRCREV_meta ?= "eddfd0e846eee9307c95c40d706725afbedab285" |
| 27 | 27 | ||
| 28 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll | 28 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll |
| 29 | # get the <version>/base branch, which is pure upstream -stable, and the same | 29 | # get the <version>/base branch, which is pure upstream -stable, and the same |
