Re: [PATCH 1/2] image.bbclass: make KERNEL_IMAGE & INITRD_IMAGE variable fixed

[Claudius Heine <claudius.heine.ext@siemens.com>]

On 16/05/2019 14.50, [ext] claudius.heine.ext@siemens.com wrote:
> From: Claudius Heine <ch@denx.de>
> 
> Before the value of those variables where calculated at runtime with the
> content of the target root file system. But if the root file system
> does not contain the files yet or no longer, this variable will be
> empty, even if those files are already copied to the deploy directory.
> 
> Setting this to fixed value allows to use them in every state of the
> root file system.
> 
> Change from the last version is that KERNEL_IMAGE and INITRD_IMAGE
> variables not contain the `${PF}`, so that they don't overwrite each

not -> now

If that is the only mistake, then this could be changed on merge.

Claudius

> other.
> 
> Signed-off-by: Claudius Heine <ch@denx.de>
> ---
>   meta/classes/image.bbclass | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index 93d9bfc..398275f 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -13,8 +13,8 @@ IMAGE_INSTALL += "${@ ("linux-image-" + d.getVar("KERNEL_NAME", True)) if d.getV
>   IMAGE_FULLNAME = "${PF}"
>   
>   # These variables are used by wic and start_vm
> -KERNEL_IMAGE ?= "${@get_image_name(d, 'vmlinuz')[1]}"
> -INITRD_IMAGE ?= "${@get_image_name(d, 'initrd.img')[1]}"
> +KERNEL_IMAGE ?= "${PF}-vmlinuz"
> +INITRD_IMAGE ?= "${PF}-initrd.img"
>   
>   # Useful variables for imager implementations:
>   PP = "/home/builder/${PN}"
> @@ -149,12 +149,10 @@ addtask rootfs_install before do_build after do_unpack
>   
>   do_copy_boot_files[dirs] = "${DEPLOY_DIR_IMAGE}"
>   do_copy_boot_files() {
> -    KERNEL_IMAGE=${@get_image_name(d, 'vmlinuz')[1]}
>       if [ -n "${KERNEL_IMAGE}" ]; then
>           cp -f ${IMAGE_ROOTFS}/boot/${@get_image_name(d, 'vmlinuz')[0]} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE}
>       fi
>   
> -    INITRD_IMAGE=${@get_image_name(d, 'initrd.img')[1]}
>       if [ -n "${INITRD_IMAGE}" ]; then
>           sudo cp -f ${IMAGE_ROOTFS}/boot/${@get_image_name(d, 'initrd.img')[0]} ${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}
>       fi
> 

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de