From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6609939533494484992 X-Received: by 2002:a5d:4f88:: with SMTP id d8-v6mr2097841wru.29.1538996478649; Mon, 08 Oct 2018 04:01:18 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:6b51:: with SMTP id x17-v6ls28182wrw.13.gmail; Mon, 08 Oct 2018 04:01:18 -0700 (PDT) X-Google-Smtp-Source: ACcGV60pKJXx+JzWjoeM/P1GzUi1KzjsmWdUcsT1fJhFf4OQbZRWMKl42GuitDqi8nJLwKBiK2sw X-Received: by 2002:adf:e6d0:: with SMTP id y16-v6mr2042644wrm.3.1538996478099; Mon, 08 Oct 2018 04:01:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538996478; cv=none; d=google.com; s=arc-20160816; b=F6PMhTMDDrBk6ye2MUA5IvlOK0I3paAh97vMyIYmJ6G+0g0EHjxP8mPMV9Eq4n4A6L C2rolD02hSh2Am6Og9gebUXt8DqSdIWRSDFRKpFQFXnC9pVlrxG9mnqZNcAiVz/ui/8r trjQCXR/LOkMRcvF6LTuNoaPwtJ2g7z/pVFjh+HjyV2VXYmNEjPo1OZN4kqmHI3AyEHw TG9Vk+gCZtHbIjp5q5OXiuenuYFM3hd7a+9kP5mnt4SswJXbLpsCNguAFPXaFUY5cnjP uEQ4HIy0PLEz9QlH12yZNt+fDYdh5EVwZrsUIa9bAqbvIygRYFrm+936KTse6dPGvmyH cyKQ== 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=frAC+oZT8i1fk96waSBHlP7Xso9hLN9RqBirWCTfC+g=; b=XJy2fGvBM8nexxrduNx4c7uNSNahkHvz6Q5iM2gunpqPWnp1zARIatlhazaV99kgkY AdwYYUrJdTkuYcD23hMDKT00YNYZjbDz4pPQXortMDYCfEWpfPGJu0M/hWU5mlbZ4s+D yuX6PdqRuzb69z4YmZkLYSWi2OwQ50BSPoB9sntimELGJLVPtyhy8SPPFDZX4vUKCnSs dnKgTVTCFPhzY9xfRyaroVu021ab/5ZnkD/9uZbO7lruapjccZRJwz/us7o6zMZjRHPk 1wOCf3+PMqLneBOscHZWcTRQejURLPqnV1OuggSJ55t6Z5bENwuARaaQKNONqzOeepc6 laAg== 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-v6si656825wmw.3.2018.10.08.04.01.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Oct 2018 04:01:18 -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 w98B1HTQ018193 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 8 Oct 2018 13:01:17 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.48.216]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id w98B1ExQ014631 for ; Mon, 8 Oct 2018 13:01:17 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 06/10] wic-img: Use wks-file class for WKS_FILE lookup Date: Mon, 8 Oct 2018 13:01:10 +0200 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: 65mgfaAw3dC9 From: Jan Kiszka Rather than letting wic search only in the canned-wks folders, use get_wks_full_path search for WKS_FILE at all newly defined locations. Signed-off-by: Jan Kiszka --- meta/classes/wic-img.bbclass | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass index fef8308..c80c927 100644 --- a/meta/classes/wic-img.bbclass +++ b/meta/classes/wic-img.bbclass @@ -9,6 +9,10 @@ python () { bb.fatal("WKS_FILE must be set") } +inherit wks-file + +WKS_FULL_PATH = "${@get_wks_full_path(d)}" + # wic comes with reasonable defaults, and the proper interface is the wks file ROOTFS_EXTRA ?= "0" @@ -75,7 +79,10 @@ do_wic_image() { export BUILDDIR=${BUILDDIR} export MTOOLS_SKIP_CHECK=1 - sudo -E chroot ${BUILDCHROOT_DIR} ${ISARROOT}/scripts/wic create ${WKS_FILE} --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -o /tmp/ -e ${IMAGE_BASENAME} ${WIC_CREATE_EXTRA_ARGS} + sudo -E chroot ${BUILDCHROOT_DIR} \ + ${ISARROOT}/scripts/wic create ${WKS_FULL_PATH} \ + --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -o /tmp/ \ + -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} } -- 2.16.4