summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2025-06-30 20:17:08 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-07-03 10:40:17 +0100
commit1fb4a71811dadecbe0348530658623371071c0e3 (patch)
treebe9c56b5c35ce1fd22be1cfaebc83a67a4488313
parent39c22500c1e303770b3c3ff0b46d79a73c47bbf5 (diff)
downloadpoky-1fb4a71811dadecbe0348530658623371071c0e3.tar.gz
kernel-devsrc: make package version consistent with kernel source
The package version of kernel-devsrc is 1.0 which is not consistent with kernel source $ bitbake kernel-devsrc $ ls tmp/work/qemux86_64-poky-linux/kernel-devsrc/1.0/deploy-rpms/qemux86_64/kernel-devsrc-* tmp/work/qemux86_64-poky-linux/kernel-devsrc/1.0/deploy-rpms/qemux86_64/kernel-devsrc-1.0-r0.qemux86_64.rpm tmp/work/qemux86_64-poky-linux/kernel-devsrc/1.0/deploy-rpms/qemux86_64/kernel-devsrc-dbg-1.0-r0.qemux86_64.rpm tmp/work/qemux86_64-poky-linux/kernel-devsrc/1.0/deploy-rpms/qemux86_64/kernel-devsrc-dev-1.0-r0.qemux86_64.rpm After commit [kernelsrc.bbclass/perf: make package version consistent with kernel source] applied, it moved the setting of PKGV to kernelsrc.bbclass for common use. And bbclass kernelsrc has already inherited linux-kernel-base, this commit uses bbclass kernelsrc to instead of linux-kernel-base, and remove duplicated settings. After applying this commit: $ ls tmp/work/qemux86_64-poky-linux/kernel-devsrc/1.0/deploy-rpms/qemux86_64/kernel-devsrc-* tmp/work/qemux86_64-poky-linux/kernel-devsrc/1.0/deploy-rpms/qemux86_64/kernel-devsrc-6.12.31-r0.qemux86_64.rpm tmp/work/qemux86_64-poky-linux/kernel-devsrc/1.0/deploy-rpms/qemux86_64/kernel-devsrc-dbg-6.12.31-r0.qemux86_64.rpm tmp/work/qemux86_64-poky-linux/kernel-devsrc/1.0/deploy-rpms/qemux86_64/kernel-devsrc-dev-6.12.31-r0.qemux86_64.rpm (From OE-Core rev: ceff363630ac0397c40be4a5ce54a6c20f901c40) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/kernel-devsrc.bb6
1 files changed, 1 insertions, 5 deletions
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 7ad848c35e..3d2eb3929e 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -7,7 +7,7 @@ SECTION = "kernel"
7 7
8LICENSE = "GPL-2.0-only" 8LICENSE = "GPL-2.0-only"
9 9
10inherit linux-kernel-base 10inherit kernelsrc
11 11
12# Whilst not a module, this ensures we don't get multilib extended (which would make no sense) 12# Whilst not a module, this ensures we don't get multilib extended (which would make no sense)
13inherit module-base 13inherit module-base
@@ -20,14 +20,10 @@ do_install[depends] += "virtual/kernel:do_shared_workdir"
20do_install[depends] += "virtual/kernel:do_install" 20do_install[depends] += "virtual/kernel:do_install"
21 21
22# There's nothing to do here, except install the source where we can package it 22# There's nothing to do here, except install the source where we can package it
23do_fetch[noexec] = "1"
24do_unpack[noexec] = "1"
25do_patch[noexec] = "1"
26do_configure[noexec] = "1" 23do_configure[noexec] = "1"
27do_compile[noexec] = "1" 24do_compile[noexec] = "1"
28deltask do_populate_sysroot 25deltask do_populate_sysroot
29 26
30S = "${STAGING_KERNEL_DIR}"
31B = "${STAGING_KERNEL_BUILDDIR}" 27B = "${STAGING_KERNEL_BUILDDIR}"
32 28
33PACKAGE_ARCH = "${MACHINE_ARCH}" 29PACKAGE_ARCH = "${MACHINE_ARCH}"