From 8f04684552b541d5a099ce8894e8bc67b898b68b Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 7 Jun 2022 09:59:31 -0400 Subject: 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 Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 3da9b7882a397b204f63fac5fef04d79ba0a01f2) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 22 +++++++++++----------- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'meta/recipes-kernel') 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 () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "b028c4baada43d48014d4350dd66debe7e4cf362" -SRCREV_meta ?= "37891dc371e83a3451781dd81a8a85cccd60084b" +SRCREV_machine ?= "3cc07a80d507ab4fd25ad3adafe07d83bdcef401" +SRCREV_meta ?= "eddfd0e846eee9307c95c40d706725afbedab285" 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 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" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "7b1fe61102fd6efc26373305417cd683687eb7a0" -SRCREV_meta ?= "37891dc371e83a3451781dd81a8a85cccd60084b" +SRCREV_machine ?= "8037a6211ac7e61fae9eb3a33a54d72b373edee8" +SRCREV_meta ?= "eddfd0e846eee9307c95c40d706725afbedab285" 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 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" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "5a68f2d15d17f0f3c397e7f8c83f3f664f7037e5" -SRCREV_machine:qemuarm64 ?= "00e666e6154fcdf52268f2a5a612b96afad073b0" -SRCREV_machine:qemumips ?= "fb9e75076deade31754b7ad644952d63137e616b" -SRCREV_machine:qemuppc ?= "49f6567f3b85a843e8b6042a79c58aab0bdbd0c9" -SRCREV_machine:qemuriscv64 ?= "cc9695f5fd3b520464eb2ded66950734f308525c" -SRCREV_machine:qemuriscv32 ?= "cc9695f5fd3b520464eb2ded66950734f308525c" -SRCREV_machine:qemux86 ?= "cc9695f5fd3b520464eb2ded66950734f308525c" -SRCREV_machine:qemux86-64 ?= "cc9695f5fd3b520464eb2ded66950734f308525c" -SRCREV_machine:qemumips64 ?= "1ad01ab47ec056d4126798f6d57a33b65b2be49c" -SRCREV_machine ?= "cc9695f5fd3b520464eb2ded66950734f308525c" -SRCREV_meta ?= "37891dc371e83a3451781dd81a8a85cccd60084b" +SRCREV_machine:qemuarm ?= "149e76317b407ceac4da56d9df79e6e58e2a4dd6" +SRCREV_machine:qemuarm64 ?= "1bf709cb1641eb13a64d0bd4145e61e56805af6b" +SRCREV_machine:qemumips ?= "8cc914d3021787d6c48fd1b25f15feb32c5be2cd" +SRCREV_machine:qemuppc ?= "59e013f100ad1887cf28cd51912df011ae95ae92" +SRCREV_machine:qemuriscv64 ?= "77aa9e489eafdd700df399b2e47a0ff313a91870" +SRCREV_machine:qemuriscv32 ?= "77aa9e489eafdd700df399b2e47a0ff313a91870" +SRCREV_machine:qemux86 ?= "77aa9e489eafdd700df399b2e47a0ff313a91870" +SRCREV_machine:qemux86-64 ?= "77aa9e489eafdd700df399b2e47a0ff313a91870" +SRCREV_machine:qemumips64 ?= "a0ae7ea1f60a75210784c684fb577b26a172f7db" +SRCREV_machine ?= "77aa9e489eafdd700df399b2e47a0ff313a91870" +SRCREV_meta ?= "eddfd0e846eee9307c95c40d706725afbedab285" # 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 -- cgit 1.2.3-korg