From 49de8caab018b76f12998d4ff1e2f6cd954a0b4e Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 3 Oct 2016 01:54:31 -0400 Subject: linux-yocto/4.1: update to 4.1.33 (From OE-Core rev: af4e9d92ae23f0e668da4732ef79cd1f1bb6fc1f) (From OE-Core rev: 81b67e1de7ba8f91f9a73ee274796ee685cf2e90) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie Hand applied to manage merge conflicts. Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto_4.1.bb | 20 ++++++++++---------- 3 files changed, 16 insertions(+), 16 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 ce54fc58bb..77f1f1bcfe 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "e22280e8c2905d96c7cc5917df202b6ed904d042" -SRCREV_meta ?= "d6e1f4bfc254c677a8dfef92f0ad8c78bdeeea75" +SRCREV_machine ?= "3389720cf9809d517de7188308132ef1ec066e55" +SRCREV_meta ?= "322fa5b2796bfcff7bfbbde1d76c73636ecf5857" 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}" -LINUX_VERSION ?= "4.1.24" +LINUX_VERSION ?= "4.1.33" PV = "${LINUX_VERSION}+git${SRCPV}" 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 2eea7b8903..c57949b2ae 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb @@ -4,13 +4,13 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "4.1.24" +LINUX_VERSION ?= "4.1.33" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "403eda4633e9037fb715d0d1e8ae847b2bd0651a" -SRCREV_meta ?= "d6e1f4bfc254c677a8dfef92f0ad8c78bdeeea75" +SRCREV_machine ?= "0c7be943fb59eb9a8d1e57e1fb1aa20aed5fa9cb" +SRCREV_meta ?= "322fa5b2796bfcff7bfbbde1d76c73636ecf5857" 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 dd2ef7654b..b2ebe8b26b 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb @@ -11,20 +11,20 @@ KBRANCH_qemux86 ?= "standard/base" KBRANCH_qemux86-64 ?= "standard/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "cadb80aa4bcee282f1b0798ef35ad8b96ec44931" -SRCREV_machine_qemuarm64 ?= "403eda4633e9037fb715d0d1e8ae847b2bd0651a" -SRCREV_machine_qemumips ?= "737eda6388a529d0937e9d91daa3644b11f322dc" -SRCREV_machine_qemuppc ?= "403eda4633e9037fb715d0d1e8ae847b2bd0651a" -SRCREV_machine_qemux86 ?= "403eda4633e9037fb715d0d1e8ae847b2bd0651a" -SRCREV_machine_qemux86-64 ?= "403eda4633e9037fb715d0d1e8ae847b2bd0651a" -SRCREV_machine_qemumips64 ?= "f276d128428b031521d766bfbfe84f9f9f992930" -SRCREV_machine ?= "403eda4633e9037fb715d0d1e8ae847b2bd0651a" -SRCREV_meta ?= "d6e1f4bfc254c677a8dfef92f0ad8c78bdeeea75" +SRCREV_machine_qemuarm ?= "a8169bc7216752813a0a8be7d77ec8fcf0d8850e" +SRCREV_machine_qemuarm64 ?= "0c7be943fb59eb9a8d1e57e1fb1aa20aed5fa9cb" +SRCREV_machine_qemumips ?= "d12861e340503a14614b655e77d8dcabadb18f8e" +SRCREV_machine_qemuppc ?= "0e7c356e7c972e0f6f596d7d5f2621a3f68df8e4" +SRCREV_machine_qemux86 ?= "0c7be943fb59eb9a8d1e57e1fb1aa20aed5fa9cb" +SRCREV_machine_qemux86-64 ?= "0c7be943fb59eb9a8d1e57e1fb1aa20aed5fa9cb" +SRCREV_machine_qemumips64 ?= "c14be1d25b733ff6ff47e8f255e8196cf9b3e8c9" +SRCREV_machine ?= "0c7be943fb59eb9a8d1e57e1fb1aa20aed5fa9cb" +SRCREV_meta ?= "322fa5b2796bfcff7bfbbde1d76c73636ecf5857" 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}" -LINUX_VERSION ?= "4.1.24" +LINUX_VERSION ?= "4.1.33" PV = "${LINUX_VERSION}+git${SRCPV}" -- cgit v1.2.3-54-g00ecf