From b4cf3f305c9175f925ea099a6037dcf44e9da1e2 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 20 Sep 2016 11:16:36 -0400 Subject: [PATCH] linux-yocto/4.1: 4.1.32 content and configuration warning fixes The LINUX_VERSION was previously updated to 4.1.32, but the SRCREVs for the actual content were missed. This gets our actual version and the PV back in sync. We also update the meta data to fix configuration audit warnings from the beaglebone builds. (From OE-Core rev: 255adfaddec0dc44db619bf8726cd7804c09400d) Signed-off-by: Bruce Ashfield squash with 4.1 Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- .../recipes-kernel/linux/linux-yocto-rt_4.1.bb | 4 ++-- .../linux/linux-yocto-tiny_4.1.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_4.1.bb | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb index 4308a07a97..1f38a54bf5 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "ee83bffe0f76032fe0a0b7fde436f0f596101df2" -SRCREV_meta ?= "b30b6b9ef215433b28e8966c73ebb6b98a7f4d1f" +SRCREV_machine ?= "91821a6c3a54fabf964037dd478944a8f3597f88" +SRCREV_meta ?= "19cafe114e7d35e6202afa1079b32ce600646660" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb index 2294a3db87..5058954a81 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb @@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.1.32" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "93b1a6cee7d4a4437a1c0edf3e54ffe78edb4462" -SRCREV_meta ?= "b30b6b9ef215433b28e8966c73ebb6b98a7f4d1f" +SRCREV_machine ?= "a6b3a8cc120640bf5e528c8558ce060675757fc1" +SRCREV_meta ?= "19cafe114e7d35e6202afa1079b32ce600646660" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb index f4006b74d0..249209d649 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb @@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "standard/base" KBRANCH_qemux86-64 ?= "standard/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "4db58705727e27bea8ccf805bd5c7d04d2d029ed" -SRCREV_machine_qemuarm64 ?= "93b1a6cee7d4a4437a1c0edf3e54ffe78edb4462" -SRCREV_machine_qemumips ?= "d6237b3b244b894d4b3479ecf37acef041416dfa" -SRCREV_machine_qemuppc ?= "8520e65497ae10e14c38c76920a3457dc64349bf" -SRCREV_machine_qemux86 ?= "93b1a6cee7d4a4437a1c0edf3e54ffe78edb4462" -SRCREV_machine_qemux86-64 ?= "93b1a6cee7d4a4437a1c0edf3e54ffe78edb4462" -SRCREV_machine_qemumips64 ?= "d0524e144cd15a3c0edf768f68400968a4477cbe" -SRCREV_machine ?= "93b1a6cee7d4a4437a1c0edf3e54ffe78edb4462" -SRCREV_meta ?= "b30b6b9ef215433b28e8966c73ebb6b98a7f4d1f" +SRCREV_machine_qemuarm ?= "a2fde8c9a8b709574b36931f728fb78617892d98" +SRCREV_machine_qemuarm64 ?= "a6b3a8cc120640bf5e528c8558ce060675757fc1" +SRCREV_machine_qemumips ?= "33efda07565f45c576671358e75b39dc6a069cbf" +SRCREV_machine_qemuppc ?= "96b9a39490bc348b36d0de13397a086e66a4b1cb" +SRCREV_machine_qemux86 ?= "a6b3a8cc120640bf5e528c8558ce060675757fc1" +SRCREV_machine_qemux86-64 ?= "a6b3a8cc120640bf5e528c8558ce060675757fc1" +SRCREV_machine_qemumips64 ?= "a46e08c52a6764b0e54f4dbbdfaa3050a379ac4a" +SRCREV_machine ?= "a6b3a8cc120640bf5e528c8558ce060675757fc1" +SRCREV_meta ?= "19cafe114e7d35e6202afa1079b32ce600646660" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"