| Message ID | 20250630121708.4010323-2-hongxu.jia@windriver.com |
|---|---|
| State | Accepted, archived |
| Commit | ceff363630ac0397c40be4a5ce54a6c20f901c40 |
| Headers | show |
| Series | [1/2] kernelsrc.bbclass/perf: make package version consistent with kernel source | expand |
No concerns on my end. Bruce In message: [OE-core] [PATCH 2/2] kernel-devsrc: make package version consistent with kernel source on 30/06/2025 hongxu via lists.openembedded.org wrote: > 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 > > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> > --- > meta/recipes-kernel/linux/kernel-devsrc.bb | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb > index 7ad848c35eb..3d2eb3929e6 100644 > --- a/meta/recipes-kernel/linux/kernel-devsrc.bb > +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb > @@ -7,7 +7,7 @@ SECTION = "kernel" > > LICENSE = "GPL-2.0-only" > > -inherit linux-kernel-base > +inherit kernelsrc > > # Whilst not a module, this ensures we don't get multilib extended (which would make no sense) > inherit module-base > @@ -20,14 +20,10 @@ do_install[depends] += "virtual/kernel:do_shared_workdir" > do_install[depends] += "virtual/kernel:do_install" > > # There's nothing to do here, except install the source where we can package it > -do_fetch[noexec] = "1" > -do_unpack[noexec] = "1" > -do_patch[noexec] = "1" > do_configure[noexec] = "1" > do_compile[noexec] = "1" > deltask do_populate_sysroot > > -S = "${STAGING_KERNEL_DIR}" > B = "${STAGING_KERNEL_BUILDDIR}" > > PACKAGE_ARCH = "${MACHINE_ARCH}" > -- > 2.34.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#219516): https://lists.openembedded.org/g/openembedded-core/message/219516 > Mute This Topic: https://lists.openembedded.org/mt/113906487/1050810 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [bruce.ashfield@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index 7ad848c35eb..3d2eb3929e6 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -7,7 +7,7 @@ SECTION = "kernel" LICENSE = "GPL-2.0-only" -inherit linux-kernel-base +inherit kernelsrc # Whilst not a module, this ensures we don't get multilib extended (which would make no sense) inherit module-base @@ -20,14 +20,10 @@ do_install[depends] += "virtual/kernel:do_shared_workdir" do_install[depends] += "virtual/kernel:do_install" # There's nothing to do here, except install the source where we can package it -do_fetch[noexec] = "1" -do_unpack[noexec] = "1" -do_patch[noexec] = "1" do_configure[noexec] = "1" do_compile[noexec] = "1" deltask do_populate_sysroot -S = "${STAGING_KERNEL_DIR}" B = "${STAGING_KERNEL_BUILDDIR}" PACKAGE_ARCH = "${MACHINE_ARCH}"
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 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- meta/recipes-kernel/linux/kernel-devsrc.bb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)