From ad8f68e9831c57fde62f7b1942bfa9e1307f113d Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 14 Mar 2018 11:10:27 -0400 Subject: linux-yocto/4.14/4.15: revert "features/systemtap/systemtap.cfg: enable CONFIG_KERNEL_DEBUG" The following commit: Author: California Sullivan Date: Wed Feb 17 16:47:10 2016 -0800 ktypes: add developer ktype The developer ktype enables EMBEDDED, EXPERT, and DEBUG_KERNEL, opening up more kernel options and setting some defaults. Signed-off-by: California Sullivan Signed-off-by: Bruce Ashfield Was created to address the kernel footprint related issues that are related to many of the kernel debug options. When this commit was merged, it re-enabled CONFIG_DEBUG_KERNEL for the standard kernel, since it includes the systemtap fragment. The correct thing to do is to move systemtap properly into the developer kernel type. For now, you can build the developer kernel type, or add the developer kernel configuration fragment via a bbappend, and you'll have a functional systemtap. [YOCTO #12603] Signed-off-by: Bruce Ashfield Signed-off-by: Ross Burton --- meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.14.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.15.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 fd003e4d2b..8a6371625e 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 ?= "4832801a14130645d2251a368cba79d937a775ab" -SRCREV_meta ?= "54b3e9b768651ca15bf65ae1c72dfe6d957285f0" +SRCREV_meta ?= "5f6c3e32365bffb1993c0c62abf2c5bb8916a57f" 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.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb index 3858992703..9f03c98cff 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "3247d5a26cab529bd4acc137c119bcdf71c3d5ae" -SRCREV_meta ?= "40cef533a17de9d7a1de9b6e3578ac9125486a4a" +SRCREV_meta ?= "65e0a9654f69241d0e6b18162289dabec877039e" 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.15;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 1ccbf6283e..494d80aa48 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb @@ -10,7 +10,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "09828ddd8d8c91b2d68afdcd8eb99a48e0253582" -SRCREV_meta ?= "54b3e9b768651ca15bf65ae1c72dfe6d957285f0" +SRCREV_meta ?= "5f6c3e32365bffb1993c0c62abf2c5bb8916a57f" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb index 0c0abf38f2..6ec6371b74 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "9c2e6c0fc71526c45fc7ddf3ec91e2e2f27e3da0" SRCREV_machine_qemux86-64 ?= "9c2e6c0fc71526c45fc7ddf3ec91e2e2f27e3da0" SRCREV_machine_qemumips64 ?= "f9a3a72209bde080e4ecb4fbe7a0f99954643131" SRCREV_machine ?= "3247d5a26cab529bd4acc137c119bcdf71c3d5ae" -SRCREV_meta ?= "40cef533a17de9d7a1de9b6e3578ac9125486a4a" +SRCREV_meta ?= "65e0a9654f69241d0e6b18162289dabec877039e" 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.15;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.14.bb b/meta/recipes-kernel/linux/linux-yocto_4.14.bb index a714e39751..ba5e35625e 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 ?= "edc90f45a716ffe8e16cebaaf3b5db070af0280a" SRCREV_machine_qemux86-64 ?= "edc90f45a716ffe8e16cebaaf3b5db070af0280a" SRCREV_machine_qemumips64 ?= "6d7fbdbb7e466be645c34eed7bb2b532a9431a85" SRCREV_machine ?= "edc90f45a716ffe8e16cebaaf3b5db070af0280a" -SRCREV_meta ?= "54b3e9b768651ca15bf65ae1c72dfe6d957285f0" +SRCREV_meta ?= "5f6c3e32365bffb1993c0c62abf2c5bb8916a57f" 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.15.bb b/meta/recipes-kernel/linux/linux-yocto_4.15.bb index 50be40d9e9..6bd578b931 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.15.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "3247d5a26cab529bd4acc137c119bcdf71c3d5ae" SRCREV_machine_qemux86-64 ?= "3247d5a26cab529bd4acc137c119bcdf71c3d5ae" SRCREV_machine_qemumips64 ?= "38face5dfd94733484822f392f9469fed18cca7e" SRCREV_machine ?= "3247d5a26cab529bd4acc137c119bcdf71c3d5ae" -SRCREV_meta ?= "40cef533a17de9d7a1de9b6e3578ac9125486a4a" +SRCREV_meta ?= "65e0a9654f69241d0e6b18162289dabec877039e" 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.15;destsuffix=${KMETA}" -- cgit 1.2.3-korg