From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6613620343774904320 X-Received: by 2002:a1c:7ece:: with SMTP id z197-v6mr1694355wmc.0.1540221863063; Mon, 22 Oct 2018 08:24:23 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:8323:: with SMTP id 32-v6ls168324wrd.0.gmail; Mon, 22 Oct 2018 08:24:22 -0700 (PDT) X-Google-Smtp-Source: AJdET5fGeQyHa3marYAVf778cqHCIWJ35mXbhi40vhcV4i60EuV63/rPJyrRGMV7ve1qYNN0dNpS X-Received: by 2002:adf:eacb:: with SMTP id o11-v6mr989416wrn.19.1540221862647; Mon, 22 Oct 2018 08:24:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540221862; cv=none; d=google.com; s=arc-20160816; b=JpRuc9CzVzaBXF8dgPf/eRtVavoMVZP77aDnVWrnRyhqBwm8fa6Bpb1DWck/qcYGDw onhdOnIYuinRa1PiUWT2F2pu+a/SJVDGQDOJCO7DCMArV0iRa7WRaTKaUf5LokhGkuFZ GhMyu9G0MQTIT7iFMPLGIisjMSRtVPDClyKC2BVlvAHMCsXsbHdA8lxHIYJn4ODXias1 Wuc8rk4McqodDPOkkLqLikwI+GD0gQSzmgBDf11XToDA0pSyG1Uoo28qNrkUTtmhF1Lr LXMdKHX7ZAfffMxvOyhax/2ri+5/epoKsnWYLB3G1NguKGZTbcdX2CXIklHuNREYIXnU MsAg== 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:subject:cc:to:from:date; bh=Hpy20K01MRQdMMN8/aEW2z4lLrETvDOoaMuZONTvtrM=; b=Aw+abjgnobyxIBDOeiR9d6022Q0rppyrp1eEX+jIUudEGuHAF1cSBVMbXcDdaSESoQ J4Db0gV++Db4lk4L1U56H2p1LQmcnTKL7UzB1QPLpn8JGrLhClTn1YmvQt74AKGPOfdc 6aoDrTMtK1yOC6Lfli66BpiddsCXqn7bAjySVLAHQ3oR8eH/kJI2DuJRVPNLIoj4W57m JVroGfBsvXMI5gc/c5yC8qqnvlmIircRT8dnhBMCNrFKO+7stzmoHPXnbesiQJ5uZ+iW GQ9/rd9SY/DP8lfQ83L48QSShBorMUGWiVPhwKikXIfjaFncQQOcOsV8qGEJwjdVrb77 oXhA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id y10-v6si299081wrl.4.2018.10.22.08.24.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Oct 2018 08:24:22 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@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 henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id w9MFOMha032564 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Oct 2018 17:24:22 +0200 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail2.sbs.de (8.15.2/8.15.2) with ESMTPS id w9MFOKnd004839 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 22 Oct 2018 17:24:22 +0200 Date: Mon, 22 Oct 2018 17:24:41 +0200 From: Henning Schild To: Cedric Hombourger Cc: Subject: Re: [PATCH v2] image: include image name in the kernel/initrd image copies Message-ID: <20181022172441.7eba0f77@md1pvb1c.ad001.siemens.net> In-Reply-To: <1539883436-305-1-git-send-email-Cedric_Hombourger@mentor.com> References: <27912c86-2c53-4986-bf9c-2f9b9796bd50@siemens.com> <1539883436-305-1-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: x8vEn6IQNHWS I would suggest so make that two patches, one to introduce IMAGE_FULLNAME and the actual change in the next. Henning Am Thu, 18 Oct 2018 19:23:56 +0200 schrieb Cedric Hombourger : > 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"