[14/21] image.bbclass: don't append -dbg suffix twice

Message ID	ec58b6829e44701e223c9abc23289d55877dcd73.1700600804.git.martin.jansa@gmail.com
State	New
Headers	show Return-Path: <martin.jansa@gmail.com> ip: 209.85.218.47, mailfrom: martin.jansa@gmail.com) From: Martin Jansa <martin.jansa@gmail.com> To: openembedded-core@lists.openembedded.org Subject: [PATCH 14/21] image.bbclass: don't append -dbg suffix twice Date: Wed, 22 Nov 2023 13:44:44 +0100 Message-ID: <ec58b6829e44701e223c9abc23289d55877dcd73.1700600804.git.martin.jansa@gmail.com> In-Reply-To: <cover.1700600804.git.martin.jansa@gmail.com> References: <cover.1700600804.git.martin.jansa@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[01/21] image.bbclass, kernel.bbclass: create version-less artifacts and versioned hard links \| expand [01/21] image.bbclass, kernel.bbclass: create version-less artifacts and versioned hard links [02/21] create-spdx-2.2.bbclass: use hardlink as well [03/21] image, kernel: allow to disable creating the hardlinks by setting LINK_NAME variables to e… [04/21] kernel: move the leading dash into KERNEL_ARTIFACT_NAME [05/21] kernel-fitimage.bbclass: avoid duplicate .bin extension [06/21] kernel-fitimage.bbclass: add .its extension also to links [07/21] uboot: use ${IMAGE_MACHINE_SUFFIX} instead of -${MACHINE} and use hardlinks [08/21] image.bbclass: rename create_symlinks to create_hardlinks [09/21] image-artifact-names.bbclass: add IMAGE_VERSION_SUFFIX_DATETIME which uses SOURCE_DATE_EPOCH [10/21] oeqa: bbtests.BitbakeTests.test_image_manifest: use just isfile() instead of islink() [11/21] oeqa: wic: use just isfile() instead of islink() [12/21] linux-dummy: add do_deploy_links task [13/21] kernel.bbclass: inherit KERNEL_CLASSES at the end [14/21] image.bbclass: don't append -dbg suffix twice [15/21] oeqa: imagefeatures: append -dbg suffix at the end of IMAGE_NAME not IMAGE_LINK_NAME [16/21] oeqa: gdbserver: append -dbg suffix at the end of IMAGE_NAME not IMAGE_LINK_NAME [17/21] oeqa: fitimage: respect KERNEL_FIT_NAME [18/21] selftest: multiconfig-image-packager: use IMAGE_NAME instead of IMAGE_LINK_NAME [19/21] image.bbclass: remove hardlinks as well [20/21] populate_sdk_ext.bbclass: add :do_shared_workdir to BB_SETSCENE_ENFORCE_IGNORE_TASKS [21/21] u-boot.inc: don't replace the binary with symlink

Message ID

ec58b6829e44701e223c9abc23289d55877dcd73.1700600804.git.martin.jansa@gmail.com

State

New

Headers

From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 14/21] image.bbclass: don't append -dbg suffix twice
Date: Wed, 22 Nov 2023 13:44:44 +0100
Message-ID: 
 <ec58b6829e44701e223c9abc23289d55877dcd73.1700600804.git.martin.jansa@gmail.com>
In-Reply-To: <cover.1700600804.git.martin.jansa@gmail.com>
References: <cover.1700600804.git.martin.jansa@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

[01/21] image*.bbclass, kernel*.bbclass: create version-less artifacts and versioned hard links | expand

Commit Message

Martin Jansa Nov. 22, 2023, 12:44 p.m. UTC

* now with IMAGE_LINK_NAME defined based on IMAGE_NAME we don't want to
  append -dbg to IMAGE_NAME and then again to IMAGE_LINK_NAME

* this resulted in filename like:
  core-image-minimal-qemux86-64.rootfs-dbg--1.0-r0-20110405230000-dbg.tar.bz2

[YOCTO #12937]

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
 meta/classes-recipe/image.bbclass | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass
index aa24a92245..e68b8034ea 100644
--- a/meta/classes-recipe/image.bbclass
+++ b/meta/classes-recipe/image.bbclass
@@ -338,8 +338,6 @@  addtask do_image_qa_setscene
 
 def setup_debugfs_variables(d):
     d.appendVar('IMAGE_ROOTFS', '-dbg')
-    if d.getVar('IMAGE_LINK_NAME'):
-        d.appendVar('IMAGE_LINK_NAME', '-dbg')
     d.appendVar('IMAGE_NAME','-dbg')
     d.setVar('IMAGE_BUILDING_DEBUGFS', 'true')
     debugfs_image_fstypes = d.getVar('IMAGE_FSTYPES_DEBUGFS')

[14/21] image.bbclass: don't append -dbg suffix twice

Commit Message

Patch