From ca9d26a08dffeeeffee1447f462d4a2361397aa8 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 3 Oct 2016 01:54:32 -0400 Subject: linux-yocto/4.4: update to v4.4.22 (From OE-Core rev: 286d893f9e7caed06035f7916492a74e0212df6a) (From OE-Core rev: 3865d4cfe00e8e1ee2b84e742f154ff0c994a253) 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.4.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto_4.4.bb | 20 ++++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb index 1b9d80ae13..5416ca499b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "bf2fbe7f2cdf44fc69e50fefbfdd58d41a03733a" -SRCREV_meta ?= "6ec93aaa70f838b551f58b91d0c6ffeff6f6094b" +SRCREV_machine ?= "a1da5707fd13f31d25661b910c7377c8714c1123" +SRCREV_meta ?= "170ed03a9d908e2abc8025cf9a62789ab15b3ece" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.4.11" +LINUX_VERSION ?= "4.4.22" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb index da88451b76..e7e48adc4d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb @@ -4,13 +4,13 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "4.4.11" +LINUX_VERSION ?= "4.4.22" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "628bf627561c6285d99fb978e11d4c15fc29324b" -SRCREV_meta ?= "6ec93aaa70f838b551f58b91d0c6ffeff6f6094b" +SRCREV_machine ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a" +SRCREV_meta ?= "170ed03a9d908e2abc8025cf9a62789ab15b3ece" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.4.bb b/meta/recipes-kernel/linux/linux-yocto_4.4.bb index 4306bf8be9..5cafa9166a 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.4.bb @@ -11,20 +11,20 @@ KBRANCH_qemux86 ?= "standard/base" KBRANCH_qemux86-64 ?= "standard/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "97c21d0b5ffa8eb1cb27a6f81b52ec53182ae087" -SRCREV_machine_qemuarm64 ?= "628bf627561c6285d99fb978e11d4c15fc29324b" -SRCREV_machine_qemumips ?= "8763860e4da46b3cb1551e09d9ca46eedd2dd91a" -SRCREV_machine_qemuppc ?= "628bf627561c6285d99fb978e11d4c15fc29324b" -SRCREV_machine_qemux86 ?= "628bf627561c6285d99fb978e11d4c15fc29324b" -SRCREV_machine_qemux86-64 ?= "628bf627561c6285d99fb978e11d4c15fc29324b" -SRCREV_machine_qemumips64 ?= "8974d9741cbcb21bf50ab49a6257e5773415fa5f" -SRCREV_machine ?= "628bf627561c6285d99fb978e11d4c15fc29324b" -SRCREV_meta ?= "6ec93aaa70f838b551f58b91d0c6ffeff6f6094b" +SRCREV_machine_qemuarm ?= "22a817dc851fac7ec9369c29b3a2803ec92781fb" +SRCREV_machine_qemuarm64 ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a" +SRCREV_machine_qemumips ?= "c1794372ab031297d1c4482d982e143386c247ea" +SRCREV_machine_qemuppc ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a" +SRCREV_machine_qemux86 ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a" +SRCREV_machine_qemux86-64 ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a" +SRCREV_machine_qemumips64 ?= "ab08db0be1aec0daa5ac134fe1abcd6eba47b275" +SRCREV_machine ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a" +SRCREV_meta ?= "170ed03a9d908e2abc8025cf9a62789ab15b3ece" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.4.11" +LINUX_VERSION ?= "4.4.22" PV = "${LINUX_VERSION}+git${SRCPV}" -- cgit v1.2.3-54-g00ecf