summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Liu <liu.ming50@gmail.com>2023-03-04 17:30:29 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-03-06 09:52:16 +0000
commit44913cfab42856b8f40e13bac76c5abfa1df0cb2 (patch)
tree5d13ccc0914936fd0e783ef4db2c016bbc41e8de
parent011cc9a104b96b2dc66370d15a57185fba94b4f9 (diff)
downloadpoky-44913cfab42856b8f40e13bac76c5abfa1df0cb2.tar.gz
linux: inherit pkgconfig in kernel.bbclass
pkgconfig is being required to find dependencies for building kernel native tools, move "inherit pkgconfig" to kernel.bbclass so BSP kernel recipes can also benefit from it. (From OE-Core rev: 8a84bd98e3fbc16c782f83064801e469d086911e) Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes-recipe/kernel.bbclass2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-dev.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto.inc1
3 files changed, 1 insertions, 4 deletions
diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass
index 3f9c6c00e6..92090ac14e 100644
--- a/meta/classes-recipe/kernel.bbclass
+++ b/meta/classes-recipe/kernel.bbclass
@@ -660,7 +660,7 @@ do_savedefconfig() {
660do_savedefconfig[nostamp] = "1" 660do_savedefconfig[nostamp] = "1"
661addtask savedefconfig after do_configure 661addtask savedefconfig after do_configure
662 662
663inherit cml1 663inherit cml1 pkgconfig
664 664
665# Need LD, HOSTLDFLAGS and more for config operations 665# Need LD, HOSTLDFLAGS and more for config operations
666KCONFIG_CONFIG_COMMAND:append = " ${EXTRA_OEMAKE}" 666KCONFIG_CONFIG_COMMAND:append = " ${EXTRA_OEMAKE}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb
index 9ef5b80a37..8039a52324 100644
--- a/meta/recipes-kernel/linux/linux-yocto-dev.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb
@@ -10,8 +10,6 @@
10 10
11inherit kernel 11inherit kernel
12require recipes-kernel/linux/linux-yocto.inc 12require recipes-kernel/linux/linux-yocto.inc
13# for ncurses tests
14inherit pkgconfig
15 13
16# provide this .inc to set specific revisions 14# provide this .inc to set specific revisions
17include recipes-kernel/linux/linux-yocto-dev-revisions.inc 15include recipes-kernel/linux/linux-yocto-dev-revisions.inc
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc
index 93eef9e946..934591ff1c 100644
--- a/meta/recipes-kernel/linux/linux-yocto.inc
+++ b/meta/recipes-kernel/linux/linux-yocto.inc
@@ -47,7 +47,6 @@ LINUX_VERSION_EXTENSION ??= "-yocto-${LINUX_KERNEL_TYPE}"
47# Pick up shared functions 47# Pick up shared functions
48inherit kernel 48inherit kernel
49inherit kernel-yocto 49inherit kernel-yocto
50inherit pkgconfig
51 50
52B = "${WORKDIR}/linux-${PACKAGE_ARCH}-${LINUX_KERNEL_TYPE}-build" 51B = "${WORKDIR}/linux-${PACKAGE_ARCH}-${LINUX_KERNEL_TYPE}-build"
53 52