From d5dc5907721eae667d103024dadcef608b63258c Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 8 Aug 2022 23:38:01 -0400 Subject: linux-yocto/5.15: fix reproducibility issues Integrating the following commit(s) to linux-yocto/5.15: efe20512212b init/Kconfig: fix CC_HAS_ASM_GOTO_TIED_OUTPUT test with dash Fixes: 1aa0e8b144b6 ("Kconfig: Add option for asm goto w/ tied outputs to workaround clang-13 bug") (From OE-Core rev: 4991b638eaf243a531731ecfee0681c3ada93583) Signed-off-by: Alexandre Belloni Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- 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(-) 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 a385042c95..32c7db2c74 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 ?= "1bb4f634d786d708e2f078fca1ccc46c9c42f5f0" -SRCREV_meta ?= "514a287a5b3adaeb58774fb86616fdfa2e751cf5" +SRCREV_machine ?= "13ee019f28013cf8c102a3ffaadfa5e9ae9743e1" +SRCREV_meta ?= "f7f709bf874f85baff9f2fb0ac0341c08399b144" 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 b6473d740a..8eb138e78b 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 ?= "0aa6b57221bb524abcb34e8772ebff0f34a4a322" -SRCREV_meta ?= "514a287a5b3adaeb58774fb86616fdfa2e751cf5" +SRCREV_machine ?= "86c19d4c40f475e09a076d55391fa66d96a1b3ac" +SRCREV_meta ?= "f7f709bf874f85baff9f2fb0ac0341c08399b144" 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 bd4203c41a..083f87727b 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 ?= "1dbb5e5eb62a52d71324867d1256fc0b2374d8c6" -SRCREV_machine:qemuarm64 ?= "92f780cdfe537cc6fc339a55aa2d5ce649be51fa" -SRCREV_machine:qemumips ?= "6eff04e888e27e79251ba7c1777b6483995d654d" -SRCREV_machine:qemuppc ?= "03453f65f2427ec9b0f2a542089fd1df844d2f0e" -SRCREV_machine:qemuriscv64 ?= "085e50e42da129c6f978ea6db83ff54a1e214cd0" -SRCREV_machine:qemuriscv32 ?= "085e50e42da129c6f978ea6db83ff54a1e214cd0" -SRCREV_machine:qemux86 ?= "085e50e42da129c6f978ea6db83ff54a1e214cd0" -SRCREV_machine:qemux86-64 ?= "085e50e42da129c6f978ea6db83ff54a1e214cd0" -SRCREV_machine:qemumips64 ?= "667b54b6cd20a8c5ffcc36603922b6d13fa3f2f0" -SRCREV_machine ?= "085e50e42da129c6f978ea6db83ff54a1e214cd0" -SRCREV_meta ?= "514a287a5b3adaeb58774fb86616fdfa2e751cf5" +SRCREV_machine:qemuarm ?= "c33f2e2ad3fdcc1c9539f80fb51b49f68c544c03" +SRCREV_machine:qemuarm64 ?= "e8a14fadeb24619f20d3caebc01c7f26c49f768a" +SRCREV_machine:qemumips ?= "c5f07eee39e4e03e90de3e71a3f6448fdb73921a" +SRCREV_machine:qemuppc ?= "b5873d3a40b837059a36179174863cb4c7f9e109" +SRCREV_machine:qemuriscv64 ?= "efe20512212b0e85b5f884b1bfc8fbba2b43541a" +SRCREV_machine:qemuriscv32 ?= "efe20512212b0e85b5f884b1bfc8fbba2b43541a" +SRCREV_machine:qemux86 ?= "efe20512212b0e85b5f884b1bfc8fbba2b43541a" +SRCREV_machine:qemux86-64 ?= "efe20512212b0e85b5f884b1bfc8fbba2b43541a" +SRCREV_machine:qemumips64 ?= "a6c0767511eed80395777e42d33fdc8405bff2b4" +SRCREV_machine ?= "efe20512212b0e85b5f884b1bfc8fbba2b43541a" +SRCREV_meta ?= "f7f709bf874f85baff9f2fb0ac0341c08399b144" # 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 v1.2.3-54-g00ecf