diff options
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto.inc | 10 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_6.1.bb | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 934591ff1c..04a8105e17 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc | |||
@@ -59,8 +59,14 @@ do_install:append(){ | |||
59 | # enable kernel-sample for oeqa/runtime/cases's ksample.py test | 59 | # enable kernel-sample for oeqa/runtime/cases's ksample.py test |
60 | KERNEL_FEATURES:append:qemuall=" features/kernel-sample/kernel-sample.scc" | 60 | KERNEL_FEATURES:append:qemuall=" features/kernel-sample/kernel-sample.scc" |
61 | 61 | ||
62 | KERNEL_DEBUG_OPTIONS ?= "stack" | 62 | KERNEL_DEBUG ?= "" |
63 | KERNEL_EXTRA_ARGS:append:x86-64 = " ${@bb.utils.contains('KERNEL_DEBUG_OPTIONS', 'stack', 'HOST_LIBELF_LIBS="-L${RECIPE_SYSROOT_NATIVE}/usr/lib/pkgconfig/../../../usr/lib/ -lelf"', '', d)}" | 63 | # These used to be version specific, but are now common dependencies. New |
64 | # tools / dependencies will continue to be added in version specific recipes. | ||
65 | DEPENDS += '${@bb.utils.contains_any("ARCH", [ "x86", "arm64" ], "elfutils-native", "", d)}' | ||
66 | DEPENDS += "openssl-native util-linux-native" | ||
67 | DEPENDS += "gmp-native libmpc-native" | ||
68 | DEPENDS += '${@bb.utils.contains("KERNEL_DEBUG", "True", "pahole-native", "", d)}' | ||
69 | EXTRA_OEMAKE += '${@bb.utils.contains("KERNEL_DEBUG", "True", "", "PAHOLE=false", d)}' | ||
64 | 70 | ||
65 | do_devshell:prepend() { | 71 | do_devshell:prepend() { |
66 | # setup native pkg-config variables (kconfig scripts call pkg-config directly, cannot generically be overriden to pkg-config-native) | 72 | # setup native pkg-config variables (kconfig scripts call pkg-config directly, cannot generically be overriden to pkg-config-native) |
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index 7600f45522..7e7edf82c3 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb | |||
@@ -46,10 +46,6 @@ SRC_URI += "file://0001-perf-cpumap-Make-counter-as-unsigned-ints.patch" | |||
46 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 46 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
47 | LINUX_VERSION ?= "6.1.27" | 47 | LINUX_VERSION ?= "6.1.27" |
48 | 48 | ||
49 | DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" | ||
50 | DEPENDS += "openssl-native util-linux-native" | ||
51 | DEPENDS += "gmp-native libmpc-native" | ||
52 | |||
53 | PV = "${LINUX_VERSION}+git${SRCPV}" | 49 | PV = "${LINUX_VERSION}+git${SRCPV}" |
54 | 50 | ||
55 | KMETA = "kernel-meta" | 51 | KMETA = "kernel-meta" |