From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6677870985578807296 X-Received: by 2002:ac2:44a7:: with SMTP id c7mr1689452lfm.7.1554812999780; Tue, 09 Apr 2019 05:29:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8987:: with SMTP id c7ls2173857lji.4.gmail; Tue, 09 Apr 2019 05:29:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqz/0tonatJEcc59RKx5Dhe6eGrRg4w8Vx6ZD4PLdTDacyW0pTl7pbL/8jh+GKnlglqCyHgg X-Received: by 2002:a2e:9b17:: with SMTP id u23mr153905lji.0.1554812999272; Tue, 09 Apr 2019 05:29:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554812999; cv=none; d=google.com; s=arc-20160816; b=Xe1wdpUZZb2Yxd62N9ON5tRx05UrFR6STS+pmtOZvuLUeAn8Xmt/bJgXAJ6HM2+Ety 5fXCQrGsItntNN0R+73jX1s2lprfEe77AiWpOHKoXeEB3dkVqwXzGOpbyjZ5OcVTfKY7 9uhr3cPAUfh9FnNGEAy8mbM5S27YGdvoUkHbu/uokx8k/+4zMRwV+6NR+/LSKxqsDU+F r/zUp8T30tW9ogT4xqyIM+6ohwQCpeAUndifJ8BjW5k7+AedGCKIz8fMwgahR+i4MC5/ /543PLvV+rPjkU4qCyjbgpdAGAO5UoHoFravTT6y2qwc2v5we2Dg+vesJbhy6yD8KaIe BptQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=fMVpWswtmlf/jAb9L8HkXbfu74224oFsLZjFn6rvllk=; b=bWDxLFjs2fE51LY4/lr917KGPEe1cw+sX6BkYMegODoeNZN0WFxGXMKnXrOJ21JEjm fO8bb4vwwfJCQseArdB2HHBJF5RykRiyZ7r2ZQ0W3WN/A4Lf+tYHF2odhMUMl4aY3H1a RbB76iMNX9eG+V4alCNaJdD6oBggsoVjSchpqWBrXT27aQS7ly5jKlyMMjPPHM9SIvnT onh5hVYe9fV6NWJhO7rSJEiImhwG/Acj6ZbZGQiunurh/PXSpAU/lNBWvPfYLpudAZIC 7AXlLQ9o6r9MKqTJ3xzIBxQmzfS8Mg71TwlPL9wxUAQ0Qr3gbgf/LCM6IT9OJxgyJ2fA JrIQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id h21si1511063lfm.4.2019.04.09.05.29.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 05:29:59 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x39CTw0v032390 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 9 Apr 2019 14:29:58 +0200 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.232]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x39CTvkA031413; Tue, 9 Apr 2019 14:29:58 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v2 1/8] image.bbclass: make KERNEL_IMAGE & INITRD_IMAGE variable fixed Date: Tue, 9 Apr 2019 14:29:08 +0200 Message-Id: <20190409122915.14249-2-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409122915.14249-1-claudius.heine.ext@siemens.com> References: <20190409122915.14249-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: z+R1KAYq0NEC 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 copyied to the deploy directory. Setting this to fixed value allows to use them in every state of the root file system. 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 385fa0e..8ae931c 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -11,8 +11,8 @@ IMAGE_INSTALL += "${@ ("linux-image-" + d.getVar("KERNEL_NAME", True)) if d.getV IMAGE_FULLNAME = "${PN}-${DISTRO}-${MACHINE}" # 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 ?= "vmlinuz" +INITRD_IMAGE ?= "initrd.img" # Useful variables for imager implementations: PP = "/home/builder/${PN}" @@ -202,12 +202,10 @@ do_mark_rootfs[stamp-extra-info] = "${DISTRO}-${MACHINE}" addtask mark_rootfs before do_copy_boot_files do_transform_template after do_rootfs 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 -- 2.20.1