From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6670845595705409536 X-Received: by 2002:adf:82aa:: with SMTP id 39mr15144309wrc.305.1553584999135; Tue, 26 Mar 2019 00:23:19 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:49cd:: with SMTP id t13ls83776wrs.6.gmail; Tue, 26 Mar 2019 00:23:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqwH6NfUXWMp9lW8rWp+kmFzEn/Jhkna3hfPApOybH+An3e4y/d02w0eb5GONISl30WNYm/2 X-Received: by 2002:adf:dcca:: with SMTP id x10mr18224122wrm.57.1553584998647; Tue, 26 Mar 2019 00:23:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553584998; cv=none; d=google.com; s=arc-20160816; b=kqGzwk/Q6rcXWTL3b3j8SaKJi2yO96XgWmDI1elUl029Q04aKx2PFfXCNn+Lcyq8ai nYJTvSbbrovxTG2JHMUfAmh5aVB5mGp0ynk7gY15kSKJ7augtJr9RcwYwzwN7/CvYP5f DNw7XsPCqMTqtnuUCiTxMesR2ovMbXcD+3/vibLNa32hOdgZZPluOaMJ2Q8cGeBj9CY/ UruSskeMH2n+ULbQjjSxC+NDqg2sqSwhZVQhPiROsQ7LdpdMGL5TnB94gt4KMgsYw4sN wquveCsvZHwPhLuJeB1Z89A8Hxe/2vL0TYmZLKw/KNtqoBN+/W4HttojouhjFV1XPNQD ec9A== 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=WR6v42WmOG1DOKYcVeY81uH0sLLGFxEmjgnELMBR4u0=; b=rcz8N9JGMgh2N17e2g1ou8z2AE5afNVSWivDgdQjacm0OB0WSDst51oUWh3di8lo2n 0I60rZnHSZhOfmLWaIgFmZEVKwzUDzPPmpZaMeNbsqyrbTcVFI6udhisz9SIXKR4itvL 5Jdfgxu8hg7sz0QztfgLO3fxh2rmNav4VD0b1UKpoGCpptclhWimIEPvvhkXRTcTHIzY Ziktcf3ZbLLhdJbR4J/8yituXzKJK04npJwwCcUicL+kcNe2pcJKMfBx3YC1wHCk5ZQV ysoo55jDVnCBUTijzGKLcS8FJfk9XzcHEuxJrg53xaLI9LgFFMVyJDQ4kyeUuzW308wh 98lA== 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 a9si911366wrp.5.2019.03.26.00.23.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 00:23:18 -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 mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x2Q7NHx4012536 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 26 Mar 2019 08:23:17 +0100 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.232]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x2Q7NHCC004734; Tue, 26 Mar 2019 08:23:17 +0100 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v2 1/4] image.bbclass: make KERNEL_IMAGE & INITRD_IMAGE variable fixed Date: Tue, 26 Mar 2019 08:23:09 +0100 Message-Id: <20190326072312.10863-2-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326072312.10863-1-claudius.heine.ext@siemens.com> References: <20190326072312.10863-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: WkXnRXziRgcP 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 3ba755f..d83ae35 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