From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6691606441308979200 X-Received: by 2002:a5d:658b:: with SMTP id q11mr11500466wru.130.1558013545128; Thu, 16 May 2019 06:32:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:6342:: with SMTP id x63ls1892778wmb.0.canary-gmail; Thu, 16 May 2019 06:32:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqxhy8UYuBiXpt1rjFtcjtCUX7zayUNwHnRhtLfH8fq6+oqrpylY938UdnVNVLZUHGnYP4x5 X-Received: by 2002:a1c:6a0e:: with SMTP id f14mr3103102wmc.69.1558013544175; Thu, 16 May 2019 06:32:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558013544; cv=none; d=google.com; s=arc-20160816; b=JDB0t4Q892Th4TfbLPbHqeLM9ITvE9S6J/rNMow3AHcjrxMFuaWG0p18MWLEBTo6Bk 5GBf/BttK8/ZLja7MvRio/VSaom6iOZp9wMBp9MPfUnqFIoHwkg8qucihLT0O96pCgeM ksswa3UXoVrs+zGCRwKrfYeo3CqZzpS9K/8AujE6QTveevY3FrJXZ/zLo3B/OtAhJStA 3ZB0PpVmi0wU2obM0kF50K/rDjvp2idHNQNwiuBItQ+1/001mkGNwmN2S14X/oCRNcKP LSFS45atpZ4AdgcJ2sfQjeN+CV0byCdacwEUQ18oxdtDAGNCCKOWJm2JSA2dySbN69ad NeKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:references:cc:to:from:subject; bh=JrQvWgaxRRUK1mS9VUQ2D1YBRGbc42zUo6q8KMMj8GU=; b=1HobftALX9tM959Bt//xZsZEFrcqWhpyL4t1LkfEFqC3boP8WMuzTbGhmsp31frq8x z9KTAsYzcaeTtRR+rda+T5lkNV4llR0OT+eqzDU9fk6rR1gZpMZjx8gflFPBD/GQxYvs vInG+AcHNhQ72uK48cWuCgIhPEs16p1uKXzq5vIMPGHLF1uf7JUXLK8uVZ1M+0zc6O4e jYACUXdYOnPQq2KrD9HF1wSMqsL/Q8i19xATitveFAPH7aBPIO7xqURD8D0FF8HwN1H8 //I+YvqHwxQHuH9NZupV4vWD3Pl4qOJ5VAI/xi+YP2n3P4XnPD9SDsk3Phxaoy3ejnvm 6y6Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id h126si800822wmf.2.2019.05.16.06.32.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 May 2019 06:32:24 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id x4GDWNda018165 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 16 May 2019 15:32:23 +0200 Received: from [139.25.69.232] (linux-ses-ext02.ppmd.siemens.net [139.25.69.232]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x4GDWNcX006470; Thu, 16 May 2019 15:32:23 +0200 Subject: Re: [PATCH 1/2] image.bbclass: make KERNEL_IMAGE & INITRD_IMAGE variable fixed From: Claudius Heine To: isar-users@googlegroups.com Cc: Claudius Heine References: <20190516125030.13190-1-claudius.heine.ext@siemens.com> <20190516125030.13190-2-claudius.heine.ext@siemens.com> Message-ID: <12277001-d98c-108e-e48d-35161b0deb91@siemens.com> Date: Thu, 16 May 2019 15:32:23 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190516125030.13190-2-claudius.heine.ext@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: Q0OaL/6rG9dP On 16/05/2019 14.50, [ext] claudius.heine.ext@siemens.com wrote: > From: Claudius Heine > > 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 > --- > 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