From 422c3fee2364ae8376d0c4f601749b616a76fb03 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sun, 8 Jan 2023 19:38:55 -0500 Subject: linux-yocto/5.15: libbpf: Fix build warning on ref_ctr_off Integrating the following commit(s) to linux-yocto/5.15: da5513f30187 libbpf: Fix build warning on ref_ctr_off Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit eb75d561256c794baf6c89c1975967343145da87) 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 | 24 +++++++++++----------- 3 files changed, 16 insertions(+), 16 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 63294f5bb6..3dac2fbcd2 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 ?= "dcd3b533c5f6bc4698d5b09aa83ce9a4695df3b0" -SRCREV_meta ?= "66de7a6f2687cdaf5169ce5b57dd35f508be1682" +SRCREV_machine ?= "6a972b54f014ca67588d73f32058c42af0bd856e" +SRCREV_meta ?= "72756ee16d7230f04fb6bbf0bb115e32a9d73d8d" 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 12e462228f..3dd2ecdf6f 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 ?= "c7e10f06a33a546bcdd0b2e2909459b7572b5443" -SRCREV_meta ?= "66de7a6f2687cdaf5169ce5b57dd35f508be1682" +SRCREV_machine ?= "6e85c80a960287ec238f53c91eeade3456044fa3" +SRCREV_meta ?= "72756ee16d7230f04fb6bbf0bb115e32a9d73d8d" 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 4e341713f6..dabbb82822 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,24 +13,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "e5f2cf3560139bbaad54796c323d60e66cc19374" -SRCREV_machine:qemuarm64 ?= "d8835a4d4e9d4ea835316cd1843d62e30c5fef33" -SRCREV_machine:qemumips ?= "0f802d6525c21abe586c833074fece3e665a9ed9" -SRCREV_machine:qemuppc ?= "84f529230ca9f2ec20517821f7422d62e43ab808" -SRCREV_machine:qemuriscv64 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" -SRCREV_machine:qemuriscv32 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" -SRCREV_machine:qemux86 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" -SRCREV_machine:qemux86-64 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" -SRCREV_machine:qemumips64 ?= "ea2140a5f0cf7b8351982f60d3b30a4657ab0919" -SRCREV_machine ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" -SRCREV_meta ?= "66de7a6f2687cdaf5169ce5b57dd35f508be1682" +SRCREV_machine:qemuarm ?= "24c30a8e9f8385f6d74785aa345f5731321b6c41" +SRCREV_machine:qemuarm64 ?= "c3caed57192735dc74adff939ea35af248a11177" +SRCREV_machine:qemumips ?= "3bed92886dc9177ce0076dada5056cbe83ec11f0" +SRCREV_machine:qemuppc ?= "45cbeb05d362ee51b7836a7faa07958670110c38" +SRCREV_machine:qemuriscv64 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" +SRCREV_machine:qemuriscv32 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" +SRCREV_machine:qemux86 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" +SRCREV_machine:qemux86-64 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" +SRCREV_machine:qemumips64 ?= "2642cdd862a63f5a8c2774f372f3d3424991b1b9" +SRCREV_machine ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" +SRCREV_meta ?= "72756ee16d7230f04fb6bbf0bb115e32a9d73d8d" # 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 # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "71e496bd338221709b180b60ba419fa542c2b320" +SRCREV_machine:class-devupstream ?= "d68f50bfb00f6288e812be895ea5c77932a4b9dd" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.15/base" -- cgit 1.2.3-korg