From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6613620343774904320 X-Received: by 2002:a1c:3746:: with SMTP id e67-v6mr1668200wma.19.1540216370356; Mon, 22 Oct 2018 06:52:50 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:3e47:: with SMTP id l68-v6ls142870wma.6.gmail; Mon, 22 Oct 2018 06:52:49 -0700 (PDT) X-Google-Smtp-Source: ACcGV62gnl34Ee4IuVVvU4IPM4kq9KxRid+eH/y8rud7GssFyDasxlcyXqeXX31QWYh54r2ga/Ko X-Received: by 2002:a1c:b746:: with SMTP id h67-v6mr1649530wmf.9.1540216369727; Mon, 22 Oct 2018 06:52:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540216369; cv=none; d=google.com; s=arc-20160816; b=QEB3EzMHdTd7c/pbLq7PRly0uSlq7dYA23d0qRxz/p6Hk7+ckSDdEAYtHShOfZnpGR xfN1KfPNhBiTJdSd0nCU86+Qb9G6FqcE//4JUjG22x+w/gAsgddxgyc3Ii3Gwi+w0CTH PZ1ey1LWIqI5vnLNFPyJuA0IdUgumTiYNLoeadSI4mncoEGfXC+4TcHEtsYsdpL+E8K5 DKhdGVBSbxB3WZzpEs2zjom4XHDfTUEZmzedf7+K0VUqqJMKbwvibI8OtZyG18UXYRqp Qz9sR/DSW2gVrX8FKdUKEenkqkq9czuGjQVQtCnx5aN4OUOkN9KnIeACYVO3Y7b/HMTv joEA== 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:from:references:to:subject; bh=v8BpVtL/tzS5p77pOgblNfDXdhjOX8eUEZ7QICjJUcg=; b=vhaEQGf+utE5zjNNKfN/lmWsk04codBuaBQTveDe7aq3LBSZ3gxMWsoPLG9fLquEUr eApTxp9ja7nBkMd0BUzhOJ4Mx/mtvca9oKtPhKvOYd70psdFta9mROqAitc6HvC+IQe/ VLMmGoBejSncByclsdyB2JMFf3XD18p5pKgcCsO6q7s+s16j20WxmoRvauakUKH5DCCB HrL98AUm72Q/kQeHIbrXhcRqsscw18bE1O6rCqqSGjCo9InLYShU7FOyPcGj7dXUtVYI iB83A3LEMi4950HMwd5oPTWJKckd8ohjDrW0s24hlO+n4aNsxso231pN76UdWFpMW7y4 iGzQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id 191-v6si525479wmv.0.2018.10.22.06.52.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Oct 2018 06:52:49 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id w9MDqnKu004622 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Oct 2018 15:52:49 +0200 Received: from [167.87.44.99] ([167.87.44.99]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id w9MDqmEW025954; Mon, 22 Oct 2018 15:52:48 +0200 Subject: Re: [PATCH v2] image: include image name in the kernel/initrd image copies To: cedric_hombourger@mentor.com, isar-users References: <27912c86-2c53-4986-bf9c-2f9b9796bd50@siemens.com> <1539883436-305-1-git-send-email-Cedric_Hombourger@mentor.com> From: Jan Kiszka Message-ID: <5d88d529-1dcc-8fd6-9eef-7a00f5584863@siemens.com> Date: Mon, 22 Oct 2018 14:52:46 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-TUID: m8quWtFH2kzp On 22.10.18 13:49, cedric_hombourger@mentor.com wrote: > Hi Jan, > > Did you have a chance to look at v2? > Did I manage to address your initial review findings? Sorry, we were/are busy for ELC-E preparations: On first sight, it looks good to me. Just wondering: Do we want/need to document the renaming of kernel/initrd somewhere, maybe in RECIPE-API-CHANGELOG.md? Jan > > Thanks > Cedric > > On Thursday, October 18, 2018 at 7:24:12 PM UTC+2, Cedric Hombourger wrote: > > The kernel and initrd images are really image-specific (especially the later > as the initrd is created/updated as packages get installed into the root > file-system). Make sure we retain a per-image copy of these images in the > image deploy directory by inserting the name of the image (${PN}) into the > full name of the artifacts (set in ${KERNEL_IMAGE} and ${INITRD_IMAGE}). > > In addition, an IMAGE_FULLNAME variable is introduced to combine the three > components of the image name: the (base) name of the image, the name of the > distribution and the name of the machine. This variable is now used in the > start_vm script and the image classes (image, ext4-img and wic-img). > > Signed-off-by: Cedric Hombourger > > --- >  meta/classes/ext4-img.bbclass | 2 +- >  meta/classes/image.bbclass    | 7 ++++--- >  meta/classes/wic-img.bbclass  | 6 +++--- >  3 files changed, 8 insertions(+), 7 deletions(-) > > diff --git a/meta/classes/ext4-img.bbclass b/meta/classes/ext4-img.bbclass > index 78036a2..29e5f77 100644 > --- a/meta/classes/ext4-img.bbclass > +++ b/meta/classes/ext4-img.bbclass > @@ -1,7 +1,7 @@ >  # This software is a part of ISAR. >  # Copyright (C) 2015-2017 ilbers GmbH > > -EXT4_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${PN}-${DISTRO}-${MACHINE}.ext4.img" > +EXT4_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.ext4.img" > >  do_ext4_image[stamp-extra-info] = "${DISTRO}-${MACHINE}" > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > index 05ff06f..ad19f3d 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -7,6 +7,9 @@ IMAGE_ROOTFS   = "${WORKDIR}/rootfs" > >  IMAGE_INSTALL += "${@ ("linux-image-" + d.getVar("KERNEL_NAME", True)) if > d.getVar("KERNEL_NAME", True) else ""}" > > +# Name of the image including distro&machine names > +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]}" > @@ -21,9 +24,7 @@ def get_image_name(d, name_link): >      path_link = os.path.join(S, name_link) >      if os.path.exists(path_link): >          base = os.path.basename(os.path.realpath(path_link)) > -        full = base > -        full += "_" + d.getVar("DISTRO", True) > -        full += "-" + d.getVar("MACHINE", True) > +        full = d.getVar("IMAGE_FULLNAME", True) + "." + base >          return [base, full] >      if os.path.islink(path_link): >          return get_image_name(d, os.path.relpath(os.path.realpath(path_link), > diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass > index d0747e2..e7527c8 100644 > --- a/meta/classes/wic-img.bbclass > +++ b/meta/classes/wic-img.bbclass > @@ -63,7 +63,7 @@ addtask do_rootfs_wicenv after do_copy_boot_files before > do_wic_image >  do_rootfs_wicenv[vardeps] += "${WICVARS}" >  do_rootfs_wicenv[prefuncs] = 'set_image_size' > > -WIC_IMAGE_FILE ="${DEPLOY_DIR_IMAGE}/${PN}-${DISTRO}-${MACHINE}.wic.img" > +WIC_IMAGE_FILE ="${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic.img" > >  do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" > > @@ -81,10 +81,10 @@ do_wic_image() { >      sudo -E chroot ${BUILDCHROOT_DIR} \ >          ${ISARROOT}/scripts/wic create ${WKS_FULL_PATH} \ >              --vars "${STAGING_DIR}/${MACHINE}/imgdata/" \ > -            -o /tmp/${PN}-${DISTRO}-${MACHINE}.wic/ \ > +            -o /tmp/${IMAGE_FULLNAME}.wic/ \ >              -e ${IMAGE_BASENAME} ${WIC_CREATE_EXTRA_ARGS} >      sudo chown -R $(stat -c "%U" ${ISARROOT}) ${ISARROOT}/meta > ${ISARROOT}/meta-isar ${ISARROOT}/scripts || true > -    cp -f $(ls -t -1 > ${BUILDCHROOT_DIR}/tmp/${PN}-${DISTRO}-${MACHINE}.wic/*.direct | head -1) > ${WIC_IMAGE_FILE} > +    cp -f $(ls -t -1 ${BUILDCHROOT_DIR}/tmp/${IMAGE_FULLNAME}.wic/*.direct > | head -1) ${WIC_IMAGE_FILE} >  } > >  do_wic_image[file-checksums] += "${WKS_FULL_PATH}:True" > -- > 2.11.0 > > -- > You received this message because you are subscribed to the Google Groups > "isar-users" group. > To unsubscribe from this group and stop receiving emails from it, send an email > to isar-users+unsubscribe@googlegroups.com > . > To post to this group, send email to isar-users@googlegroups.com > . > To view this discussion on the web visit > https://groups.google.com/d/msgid/isar-users/d09c4a2f-4249-4914-9ceb-b5dfdf8924fa%40googlegroups.com > . > For more options, visit https://groups.google.com/d/optout. -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux