From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6609939533494484992 X-Received: by 2002:a1c:2007:: with SMTP id g7-v6mr2806140wmg.1.1538996480439; Mon, 08 Oct 2018 04:01:20 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:208d:: with SMTP id g135-v6ls59640wmg.20.canary-gmail; Mon, 08 Oct 2018 04:01:19 -0700 (PDT) X-Google-Smtp-Source: ACcGV63bh41tkK6cTWjLVL7gRpE/73hgGdtKMXM4rjESRcv/uOQm/UUIp4NiY0pJQkJ++1Z4XHsQ X-Received: by 2002:a1c:f90e:: with SMTP id x14-v6mr2288270wmh.14.1538996479945; Mon, 08 Oct 2018 04:01:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538996479; cv=none; d=google.com; s=arc-20160816; b=AB1xasHei3sBlVpDdaDGbrxkGNWh5UNBHNTaQWrU4I4GaSsYL/GxEA6i+J417YYjme NPPYxZrhvGyVU2l7lBUNdJQJ/e8E65uU+lHfASmN6SCnGFShBU4N/nDeynnf055rV/bE E9F1LKSOL8ZWS1Y+gnZs9lp9CIVri47fMcucaM8mGsP9mC4fAqLIesRHR7zf34EUaNDR KpKCDBRrlOFYOJoMeuVCnqVJdvaE+52StM+oIKnGmCtaJLB3NPGHcLQl46KUs1ufzMxz nGhAxSYShJnh5gOQqL3zRDYTGdLL7H7rKGgss4+S6rNMc4ha03XN2D3Pu3CHQ4YNv29J 4zvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from; bh=9ax8pqJwZdbocp8L9sXoZXTKRmYWhWYTObeC2Jqi8EY=; b=wYmyOVGh5aFavHKjZyNMDy6H0W/T2ISCGIy0+B5cAesrRJDgTZwgSTWxGhpxs0/PqV yC8f940K72CJehEeZLy+sSEKAiAg2MlOl8cfn4nFnqUYIVhaIjpUsh0CvbWLDfxNbiSL Yvfc+jUkKumRbmXEmeQ5PulLHfdSqB7tWh/tJq8b48sfNFGlwWCEsHJ+8jkq6LD5YAZX xPK0z7lJXAVA1f10QSsNsZMUDhPTamPVg6UhnVFvUcHpUMEa02DBbiWmXraclY+5Pllr WDuWUnm30tGs/ImvI1LIPpLyE7DLG3DdSZj5FcOw3NRKMltdUlW79BiyLsC5dIhfyCS8 ohDw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id 204-v6si656833wmw.3.2018.10.08.04.01.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Oct 2018 04:01:19 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id w98B1Jq5018345 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 8 Oct 2018 13:01:19 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.48.216]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id w98B1ExU014631 for ; Mon, 8 Oct 2018 13:01:19 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 10/10] wic-img: Fix image copy-out in do_wic_image Date: Mon, 8 Oct 2018 13:01:14 +0200 Message-Id: <626e03a6d1806e0fd9a8dcbb7a028889ed5c0a66.1538996473.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: nziCferImBE9 From: Jan Kiszka The magic matching of the output file against WKS_FILE breaks if the user provided a full path or appended the ".wks" suffix in that variable. Avoid the fragility by pushing the output into a dedicated, target-specific tmp directory and picking up the latest .direct file from there. Signed-off-by: Jan Kiszka --- meta/classes/wic-img.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass index ee7aff1..5ff8b45 100644 --- a/meta/classes/wic-img.bbclass +++ b/meta/classes/wic-img.bbclass @@ -81,10 +81,11 @@ do_wic_image() { sudo -E chroot ${BUILDCHROOT_DIR} \ ${ISARROOT}/scripts/wic create ${WKS_FULL_PATH} \ - --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -o /tmp/ \ + --vars "${STAGING_DIR}/${MACHINE}/imgdata/" \ + -o /tmp/${PN}-${DISTRO}-${MACHINE}.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/${WKS_FILE}*.direct | head -1` ${WIC_IMAGE_FILE} + cp -f $(ls -t -1 ${BUILDCHROOT_DIR}/tmp/${PN}-${DISTRO}-${MACHINE}.wic/*.direct | head -1) ${WIC_IMAGE_FILE} } do_wic_image[file-checksums] += "${WKS_FULL_PATH}:True" -- 2.16.4