From a49c66844c8c3a87f8383085661ff59bfb045452 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sat, 22 Sep 2018 13:18:48 -0400 Subject: linux-yocto: configuration warning fixes Integrating the following commits to address kernel configuration audit warnings: 856794172e8f features/intel-pinctrl: Fix conflict with configs 397b67321037 bsp/intel-x86: Rename CONFIG_R8723BE to CONFIG_RTL8723BE fca2a16483f2 features/thermal: Add dependency for kernel option b6110e2e8e55 features/tpm: fix conflict with configs and add dependency ee22bc1f8fcd features/mmc: modify dependency e50eb6bd929b features: drop the obsolete kernel option f5327047994f features/hostapd: drop obsolete configs 48b54e625876 bsp/intel-x86: Drop configs that has been removed by kernel Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.14.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.18.bb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb index 350d907a4e..86ce03ca4c 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "af1b926c9160b0dbf2bbe41b166a8a7b07191fd2" -SRCREV_meta ?= "9beb3a28736e7b00199641864a46ee4b8e2e6428" +SRCREV_meta ?= "634d8f2230d1fb0b9ad4af974509d25d36e5179c" 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-4.14;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb index 5333e156cd..3e0e3dc40e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "6b38725fe97a59cefef01b5213a1d234dd38a542" -SRCREV_meta ?= "73417203913023f9438ea196377a363233857172" +SRCREV_meta ?= "856794172e8f046e7d6542e09d431c5a412a8a45" 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-4.18;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb index 393295846e..4c2c7f75dc 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb @@ -13,7 +13,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "74ecbeb03ebfc2b9a73a6554924b043b903295f5" -SRCREV_meta ?= "9beb3a28736e7b00199641864a46ee4b8e2e6428" +SRCREV_meta ?= "634d8f2230d1fb0b9ad4af974509d25d36e5179c" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb index 704035f899..60ceef6db2 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb @@ -14,7 +14,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "71799edb8a38622626cf3b5582dff152b512ccf0" -SRCREV_meta ?= "73417203913023f9438ea196377a363233857172" +SRCREV_meta ?= "856794172e8f046e7d6542e09d431c5a412a8a45" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.14.bb b/meta/recipes-kernel/linux/linux-yocto_4.14.bb index ff14979186..a289356c52 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.14.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "084af9624d268ddf4fd65b2f9e8e50ca2f22e62b" SRCREV_machine_qemux86-64 ?= "084af9624d268ddf4fd65b2f9e8e50ca2f22e62b" SRCREV_machine_qemumips64 ?= "44e1719a8f4fe10e88c13b9ec6c1fa1d041efaed" SRCREV_machine ?= "084af9624d268ddf4fd65b2f9e8e50ca2f22e62b" -SRCREV_meta ?= "9beb3a28736e7b00199641864a46ee4b8e2e6428" +SRCREV_meta ?= "634d8f2230d1fb0b9ad4af974509d25d36e5179c" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.18.bb b/meta/recipes-kernel/linux/linux-yocto_4.18.bb index d6e3768d92..80c36d72e3 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.18.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.18.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "71799edb8a38622626cf3b5582dff152b512ccf0" SRCREV_machine_qemux86-64 ?= "71799edb8a38622626cf3b5582dff152b512ccf0" SRCREV_machine_qemumips64 ?= "f3add308bccafeeed79fde2a3720236bf4fd6457" SRCREV_machine ?= "71799edb8a38622626cf3b5582dff152b512ccf0" -SRCREV_meta ?= "73417203913023f9438ea196377a363233857172" +SRCREV_meta ?= "856794172e8f046e7d6542e09d431c5a412a8a45" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}" -- cgit 1.2.3-korg